fix #432

L1ghtn1ng · L1ghtn1ng · commit 880e76b636c5 · 2025-12-07T05:03:09.000Z
diff --git a/dnsrecon/lib/bingenum.py b/dnsrecon/lib/bingenum.py
@@ -15,15 +15,10 @@
 
 import re
 import time
-import urllib.request
 
-__name__ = 'bingenum'
-
-url_opener = urllib.request.FancyURLopener
+import httpx
 
-
-class AppURLopener(url_opener):
-    version = 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'
+__name__ = 'bingenum'
 
 
 def scrape_bing(dom):
@@ -48,24 +43,17 @@ def scrape_bing(dom):
         '140',
         '150',
     ]
-    urllib._urlopener = AppURLopener()
 
-    for n in searches:
-        url = 'https://www.bing.com/search?q=domain%3A' + dom + '&qs=n&first=' + n
-        req = urllib.request.Request(
-            url,
-            data=None,
-            headers={
-                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36'
-            },
-        )
+    headers = {'User-Agent': 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'}
 
-        sock = urllib.request.urlopen(req, timeout=10)
-        data = sock.read().decode('utf-8')
-        safe_dom = re.escape(dom)
-        results.extend(re.findall(r'([a-zA-Z0-9\-.]+' + safe_dom + ')/?', data))
-        sock.close()
-        time.sleep(5)
+    with httpx.Client(headers=headers) as client:
+        for n in searches:
+            url = 'https://www.bing.com/search?q=domain%3A' + dom + '&qs=n&first=' + n
+            response = client.get(url, timeout=10.0)
+            data = response.text
+            safe_dom = re.escape(dom)
+            results.extend(re.findall(r'([a-zA-Z0-9\-.]+' + safe_dom + ')/?', data))
+            time.sleep(5)
 
     return unique(results)
 
diff --git a/dnsrecon/lib/yandexenum.py b/dnsrecon/lib/yandexenum.py
@@ -17,18 +17,11 @@
 
 import re
 import time
-import urllib
-import urllib.request
 
+import httpx
 from loguru import logger
 
 __name__ = 'yandexenum'
-url_opener = urllib.request.FancyURLopener
-
-
-class AppURLopener(url_opener):
-    version = """Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
-                     (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246"""
 
 
 def scrape_yandex(dom):
@@ -37,25 +30,33 @@ def scrape_yandex(dom):
     """
     results = []
     searches = ['1', '2', '3', '4', '5', '10', '20', '30']
-    urllib._urlopener = AppURLopener()
 
-    for _ in searches:
-        url = 'https://yandex.com/search/?text=site%3A' + dom
-        try:
-            sock = urllib.request.urlopen(url, timeout=10)
-            data = sock.read().decode('utf-8')
-            sock.close()
-        except Exception as e:
-            logger.error(e)
-            return []
+    headers = {
+        'User-Agent': (
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
+            'AppleWebKit/537.36 (KHTML, like Gecko) '
+            'Chrome/42.0.2311.135 Safari/537.36 Edge/12.246'
+        )
+    }
+
+    with httpx.Client(headers=headers) as client:
+        for _ in searches:
+            url = 'https://yandex.com/search/?text=site%3A' + dom
+            try:
+                response = client.get(url, timeout=10.0)
+                data = response.text
+            except Exception as e:
+                logger.error(e)
+                return []
 
-        if re.search('enter_captcha_value', data):
-            logger.error("Yandex has detected the search as 'bot activity, stopping search...")
-            return unique(results)
+            if re.search('enter_captcha_value', data):
+                logger.error("Yandex has detected the search as 'bot activity, stopping search...")
+                return unique(results)
 
-        results.extend(re.findall(r'([a-zA-Z0-9\-\.]+' + dom + ')/?', data))
+            safe_dom = re.escape(dom)
+            results.extend(re.findall(r'([a-zA-Z0-9\-\.]+' + safe_dom + ')/?', data))
 
-        time.sleep(10)
+            time.sleep(10)
 
     return unique(results)
 
