Remove msf_print, switch to loguru for logging

Replaced custom printing functions from msf_print.py with loguru for consistent logging. Updated all impacted scripts and added loguru to requirements.txt. Removed obsolete msf_print module.
darkoperator · Oct 18, 2024 · 7ffbbae · 7ffbbae
1 parent 32fc265
commit 7ffbbae
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 261 deletions.
diff --git a/dnsrecon/cli.py b/dnsrecon/cli.py
diff --git a/dnsrecon/lib/bingenum.py b/dnsrecon/lib/bingenum.py
@@ -17,6 +17,8 @@
 import time
 import urllib.request
 
+__name__ = 'bingenum'
+
 url_opener = urllib.request.FancyURLopener
 
 

diff --git a/dnsrecon/lib/crtenum.py b/dnsrecon/lib/crtenum.py
@@ -17,42 +17,43 @@
 from urllib.error import HTTPError, URLError
 from urllib.request import Request, urlopen
 
+from loguru import logger
 from lxml import etree
 
-from dnsrecon.lib.msf_print import *
+__name__ = 'crtenum'
 
 
 def scrape_crtsh(dom):
     """
     Function for enumerating subdomains by scraping crt.sh.
     """
     results = []
-    headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Firefox/31.0'}
+    headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.3'}
     url = f'https://crt.sh/?q=%25.{dom}'
 
     req = Request(url=url, headers=headers)
     try:
         resp = urlopen(req, timeout=30)
         data = resp.read()
     except HTTPError as e:
-        print_error(f'Bad http status from crt.sh: "{e.code}"')
+        logger.error(f'Bad http status from crt.sh: "{e.code}"')
         return results
     except URLError as e:
-        print_error(f'Connection with crt.sh failed. Reason: "{e.reason}"')
+        logger.error(f'Connection with crt.sh failed. Reason: "{e.reason}"')
         return results
 
     root = etree.HTML(data)
     tbl = root.xpath('//table/tr/td/table/tr/td[5]')
     if len(tbl) < 1:
-        print_error('Certificates for subdomains not found')
+        logger.error('Certificates for subdomains not found')
         return results
 
     for ent in tbl:
         sub_dom = ent.text
         if not sub_dom.endswith('.' + dom):
             continue
         if sub_dom.startswith('*.'):
-            print_status(f'\t {sub_dom} wildcard')
+            logger.info(f'\t {sub_dom} wildcard')
             continue
         if sub_dom not in results:
             results.append(sub_dom)

diff --git a/dnsrecon/lib/dnshelper.py b/dnsrecon/lib/dnshelper.py
diff --git a/dnsrecon/lib/msf_print.py b/dnsrecon/lib/msf_print.py
diff --git a/dnsrecon/lib/whois.py b/dnsrecon/lib/whois.py
@@ -18,6 +18,8 @@
 
 from netaddr import *
 
+__name__ = 'whois.py'
+
 WHOIS_PORT_NUMBER = 43
 WHOIS_RECEIVE_BUFFER_SIZE = 4096
 

diff --git a/dnsrecon/lib/yandexenum.py b/dnsrecon/lib/yandexenum.py
@@ -20,8 +20,9 @@
 import urllib
 import urllib.request
 
-from dnsrecon.lib.msf_print import *
+from loguru import logger
 
+__name__ = 'yandexenum'
 url_opener = urllib.request.FancyURLopener
 
 
@@ -45,11 +46,11 @@ def scrape_yandex(dom):
             data = sock.read().decode('utf-8')
             sock.close()
         except Exception as e:
-            print_error(e)
+            logger.error(e)
             return []
 
         if re.search('enter_captcha_value', data):
-            print_error("Yandex has detected the search as 'bot activity, stopping search...")
+            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))

diff --git a/pyproject.toml b/pyproject.toml
@@ -70,7 +70,16 @@ target-version = "py311"
 show-fixes = true
 
 [tool.ruff.lint]
-select = ["E4", "E7", "E9", "F", "I", "UP", "TCH"]
+select = ["E4",
+    "E7",
+    "E9",
+    "F",
+    "I",
+    "UP",
+    "TCH",
+    "RUF",
+    "PT",
+    ]
 ignore = ["E721", "F403", "F405", "UP030"]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 dnspython>=2.6.1
 netaddr
 lxml
-requests
+requests
+loguru