From be825cb51de3f91bb5b586cd75934146a5295b08 Mon Sep 17 00:00:00 2001 From: thc202 Date: Thu, 4 May 2017 15:23:17 +0100 Subject: [PATCH] Package changes --- example.py | 41 ------------------------- setup.py | 17 +++++----- src/examples/basic-spider-scan.py | 6 ++-- {zap => src/zapv2}/__init__.py | 2 +- {zap => src/zapv2}/acsrf.py | 0 {zap => src/zapv2}/ajaxSpider.py | 0 {zap => src/zapv2}/ascan.py | 0 {zap => src/zapv2}/authentication.py | 0 {zap => src/zapv2}/authorization.py | 0 {zap => src/zapv2}/autoupdate.py | 0 {zap => src/zapv2}/brk.py | 0 {zap => src/zapv2}/context.py | 0 {zap => src/zapv2}/core.py | 0 {zap => src/zapv2}/forcedUser.py | 0 {zap => src/zapv2}/httpSessions.py | 0 {zap => src/zapv2}/importLogFiles.py | 0 {zap => src/zapv2}/params.py | 0 {zap => src/zapv2}/pnh.py | 0 {zap => src/zapv2}/pscan.py | 0 {zap => src/zapv2}/reveal.py | 0 {zap => src/zapv2}/script.py | 0 {zap => src/zapv2}/search.py | 0 {zap => src/zapv2}/selenium.py | 0 {zap => src/zapv2}/sessionManagement.py | 0 {zap => src/zapv2}/spider.py | 0 {zap => src/zapv2}/stats.py | 0 {zap => src/zapv2}/users.py | 0 tests/unit/conftest.py | 4 +-- 28 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 example.py rename {zap => src/zapv2}/__init__.py (99%) rename {zap => src/zapv2}/acsrf.py (100%) rename {zap => src/zapv2}/ajaxSpider.py (100%) rename {zap => src/zapv2}/ascan.py (100%) rename {zap => src/zapv2}/authentication.py (100%) rename {zap => src/zapv2}/authorization.py (100%) rename {zap => src/zapv2}/autoupdate.py (100%) rename {zap => src/zapv2}/brk.py (100%) rename {zap => src/zapv2}/context.py (100%) rename {zap => src/zapv2}/core.py (100%) rename {zap => src/zapv2}/forcedUser.py (100%) rename {zap => src/zapv2}/httpSessions.py (100%) rename {zap => src/zapv2}/importLogFiles.py (100%) rename {zap => src/zapv2}/params.py (100%) rename {zap => src/zapv2}/pnh.py (100%) rename {zap => src/zapv2}/pscan.py (100%) rename {zap => src/zapv2}/reveal.py (100%) rename {zap => src/zapv2}/script.py (100%) rename {zap => src/zapv2}/search.py (100%) rename {zap => src/zapv2}/selenium.py (100%) rename {zap => src/zapv2}/sessionManagement.py (100%) rename {zap => src/zapv2}/spider.py (100%) rename {zap => src/zapv2}/stats.py (100%) rename {zap => src/zapv2}/users.py (100%) diff --git a/example.py b/example.py deleted file mode 100644 index f5dad47..0000000 --- a/example.py +++ /dev/null @@ -1,41 +0,0 @@ -import time -from pprint import pprint -from zap import ZAP - -target = 'http://shorttask.com' - -zap = ZAP(proxies={ - 'http': 'http://172.17.0.2:1112', - 'https': 'https://172.17.0.2:1112' - }) - -print('Accessing target {}'.format(target)) - -zap.urlopen(target) -time.sleep(5) - -#print 'Spidering target %s' % target -scanid = zap.spider.scan(target) -time.sleep(5) - -# Progress of the spider -while (int(zap.spider.status(scanid)) < 100): - print('Spider progress (%): {}'.format(zap.spider.status(scanid))) - time.sleep(2) - -print('Spider completed') -# Give the passive scanner a chance to finish -time.sleep(5) - -print('Scanning target {}'.format(target)) -scanid = zap.ascan.scan(target) -while (int(zap.ascan.status(scanid)) < 100): - print('Scan progress (%): {}'.format(zap.ascan.status(scanid))) - time.sleep(5) - -print('Scan completed') - -# Results -print('Hosts: {}'.format(', '.join(zap.core.hosts))) -print('Alerts: ') -pprint(zap.core.alerts()) diff --git a/setup.py b/setup.py index ae26c3e..5aa270a 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ try: - from setuptools import setup + from setuptools import setup, find_packages except ImportError: raise SystemExit(1) @@ -23,17 +23,20 @@ 'requests_mock' ) setup( - name="python-owasp-zap", - version="2.5", - description="OWASP ZAP API library", - long_description="OWASP Zed Attack Proxy 2.5 API python library", + name="python-owasp-zap-v2.4", + version="0.0.10", + description="OWASP ZAP 2.6 API client", + long_description="OWASP Zed Attack Proxy 2.6 API python client (the 2.4 package name has been kept to make it easier to upgrade)", author="ZAP development team", author_email='', url="https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project", - download_url="https://github.com/zaproxy/zap-api-python/releases/tag/2.5", + download_url="https://github.com/zaproxy/zap-api-python/releases/tag/0.0.10", platforms=['any'], license="ASL2.0", - packages=['zap'], + package_dir={ + '': 'src', + }, + packages=find_packages('src'), classifiers=[ 'License :: OSI Approved :: Apache Software License', 'Development Status :: 5 - Production/Stable', diff --git a/src/examples/basic-spider-scan.py b/src/examples/basic-spider-scan.py index 5772341..b1e1823 100644 --- a/src/examples/basic-spider-scan.py +++ b/src/examples/basic-spider-scan.py @@ -3,15 +3,15 @@ import time from pprint import pprint -from zap import ZAP +from zapv2 import ZAPv2 target = 'http://127.0.0.1' apikey = 'changeme' # Change to match the API key set in ZAP, or use None if the API key is disabled # # By default ZAP API client will connect to port 8080 -zap = ZAP(apikey=apikey) +zap = ZAPv2(apikey=apikey) # Use the line below if ZAP is not listening on port 8080, for example, if listening on port 8090 -# zap = ZAP(apikey=apikey, proxies={'http': 'http://127.0.0.1:8090', 'https': 'http://127.0.0.1:8090'}) +# zap = ZAPv2(apikey=apikey, proxies={'http': 'http://127.0.0.1:8090', 'https': 'http://127.0.0.1:8090'}) # Proxy a request to the target so that ZAP has something to deal with print('Accessing target {}'.format(target)) diff --git a/zap/__init__.py b/src/zapv2/__init__.py similarity index 99% rename from zap/__init__.py rename to src/zapv2/__init__.py index 2f1de85..9450c33 100644 --- a/zap/__init__.py +++ b/src/zapv2/__init__.py @@ -50,7 +50,7 @@ from .users import users -class ZAP(object): +class ZAPv2(object): """ Client API implementation for integrating with ZAP v2. """ diff --git a/zap/acsrf.py b/src/zapv2/acsrf.py similarity index 100% rename from zap/acsrf.py rename to src/zapv2/acsrf.py diff --git a/zap/ajaxSpider.py b/src/zapv2/ajaxSpider.py similarity index 100% rename from zap/ajaxSpider.py rename to src/zapv2/ajaxSpider.py diff --git a/zap/ascan.py b/src/zapv2/ascan.py similarity index 100% rename from zap/ascan.py rename to src/zapv2/ascan.py diff --git a/zap/authentication.py b/src/zapv2/authentication.py similarity index 100% rename from zap/authentication.py rename to src/zapv2/authentication.py diff --git a/zap/authorization.py b/src/zapv2/authorization.py similarity index 100% rename from zap/authorization.py rename to src/zapv2/authorization.py diff --git a/zap/autoupdate.py b/src/zapv2/autoupdate.py similarity index 100% rename from zap/autoupdate.py rename to src/zapv2/autoupdate.py diff --git a/zap/brk.py b/src/zapv2/brk.py similarity index 100% rename from zap/brk.py rename to src/zapv2/brk.py diff --git a/zap/context.py b/src/zapv2/context.py similarity index 100% rename from zap/context.py rename to src/zapv2/context.py diff --git a/zap/core.py b/src/zapv2/core.py similarity index 100% rename from zap/core.py rename to src/zapv2/core.py diff --git a/zap/forcedUser.py b/src/zapv2/forcedUser.py similarity index 100% rename from zap/forcedUser.py rename to src/zapv2/forcedUser.py diff --git a/zap/httpSessions.py b/src/zapv2/httpSessions.py similarity index 100% rename from zap/httpSessions.py rename to src/zapv2/httpSessions.py diff --git a/zap/importLogFiles.py b/src/zapv2/importLogFiles.py similarity index 100% rename from zap/importLogFiles.py rename to src/zapv2/importLogFiles.py diff --git a/zap/params.py b/src/zapv2/params.py similarity index 100% rename from zap/params.py rename to src/zapv2/params.py diff --git a/zap/pnh.py b/src/zapv2/pnh.py similarity index 100% rename from zap/pnh.py rename to src/zapv2/pnh.py diff --git a/zap/pscan.py b/src/zapv2/pscan.py similarity index 100% rename from zap/pscan.py rename to src/zapv2/pscan.py diff --git a/zap/reveal.py b/src/zapv2/reveal.py similarity index 100% rename from zap/reveal.py rename to src/zapv2/reveal.py diff --git a/zap/script.py b/src/zapv2/script.py similarity index 100% rename from zap/script.py rename to src/zapv2/script.py diff --git a/zap/search.py b/src/zapv2/search.py similarity index 100% rename from zap/search.py rename to src/zapv2/search.py diff --git a/zap/selenium.py b/src/zapv2/selenium.py similarity index 100% rename from zap/selenium.py rename to src/zapv2/selenium.py diff --git a/zap/sessionManagement.py b/src/zapv2/sessionManagement.py similarity index 100% rename from zap/sessionManagement.py rename to src/zapv2/sessionManagement.py diff --git a/zap/spider.py b/src/zapv2/spider.py similarity index 100% rename from zap/spider.py rename to src/zapv2/spider.py diff --git a/zap/stats.py b/src/zapv2/stats.py similarity index 100% rename from zap/stats.py rename to src/zapv2/stats.py diff --git a/zap/users.py b/src/zapv2/users.py similarity index 100% rename from zap/users.py rename to src/zapv2/users.py diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 47a99ed..6a5fa88 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -2,14 +2,14 @@ import requests_mock -from zap import ZAP +from zapv2 import ZAPv2 @pytest.yield_fixture def zap(): """ All tests will be able to share the instance of client with the same settings.""" - yield ZAP(apikey='testapikey') + yield ZAPv2(apikey='testapikey') @pytest.yield_fixture(autouse=True)