added new geckodriver versions for different firefox versions, hoping this will help some what with issue #99 (at least until I can figure out a solid fix). will also now extract the gecko version installed for the auto-issues

This commit is contained in:
ekultek 2017-10-14 14:56:45 -05:00
parent f3a5621d86
commit 65716493e7
6 changed files with 15 additions and 9 deletions

3
.gitignore vendored
View file

@ -3,4 +3,5 @@ geckodriver.log
*.pyc
.idea/
bin/executed.txt
bin/paths
bin/paths
bin/version_info

Binary file not shown.

Binary file not shown.

View file

@ -102,18 +102,19 @@ def untar_gecko(filename="{}/bin/drivers/geckodriver-v0.{}.0-linux{}.tar.gz", ve
arch_info = {"64bit": "64", "32bit": "32"}
file_arch = arch_info[platform.architecture()[0]]
ff_version = var.auto_issue.github.get_browser_version()
if ff_version == "failed to start":
if ff_version > (54,): # ff version between 53-55
gecko_version = 18
elif ff_version == "failed to gather":
gecko_version = 18
else:
elif ff_version < (55,): # ff version between 56 and anything greater (will probably cause problems later on)
gecko_version = 19
else:
gecko_version = 17 # anything else
gecko_full_filename = filename.format(os.getcwd(), gecko_version, file_arch)
with open(lib.core.settings.GECKO_VERSION_INFO_PATH, "a+") as log:
log.write(gecko_full_filename.split("/")[-1])
tar = tarfile.open(filename.format(os.getcwd(), gecko_version, file_arch), "r:gz")
if verbose:
lib.core.settings.logger.debug(lib.core.settings.set_color(
"extracting the correct driver version '{}' for your architecture '{}'...".format(
gecko_version, file_arch
), level=10
"extracting the correct driver for your architecture '{}...", level=10
))
try:
tar.extractall("/usr/bin")

View file

@ -22,7 +22,7 @@ except NameError:
# clone link
CLONE = "https://github.com/ekultek/zeus-scanner.git"
# current version <major.minor.commit.patch ID>
VERSION = "1.0.47.8f84"
VERSION = "1.0.48"
# colors to output depending on the version
VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30}
# version string formatting
@ -51,6 +51,8 @@ DEFAULT_USER_AGENT = "Zeus-Scanner(v{})::Python->v{}.{}".format(
URL_QUERY_REGEX = re.compile(r"(.*)[?|#](.*){1}\=(.*)")
# regex to recognize a URL
URL_REGEX = re.compile(r"((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)")
# geckodriver version information path, grabs the file that was installed on your system
GECKO_VERSION_INFO_PATH = "{}/bin/version_info".format(os.getcwd())
# path to the auto clean tool
CLEANUP_TOOL_PATH = "{}/etc/scripts/cleanup.sh".format(os.getcwd())
# paths to sqlmap and nmap

View file

@ -102,12 +102,14 @@ def request_issue_creation():
"title": issue_title,
"body": "Zeus version:\n`{}`\n\n"
"Firefox version:\n`{}`\n\n"
"Geckodriver version:\n`{}`\n\n"
"Error info:\n```{}````\n\n"
"Running details:\n`{}`\n\n"
"Commands used:\n`{}`\n\n"
"Log file info:\n```{}```".format(
lib.core.settings.VERSION,
ff_version,
open(lib.core.settings.GECKO_VERSION_INFO_PATH).read(),
str(stacktrace),
str(platform.platform()),
" ".join(sys.argv),