From 49cfc78d9e2a9d371b15807b432cb15cdb66599c Mon Sep 17 00:00:00 2001 From: ekultek Date: Thu, 9 Nov 2017 08:31:29 -0600 Subject: [PATCH] patch for an issue where I rolled back a search setting --- etc/checksum/md5sum.md5 | 4 ++-- lib/core/settings.py | 2 +- var/google_search/search.py | 8 +------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/etc/checksum/md5sum.md5 b/etc/checksum/md5sum.md5 index b98a67f..df7d3bb 100644 --- a/etc/checksum/md5sum.md5 +++ b/etc/checksum/md5sum.md5 @@ -51,10 +51,10 @@ c26df169167f18dad922d14d64d15c7f ./lib/attacks/admin_panel_finder/__init__.py 686935ee6e0277f93aec904bb60d8004 ./lib/attacks/intel_me/__init__.py 1faa2b5dfad6eb538bbfe42942d2a9da ./lib/core/errors.py d41d8cd98f00b204e9800998ecf8427e ./lib/core/__init__.py -2745752495362cdc0da9bde9b8e60e4e ./lib/core/settings.py +bb9e634196a78ada615128612a7c05e8 ./lib/core/settings.py c265970650a068c0f0cdfcdb756c9914 ./lib/header_check/__init__.py d41d8cd98f00b204e9800998ecf8427e ./var/google_search/__init__.py -e9f1e2624154401840b0b118216ba82e ./var/google_search/search.py +80a3ec2db4c45cae6df673676149f9ad ./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 f09808f..1b7057c 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -53,7 +53,7 @@ PATCH_ID = str(subprocess.check_output(["git", "rev-parse", "origin/master"]))[: CLONE = "https://github.com/ekultek/zeus-scanner.git" # current version -VERSION = "1.1.25".format(PATCH_ID) +VERSION = "1.1.26.{}".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 5012305..7aa83e4 100644 --- a/var/google_search/search.py +++ b/var/google_search/search.py @@ -207,12 +207,6 @@ def get_urls(query, url, verbose=False, warning=True, **kwargs): ''.join(proxy_type) + "://" + ''.join(proxy.values()) ), level=10 )) - elif tor: - if proxy is not None: - logger.warning(set_color( - "proxies are not compatible with tor, assuming no proxy and continuing...", level=30 - )) - proxy_to_use = None else: proxy_to_use = None @@ -222,7 +216,7 @@ def get_urls(query, url, verbose=False, warning=True, **kwargs): browser = webdriver.Firefox(profile, proxy=proxy_to_use) else: logger.info(set_color( - "settings tor browser settings..." + "setting tor browser settings..." )) profile = set_tor_browser_settings(profile, verbose=verbose, agent=user_agent, port=tor_port) browser = webdriver.Firefox(profile)