nopasaran 0.2.109__tar.gz → 0.2.111__tar.gz

{nopasaran-0.2.109 → nopasaran-0.2.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.109
+Version: 0.2.111
 Summary: NoPASARAN is an advanced network tool designed to detect, fingerprint, and locate network middleboxes in a unified framework.
 Home-page: https://github.com/BenIlies/NoPASARAN
 Author: Ilies Benhabbour

{nopasaran-0.2.109 → nopasaran-0.2.111}/nopasaran/tools/udp_dns_socket_server.py

@@ -2,6 +2,7 @@ import socket
 from dnslib import DNSRecord, RR, QTYPE, A, CNAME, MX, TXT, NS, SOA, PTR, AAAA, SRV, DS, RRSIG, NSEC, DNSKEY
 from nopasaran.definitions.events import EventNames
 import logging
+import time
 
 class UDPDNSSocketServer:
     def __init__(self):
@@ -18,31 +19,46 @@ class UDPDNSSocketServer:
         self.sock.settimeout(timeout)
         logging.info(f"Waiting for UDP packets on port {self.sock.getsockname()[1]} with timeout {timeout} seconds")
 
-        try:
-            data, client_addr = self.sock.recvfrom(512)  # max size of a DNS UDP packet
-            logging.debug(f"Received {len(data)} bytes from {client_addr}")
+        start_time = time.time()
 
-            logging.debug("Parsing DNS query...")
-            parsed_query = DNSRecord.parse(data)
-            logging.info(f"Parsed query:\n{parsed_query.toZone()}")
+        while True:
+            try:
+                remaining_time = timeout - (time.time() - start_time)
+                if remaining_time <= 0:
+                    logging.warning("Timeout reached while waiting for a valid DNS query.")
+                    return {"received": None}, EventNames.TIMEOUT.name
 
-            logging.debug("Building DNS response...")
-            response = self.build_response(parsed_query, response_spec)
+                self.sock.settimeout(remaining_time)
+                data, client_addr = self.sock.recvfrom(512)  # max size of a DNS UDP packet
+                logging.debug(f"Received {len(data)} bytes from {client_addr}")
 
-            logging.debug("Sending DNS response...")
-            self.send_dns_response(client_addr, response)
-            logging.info("DNS response sent successfully.")
+                logging.debug("Parsing DNS query...")
+                parsed_query = DNSRecord.parse(data)
 
-            return {
-                "received": str(parsed_query.q)
-            }, EventNames.REQUEST_RECEIVED.name
+                # Check if query section is empty
+                if not parsed_query.questions:
+                    logging.debug("Received DNS packet with no query section. Continuing to wait...")
+                    continue
 
-        except socket.timeout:
-            logging.warning("Timeout reached with no packet received.")
-            return {"received": None}, EventNames.TIMEOUT.name
-        except Exception as e:
-            logging.error(f"Error while handling DNS query: {e}", exc_info=True)
-            return {"received": None}, EventNames.ERROR.name
+                logging.info(f"Parsed query:\n{parsed_query.toZone()}")
+
+                logging.debug("Building DNS response...")
+                response = self.build_response(parsed_query, response_spec)
+
+                logging.debug("Sending DNS response...")
+                self.send_dns_response(client_addr, response)
+                logging.info("DNS response sent successfully.")
+
+                return {
+                    "received": str(parsed_query.q)
+                }, EventNames.REQUEST_RECEIVED.name
+
+            except socket.timeout:
+                logging.warning("Timeout reached while waiting for a valid DNS query.")
+                return {"received": None}, EventNames.TIMEOUT.name
+            except Exception as e:
+                logging.error(f"Error while handling DNS query: {e}", exc_info=True)
+                return {"received": None}, EventNames.ERROR.name
 
     def build_response(self, query_record, response_spec=None):
         qname = str(query_record.q.qname)

{nopasaran-0.2.109 → nopasaran-0.2.111}/nopasaran/utils.py

@@ -458,7 +458,7 @@ def send_tcp_dns_query(server_ip, server_port, domain, query_type="A"):
 
             logging.debug("Received response data")
             parsed_response = DNSRecord.parse(response_data)
-            result["response"] = str(parsed_response).replace("\n", "")
+            result["response"] = str(parsed_response).replace("\n", "").replace(";;", "")
             return result
 
     except Exception as e:
@@ -511,7 +511,7 @@ def send_udp_dns_query(server_ip, server_port, domain, query_type="A"):
 
             logging.debug("Received UDP response")
             parsed_response = DNSRecord.parse(response_data)
-            result["response"] = str(parsed_response).replace("\n", "")
+            result["response"] = str(parsed_response).replace("\n", "").replace(";;", "")
             return result
 
     except Exception as e:

{nopasaran-0.2.109 → nopasaran-0.2.111}/nopasaran.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.109
+Version: 0.2.111
 Summary: NoPASARAN is an advanced network tool designed to detect, fingerprint, and locate network middleboxes in a unified framework.
 Home-page: https://github.com/BenIlies/NoPASARAN
 Author: Ilies Benhabbour

{nopasaran-0.2.109 → nopasaran-0.2.111}/setup.py

@@ -13,7 +13,7 @@ with open(requirements_file, "r") as f:
 # Version will automatically be updated when pushed on the main branch
 setup(
     name="nopasaran",
-    version='0.2.109',
+    version='0.2.111',
     author="Ilies Benhabbour",
     author_email="ilies.benhabbour@kaust.edu.sa",
     description="NoPASARAN is an advanced network tool designed to detect, fingerprint, and locate network middleboxes in a unified framework.",