From daf776051729a13c8a67b53c9f67fb989f143543 Mon Sep 17 00:00:00 2001 From: ajmeese7 Date: Sat, 11 Feb 2023 16:30:59 -0500 Subject: [PATCH] fix: remove strings decodes (Python 3) --- var/blackwidow/__init__.py | 4 ++-- var/search/pgp_search.py | 2 +- var/search/selenium_search.py | 2 +- zeus.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/var/blackwidow/__init__.py b/var/blackwidow/__init__.py index cc59861..424b47a 100644 --- a/var/blackwidow/__init__.py +++ b/var/blackwidow/__init__.py @@ -78,7 +78,7 @@ class Blackwidow(object): ) soup = BeautifulSoup(html_page, "html.parser") for link in soup.findAll(attribute): - found_redirect = str(link.get(descriptor)).decode("unicode_escape") + found_redirect = str(link.get(descriptor)) if found_redirect is not None and lib.core.settings.URL_REGEX.match(found_redirect): unique_links.add(found_redirect) else: @@ -159,4 +159,4 @@ def blackwidow_main(url, **kwargs): else: lib.core.settings.logger.fatal(lib.core.settings.set_color( "did not find any usable links from '{}'".format(url), level=50 - )) \ No newline at end of file + )) diff --git a/var/search/pgp_search.py b/var/search/pgp_search.py index 664ea78..db80b38 100644 --- a/var/search/pgp_search.py +++ b/var/search/pgp_search.py @@ -83,7 +83,7 @@ def gather_urls(html, attribute="a", descriptor="href"): redirects, retval = set(), set() soup = BeautifulSoup(html, "html.parser") for link in soup.findAll(attribute): - found_redirect = str(link.get(descriptor)).decode("unicode_escape") + found_redirect = str(link.get(descriptor)) if lib.core.settings.PGP_IDENTIFIER_REGEX.search(found_redirect) is not None: redirects.add(found_redirect) for link in redirects: diff --git a/var/search/selenium_search.py b/var/search/selenium_search.py index 836f441..1abd492 100644 --- a/var/search/selenium_search.py +++ b/var/search/selenium_search.py @@ -61,7 +61,7 @@ def get_urls(query, url, verbose=False, **kwargs): the Google URL. This will open a robot controlled browser window and attempt to get a URL from Google that will be used for scraping afterwards. """ - query = query.decode('unicode_escape').encode('utf-8') + query = query.encode('utf-8') proxy, user_agent = kwargs.get("proxy", None), kwargs.get("user_agent", None) tor, tor_port = kwargs.get("tor", False), kwargs.get("tor_port", None) batch = kwargs.get("batch", False) diff --git a/zeus.py b/zeus.py index 6fac0e5..830b7a6 100755 --- a/zeus.py +++ b/zeus.py @@ -94,7 +94,7 @@ if __name__ == "__main__": if urls_to_use is None: logger.error(set_color( - "unable to run attacks appears that no file was created for the retrieved data", level=40 + "Unable to run attacks appears that no file was created for the retrieved data", level=40 )) shutdown() options = [