better patch for issue #151, will accept strings as browser versions now

This commit is contained in:
ekultek 2017-11-15 09:09:47 -06:00
parent ab93e7a46d
commit 95e6ab3c70
3 changed files with 18 additions and 8 deletions

View file

@ -69,11 +69,21 @@ def config_gecko_version(browser_version):
(55, 54): 18,
(53, 52, 51): 17
}
major = browser_version[0]
for key in version_specs.keys():
for num in key:
if num == major:
return version_specs[key]
if isinstance(browser_version, (tuple, list, set)):
major = browser_version[0]
for key in version_specs.keys():
for num in key:
if num == major:
return version_specs[key]
else:
if "." in browser_version:
major = browser_version.split(".")[0]
else:
major = browser_version
for key in version_specs.keys():
for num in key:
if num == int(major):
return version_specs[key]
def check_os(current=platform.platform()):

View file

@ -14,7 +14,7 @@ dc7bfc3d7b9b23340ee37806316bd770 ./etc/text_files/xss_payloads.txt
cd9c70aa862df26e40c42cbe5909a4aa ./etc/checksum/md5sum.md5
15b70d0142602288c8d635a6a0ceb665 ./bin/version_info
d41d8cd98f00b204e9800998ecf8427e ./bin/__init__.py
a622b354f81ee5d0bad88c1e8b2ba0f9 ./bin/unzip_gecko.py
1a30853126b5e311c9cb8f3b3c7755e7 ./bin/unzip_gecko.py
dc1eb4ebe0f372af48b5a9c107ebc68d ./bin/drivers/geckodriver-v0.18.0-linux32.tar.gz
be18faeea6e7db9db6990d8667e2298f ./bin/drivers/geckodriver-v0.17.0-linux64.tar.gz
79b1a158f96d29942a111c0905f1c807 ./bin/drivers/geckodriver-v0.17.0-linux32.tar.gz
@ -63,7 +63,7 @@ ceb1b278b0861c976dfecc91cb64e53d ./lib/attacks/xss_scan/__init__.py
21faf4679cdeaa731029a48f8963d6e7 ./lib/attacks/nmap_scan/nmap_opts.py
1faa2b5dfad6eb538bbfe42942d2a9da ./lib/core/errors.py
d41d8cd98f00b204e9800998ecf8427e ./lib/core/__init__.py
87904590ab380357ad31a1ee75a6d504 ./lib/core/settings.py
f51a7a19c3c9c340f5adcaca7cfc2e09 ./lib/core/settings.py
f8dca2fa45acb95f7081546bf6aec025 ./lib/header_check/__init__.py
d41d8cd98f00b204e9800998ecf8427e ./var/google_search/__init__.py
5974e78ce4035d14005fd1a00a3655d2 ./var/google_search/search.py

View file

@ -55,7 +55,7 @@ CLONE = "https://github.com/ekultek/zeus-scanner.git"
ISSUE_LINK = "https://github.com/ekultek/zeus-scanner/issues"
# current version <major.minor.commit.patch ID>
VERSION = "1.2.17.{}".format(PATCH_ID)
VERSION = "1.2.18.{}".format(PATCH_ID)
# colors to output depending on the version
VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30}