From d4c1e2dc1c1e9665207d66115bd6328cd67bbe59 Mon Sep 17 00:00:00 2001 From: ekultek Date: Mon, 13 Nov 2017 09:48:02 -0600 Subject: [PATCH] patch for an issue where the firefox profile would fail, will now specify the binary path if you hit this error (issue #143) --- etc/checksum/md5sum.md5 | 4 ++-- lib/core/settings.py | 2 +- var/google_search/search.py | 29 +++++++++++++++++++---------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/etc/checksum/md5sum.md5 b/etc/checksum/md5sum.md5 index f0003f0..ce8fe2f 100644 --- a/etc/checksum/md5sum.md5 +++ b/etc/checksum/md5sum.md5 @@ -57,10 +57,10 @@ b50e4b7fb9fdef374c00b7ab0ef913e9 ./lib/attacks/xss_scan/__init__.py 21faf4679cdeaa731029a48f8963d6e7 ./lib/attacks/nmap_scan/nmap_opts.py 1faa2b5dfad6eb538bbfe42942d2a9da ./lib/core/errors.py d41d8cd98f00b204e9800998ecf8427e ./lib/core/__init__.py -bb55719f0ac5853a4bef43a76378348f ./lib/core/settings.py +7d0c06f6bcbc8a9e024e433a94426913 ./lib/core/settings.py e25de81c51e5572d29e3e161dd35f41d ./lib/header_check/__init__.py d41d8cd98f00b204e9800998ecf8427e ./var/google_search/__init__.py -670fb7fa0c618ce9712e0f73f7752925 ./var/google_search/search.py +2a7c4285914548b86593e6e000bdab32 ./var/google_search/search.py d41d8cd98f00b204e9800998ecf8427e ./var/__init__.py d41d8cd98f00b204e9800998ecf8427e ./var/auto_issue/__init__.py dadca85c232153021ba9ff253d8ee1d9 ./var/auto_issue/github.py diff --git a/lib/core/settings.py b/lib/core/settings.py index 79b6754..6e04168 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -55,7 +55,7 @@ CLONE = "https://github.com/ekultek/zeus-scanner.git" ISSUE_LINK = "https://github.com/ekultek/zeus-scanner/issues" # current version -VERSION = "1.2.8".format(PATCH_ID) +VERSION = "1.2.8.{}".format(PATCH_ID) # colors to output depending on the version VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30} diff --git a/var/google_search/search.py b/var/google_search/search.py index a9f09b7..ee7f930 100644 --- a/var/google_search/search.py +++ b/var/google_search/search.py @@ -14,6 +14,7 @@ except ImportError: ) import requests +import whichcraft from bs4 import BeautifulSoup from selenium import webdriver from pyvirtualdisplay import Display @@ -212,16 +213,24 @@ def get_urls(query, url, verbose=False, warning=True, **kwargs): else: proxy_to_use = None - profile = webdriver.FirefoxProfile() - if not tor: - profile.set_preference("general.useragent.override", user_agent) - browser = webdriver.Firefox(profile, proxy=proxy_to_use) - else: - logger.info(set_color( - "setting tor browser settings..." - )) - profile = set_tor_browser_settings(profile, verbose=verbose, agent=user_agent, port=tor_port) - browser = webdriver.Firefox(profile) + try: + profile = webdriver.FirefoxProfile() + if not tor: + profile.set_preference("general.useragent.override", user_agent) + browser = webdriver.Firefox(profile, proxy=proxy_to_use) + else: + logger.info(set_color( + "setting tor browser settings..." + )) + profile = set_tor_browser_settings(profile, verbose=verbose, agent=user_agent, port=tor_port) + browser = webdriver.Firefox(profile) + except OSError: + if not tor: + profile.set_preference("general.useragent.override", user_agent) + browser = webdriver.Firefox(profile, proxy=proxy_to_use, executable_path=whichcraft.which("geckodriver")) + else: + profile = set_tor_browser_settings(profile, verbose=verbose, agent=user_agent, port=tor_port) + browser = webdriver.Firefox(profile, executable_path=whichcraft.which("geckodriver")) logger.info(set_color("browser will open shortly...")) browser.get(url)