prehistoric-systems/Zeus-Scanner
1
0
Fork 0
mirror of https://github.com/Ekultek/Zeus-Scanner.git synced 2026-03-11 08:55:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch for an issue where I rolled back a search setting

Browse source
This commit is contained in:
ekultek 2017-11-09 08:31:29 -06:00
parent f8623a59ea
commit 49cfc78d9e
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/checksum/md5sum.md5
View file

@ -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

2
lib/core/settings.py
View file

@ -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 <major.minor.commit.patch ID>
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}

8
var/google_search/search.py
View file

@ -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)