From 9a93c85cb059ea24b46e05607e164b96f0a57b78 Mon Sep 17 00:00:00 2001 From: ceilingduster <76067309+ceilingduster@users.noreply.github.com> Date: Fri, 7 May 2021 12:56:46 -0400 Subject: [PATCH 1/8] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e17c40e..cc8b465 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:3.13 -LABEL maintainer="Ian Redden " # install packages we need RUN apk update && apk add --no-cache musl-dev openssl-dev gcc python3 py3-configobj python3-dev supervisor git libffi-dev uwsgi-python3 uwsgi-http jq nano syslog-ng uwsgi-syslog py3-pip From 333b6945dee01aa60636cabc6cd4c86220f8f91d Mon Sep 17 00:00:00 2001 From: ceilingduster <76067309+ceilingduster@users.noreply.github.com> Date: Wed, 26 May 2021 12:03:26 -0400 Subject: [PATCH 2/8] Removed Free Trial Link --- module_type.json.sample | 4 ---- 1 file changed, 4 deletions(-) diff --git a/module_type.json.sample b/module_type.json.sample index 2d35bc4..5dcf29c 100644 --- a/module_type.json.sample +++ b/module_type.json.sample @@ -5,10 +5,6 @@ "description": "Shodan is a search engine that lets the user find specific types of computers (webcams, routers, servers, etc.) connected to the internet using a variety of filters. Some have also described it as a search engine of service banners, which are metadata that the server sends back to the client. This can be information about the server software, what options the service supports, a welcome message or anything else that the client can find out before interacting with the server. Shodan data and infrastructure povide your organization with real-time information about the entire Internet.\n\n**Security Beyond the Perimeter:** \nThe Shodan platform helps you monitor not just your own network but also the entire Internet. Detect data leaks to the cloud, phishing websites, compromised databases and more. The Enterprise Data License gives you the tools to monitor all connected devices on the Internet.\n\n**Market Intelligence for the Connected World:** \nUse the Shodan platform to see which products are popular on the Internet and how the markets are shifting over time. Which areas have the most home automation systems? How popular are the latest smart TVs? Purchase the Enterprise Data License to understand the modern connected world.\n\n**New Age of Fraud Prevention:** \nWhen was the last time you saw a refrigerator buy a computer? Use Shodan to detect whether the purchase is being made from an IoT device, compromised database, VPN, Tor or any type of unusual device.\n\n**Platform Components:**\n- Bulk DataFeed: Download all of the data that Shodan collects to build your own database of Internet-connected devices.\n- On-DemandScanning: Use Shodan's global infrastructure to scan networks ranging from individual IPs up to the entire Internet.\n- UnlimitedAccess: The Enterprise Data License provides unlimited access to Shodan for all employees of the organization.", "tips": "When configuring this integration, you must add the Shodan Module to your organization. \n\n1. Complete the **Add New Shodan Module** form:\n - **Module Name** - Leave the default name or enter a name that is meaningful to you. \n2. Click **Save** to complete the Shodan module configuration.", "external_references": [ - { - "label": "Free Trial", - "link": "https://account.shodan.io/register" - }, { "label": "Contact Sales", "link": "mailto:sales@shodan.io" From 98f12be13b32cfdad19fbaea73be9838f664d9bd Mon Sep 17 00:00:00 2001 From: YevhenLysen Date: Tue, 22 Jun 2021 01:45:06 +0300 Subject: [PATCH 3/8] Added Jenkinsfile --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..e8ac0fd --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,3 @@ +@Library('softserve-jenkins-library@main') _ + +startPipeline() From be82be7ee62132847572b1baa0664a44faf4f7ce Mon Sep 17 00:00:00 2001 From: YuriiTsekhovyi <79151889+ytsek@users.noreply.github.com> Date: Wed, 7 Jul 2021 16:25:55 +0300 Subject: [PATCH 4/8] [CCTRI-2678] - alpine&python version update (#21) --- Dockerfile | 7 +++++-- README.md | 2 ++ code/requirements.txt | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc8b465..ee61c0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,10 @@ -FROM alpine:3.13 +FROM alpine:3.14 +LABEL maintainer="Ian Redden " # install packages we need -RUN apk update && apk add --no-cache musl-dev openssl-dev gcc python3 py3-configobj python3-dev supervisor git libffi-dev uwsgi-python3 uwsgi-http jq nano syslog-ng uwsgi-syslog py3-pip +RUN apk update && apk add --no-cache musl-dev openssl-dev gcc py3-configobj \ +supervisor git libffi-dev uwsgi-python3 uwsgi-http jq syslog-ng uwsgi-syslog \ +py3-pip python3-dev # do the Python dependencies ADD code /app diff --git a/README.md b/README.md index 2c93764..1432386 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,8 @@ curl http://localhost:9090 ## Implementation Details +This application was developed and tested under Python version 3.9. + ### Implemented Relay Endpoints - `POST /health` diff --git a/code/requirements.txt b/code/requirements.txt index b42bbff..20b2096 100644 --- a/code/requirements.txt +++ b/code/requirements.txt @@ -1,6 +1,6 @@ -Flask==1.1.2 -marshmallow==3.11.1 +Flask==2.0.1 +marshmallow==3.12.1 requests==2.25.1 -flake8==3.9.0 -coverage==5.2.1 -pytest==6.2.2 +flake8==3.9.2 +coverage==5.5 +pytest==6.2.4 From 3c767d6c3c0b35b3b4f2e9fd3a8723c65a7d6597 Mon Sep 17 00:00:00 2001 From: Michelle Dougal <78505366+mdougal@users.noreply.github.com> Date: Fri, 9 Jul 2021 16:24:20 -0400 Subject: [PATCH 5/8] Updated tips --- module_type.json.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_type.json.sample b/module_type.json.sample index 5dcf29c..3cae2ca 100644 --- a/module_type.json.sample +++ b/module_type.json.sample @@ -3,7 +3,7 @@ "default_name": "Shodan", "short_description": "Shodan is the world's first search engine for Internet-connected devices.", "description": "Shodan is a search engine that lets the user find specific types of computers (webcams, routers, servers, etc.) connected to the internet using a variety of filters. Some have also described it as a search engine of service banners, which are metadata that the server sends back to the client. This can be information about the server software, what options the service supports, a welcome message or anything else that the client can find out before interacting with the server. Shodan data and infrastructure povide your organization with real-time information about the entire Internet.\n\n**Security Beyond the Perimeter:** \nThe Shodan platform helps you monitor not just your own network but also the entire Internet. Detect data leaks to the cloud, phishing websites, compromised databases and more. The Enterprise Data License gives you the tools to monitor all connected devices on the Internet.\n\n**Market Intelligence for the Connected World:** \nUse the Shodan platform to see which products are popular on the Internet and how the markets are shifting over time. Which areas have the most home automation systems? How popular are the latest smart TVs? Purchase the Enterprise Data License to understand the modern connected world.\n\n**New Age of Fraud Prevention:** \nWhen was the last time you saw a refrigerator buy a computer? Use Shodan to detect whether the purchase is being made from an IoT device, compromised database, VPN, Tor or any type of unusual device.\n\n**Platform Components:**\n- Bulk DataFeed: Download all of the data that Shodan collects to build your own database of Internet-connected devices.\n- On-DemandScanning: Use Shodan's global infrastructure to scan networks ranging from individual IPs up to the entire Internet.\n- UnlimitedAccess: The Enterprise Data License provides unlimited access to Shodan for all employees of the organization.", - "tips": "When configuring this integration, you must add the Shodan Module to your organization. \n\n1. Complete the **Add New Shodan Module** form:\n - **Module Name** - Leave the default name or enter a name that is meaningful to you. \n2. Click **Save** to complete the Shodan module configuration.", + "tips": "When configuring Shodan integration, you must add the Shodan integration module in SecureX. \n\n1. In SecureX, complete the **Add New Shodan Integration Module** form:\n * **Integration Module Name** - Leave the default name or enter a name that is meaningful to you. \n\n2. Click **Save** to complete the Shodan integration module configuration.", "external_references": [ { "label": "Contact Sales", From a1639639253842cd6ad98612135f973fa6520a4d Mon Sep 17 00:00:00 2001 From: YuriiTsekhovyi <79151889+ytsek@users.noreply.github.com> Date: Thu, 15 Jul 2021 10:54:59 +0300 Subject: [PATCH 6/8] Version 2.0.1 (#23) --- code/container_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/container_settings.json b/code/container_settings.json index ccf67c6..9e42197 100644 --- a/code/container_settings.json +++ b/code/container_settings.json @@ -1,4 +1,4 @@ { - "VERSION": "2.0.0", + "VERSION": "2.0.1", "NAME": "Shodan" } From 29c321564c59f3b625e8330e27ba9505993dd6a6 Mon Sep 17 00:00:00 2001 From: mstoro <78480384+mstoro@users.noreply.github.com> Date: Thu, 19 Aug 2021 10:27:36 +0300 Subject: [PATCH 7/8] [CCTRI-2951] move from pip to pipenv (#24) --- .travis.yml | 12 -- Dockerfile | 8 +- README.md | 12 +- code/Pipfile | 17 +++ code/Pipfile.lock | 321 ++++++++++++++++++++++++++++++++++++++++++ code/requirements.txt | 6 - scripts/entrypoint.sh | 6 - 7 files changed, 352 insertions(+), 30 deletions(-) delete mode 100644 .travis.yml create mode 100644 code/Pipfile create mode 100644 code/Pipfile.lock delete mode 100644 code/requirements.txt diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 071f0c8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -services: -- docker -jobs: - include: - - stage: build&test - script: - - docker build -t tr-05-shodan . - - docker run -d -p 9090:9090 --name tr-05-shodan tr-05-shodan - - while true; do if docker logs tr-05-shodan | grep "entered RUNNING state"; then - break; else sleep 1; fi done - - curl -X POST -sSLi http://localhost:9090 | grep '200 OK' - diff --git a/Dockerfile b/Dockerfile index ee61c0a..c946e9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,18 @@ FROM alpine:3.14 LABEL maintainer="Ian Redden " +ENV PIP_IGNORE_INSTALLED 1 + # install packages we need RUN apk update && apk add --no-cache musl-dev openssl-dev gcc py3-configobj \ -supervisor git libffi-dev uwsgi-python3 uwsgi-http jq syslog-ng uwsgi-syslog \ +supervisor libffi-dev uwsgi-python3 uwsgi-http jq syslog-ng uwsgi-syslog \ py3-pip python3-dev # do the Python dependencies ADD code /app -RUN pip3 install -r /app/requirements.txt +ADD code/Pipfile code/Pipfile.lock / +RUN set -ex && pip install --no-cache-dir --upgrade pipenv && \ + pipenv install --system RUN chown -R uwsgi.uwsgi /etc/uwsgi # copy over scripts to init diff --git a/README.md b/README.md index 1432386..6d0ec3a 100644 --- a/README.md +++ b/README.md @@ -20,20 +20,24 @@ The code is provided here purely for educational purposes. ## Testing (Optional) -If you want to test the application you will require Docker and several dependencies from the [requirements.txt](code/requirements.txt) file: +Open the code folder in your terminal. ``` -pip install --upgrade --requirement code/requirements.txt +cd code +``` + +If you want to test the application you will require Docker and several dependencies from the [Pipfile](code/Pipfile) file: +``` +pip install --no-cache-dir --upgrade pipenv && pipenv install --dev ``` You can perform two kinds of testing: - Run static code analysis checking for any semantic discrepancies and [PEP 8](https://www.python.org/dev/peps/pep-0008/) compliance: - `flake8 code` + `flake8 .` - Run the suite of unit tests and measure the code coverage: ``` - cd code coverage run --source api/ -m pytest --verbose tests/unit/ && coverage report ``` diff --git a/code/Pipfile b/code/Pipfile new file mode 100644 index 0000000..a302fed --- /dev/null +++ b/code/Pipfile @@ -0,0 +1,17 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +Flask = "==2.0.1" +marshmallow = "==3.12.1" +requests = "==2.25.1" + +[dev-packages] +flake8 = "==3.9.2" +coverage = "==5.5" +pytest = "==6.2.4" + +[requires] +python_version = "3.9" diff --git a/code/Pipfile.lock b/code/Pipfile.lock new file mode 100644 index 0000000..66595f1 --- /dev/null +++ b/code/Pipfile.lock @@ -0,0 +1,321 @@ +{ + "_meta": { + "hash": { + "sha256": "03ef6f35ba6aec0285dcd7c49b45826145b9e86477bf420e3095b42f4c634f1f" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.9" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "certifi": { + "hashes": [ + "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", + "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" + ], + "version": "==2021.5.30" + }, + "chardet": { + "hashes": [ + "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", + "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==4.0.0" + }, + "click": { + "hashes": [ + "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a", + "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6" + ], + "markers": "python_version >= '3.6'", + "version": "==8.0.1" + }, + "flask": { + "hashes": [ + "sha256:1c4c257b1892aec1398784c63791cbaa43062f1f7aeb555c4da961b20ee68f55", + "sha256:a6209ca15eb63fc9385f38e452704113d679511d9574d09b2cf9183ae7d20dc9" + ], + "index": "pypi", + "version": "==2.0.1" + }, + "idna": { + "hashes": [ + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.10" + }, + "itsdangerous": { + "hashes": [ + "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c", + "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.1" + }, + "jinja2": { + "hashes": [ + "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4", + "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4" + ], + "markers": "python_version >= '3.6'", + "version": "==3.0.1" + }, + "markupsafe": { + "hashes": [ + "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", + "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", + "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", + "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", + "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", + "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724", + "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74", + "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646", + "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", + "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", + "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6", + "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad", + "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", + "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38", + "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", + "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", + "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", + "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", + "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", + "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", + "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", + "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", + "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", + "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", + "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864", + "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", + "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", + "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", + "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", + "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", + "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", + "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", + "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", + "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", + "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", + "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28", + "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", + "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", + "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d", + "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", + "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", + "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145", + "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", + "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c", + "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", + "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", + "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53", + "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134", + "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85", + "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", + "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", + "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", + "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", + "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.1" + }, + "marshmallow": { + "hashes": [ + "sha256:8050475b70470cc58f4441ee92375db611792ba39ca1ad41d39cad193ea9e040", + "sha256:b45cde981d1835145257b4a3c5cb7b80786dcf5f50dd2990749a50c16cb48e01" + ], + "index": "pypi", + "version": "==3.12.1" + }, + "requests": { + "hashes": [ + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" + ], + "index": "pypi", + "version": "==2.25.1" + }, + "urllib3": { + "hashes": [ + "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4", + "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.6" + }, + "werkzeug": { + "hashes": [ + "sha256:1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42", + "sha256:6c1ec500dcdba0baa27600f6a22f6333d8b662d22027ff9f6202e3367413caa8" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.1" + } + }, + "develop": { + "attrs": { + "hashes": [ + "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", + "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==21.2.0" + }, + "coverage": { + "hashes": [ + "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", + "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6", + "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45", + "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a", + "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03", + "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529", + "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a", + "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a", + "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2", + "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6", + "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759", + "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53", + "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a", + "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4", + "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff", + "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502", + "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793", + "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb", + "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905", + "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821", + "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b", + "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81", + "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0", + "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b", + "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3", + "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184", + "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701", + "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a", + "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82", + "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638", + "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5", + "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083", + "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6", + "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90", + "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465", + "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a", + "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3", + "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e", + "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066", + "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf", + "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b", + "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae", + "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669", + "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873", + "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b", + "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6", + "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb", + "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160", + "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c", + "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079", + "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d", + "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6" + ], + "index": "pypi", + "version": "==5.5" + }, + "flake8": { + "hashes": [ + "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b", + "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907" + ], + "index": "pypi", + "version": "==3.9.2" + }, + "iniconfig": { + "hashes": [ + "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", + "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" + ], + "version": "==1.1.1" + }, + "mccabe": { + "hashes": [ + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + ], + "version": "==0.6.1" + }, + "packaging": { + "hashes": [ + "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7", + "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14" + ], + "markers": "python_version >= '3.6'", + "version": "==21.0" + }, + "pluggy": { + "hashes": [ + "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", + "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.13.1" + }, + "py": { + "hashes": [ + "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3", + "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.10.0" + }, + "pycodestyle": { + "hashes": [ + "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068", + "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.7.0" + }, + "pyflakes": { + "hashes": [ + "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3", + "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.3.1" + }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "version": "==2.4.7" + }, + "pytest": { + "hashes": [ + "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b", + "sha256:91ef2131a9bd6be8f76f1f08eac5c5317221d6ad1e143ae03894b862e8976890" + ], + "index": "pypi", + "version": "==6.2.4" + }, + "toml": { + "hashes": [ + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "version": "==0.10.2" + } + } +} diff --git a/code/requirements.txt b/code/requirements.txt deleted file mode 100644 index 20b2096..0000000 --- a/code/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -Flask==2.0.1 -marshmallow==3.12.1 -requests==2.25.1 -flake8==3.9.2 -coverage==5.5 -pytest==6.2.4 diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 5d7524c..bccbded 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -1,12 +1,6 @@ #!/usr/bin/env sh set -e -# Grab the repository -if [ -n "$GITREPO" ]; then - echo "rm -rf /app && git clone $GITREPO /app" - rm -rf /app && git clone $GITREPO /app -fi - if [ -n "$ALPINEPYTHON" ] ; then export PYTHONPATH=$PYTHONPATH:/usr/local/lib/$ALPINEPYTHON/site-packages:/usr/lib/$ALPINEPYTHON/site-packages From 59239ef3c2ebe054e057dc9cce6b7854f887fa07 Mon Sep 17 00:00:00 2001 From: oshynk <80475008+oshynk@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:59:55 +0300 Subject: [PATCH 8/8] Release 2.0.2 --- code/container_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/container_settings.json b/code/container_settings.json index 9e42197..71b3185 100644 --- a/code/container_settings.json +++ b/code/container_settings.json @@ -1,4 +1,4 @@ { - "VERSION": "2.0.1", + "VERSION": "2.0.2", "NAME": "Shodan" }