nopasaran 0.2.100__tar.gz → 0.2.102__tar.gz

{nopasaran-0.2.100 → nopasaran-0.2.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.100
+Version: 0.2.102
 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.100 → nopasaran-0.2.102}/nopasaran/primitives/action_primitives/tcp_dns_response_primitives.py

@@ -10,11 +10,12 @@ class TCPDNSResponsePrimitives:
         state_machine.set_variable_value(outputs[0], server)
 
     @staticmethod
-    @parsing_decorator(input_args=2, output_args=0)
+    @parsing_decorator(input_args=3, output_args=0)
     def start_tcp_dns_server(inputs, outputs, state_machine):
         server = state_machine.get_variable_value(inputs[0])
-        port = int(state_machine.get_variable_value(inputs[1]))
-        server.start(port)
+        listening_ip = int(state_machine.get_variable_value(inputs[1]))
+        port = int(state_machine.get_variable_value(inputs[2]))
+        server.start(listening_ip, port)
 
     @staticmethod
     @parsing_decorator(input_args=4, output_args=1)
@@ -28,7 +29,7 @@ class TCPDNSResponsePrimitives:
         """
         server = state_machine.get_variable_value(inputs[0])
         timeout = int(state_machine.get_variable_value(inputs[2]))
-        response_spec = state_machine.get_variable_value(inputs[3])  # can be None
+        response_spec = state_machine.get_variable_value(inputs[3])
 
         result, _ = server.wait_for_query(timeout, response_spec)
         state_machine.set_variable_value(outputs[0], result)

{nopasaran-0.2.100 → nopasaran-0.2.102}/nopasaran/primitives/action_primitives/udp_dns_response_primitives.py

@@ -10,11 +10,12 @@ class UDPDNSResponsePrimitives:
         state_machine.set_variable_value(outputs[0], server)
 
     @staticmethod
-    @parsing_decorator(input_args=2, output_args=0)
+    @parsing_decorator(input_args=3, output_args=0)
     def start_udp_dns_server(inputs, outputs, state_machine):
         server = state_machine.get_variable_value(inputs[0])
-        port = int(state_machine.get_variable_value(inputs[1]))
-        server.start(port)
+        listening_ip = int(state_machine.get_variable_value(inputs[1]))
+        port = int(state_machine.get_variable_value(inputs[2]))
+        server.start(listening_ip, port)
 
     @staticmethod
     @parsing_decorator(input_args=4, output_args=1)

{nopasaran-0.2.100 → nopasaran-0.2.102}/nopasaran/tools/tcp_dns_socket_server.py

@@ -10,13 +10,13 @@ class TCPDNSSocketServer:
     def __init__(self):
         self.sock = None
 
-    def start(self, port):
+    def start(self, listening_ip, port):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.sock.bind(('', port))
+        self.sock.bind((listening_ip, port))
         self.sock.listen(5)
-        logging.info(f"TCP DNS server started on port {port}")
-        return EventNames.SERVER_STARTED.name, f"TCP DNS server started on port {port}"
+        logging.info(f"TCP DNS server started on {listening_ip}:{port}")
+        return EventNames.SERVER_STARTED.name, f"TCP DNS server started on {listening_ip}:{port}"
 
     def wait_for_query(self, timeout, response_spec=None):
         timeout = float(timeout)

{nopasaran-0.2.100 → nopasaran-0.2.102}/nopasaran/tools/udp_dns_socket_server.py

@@ -1,7 +1,4 @@
 import socket
-import struct
-import select
-import time
 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
@@ -10,12 +7,12 @@ class UDPDNSSocketServer:
     def __init__(self):
         self.sock = None
 
-    def start(self, port):
+    def start(self, listening_ip, port):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.sock.bind(('', port))
-        logging.info(f"UDP DNS server started on port {port}")
-        return EventNames.SERVER_STARTED.name, f"UDP DNS server started on port {port}"
+        self.sock.bind((listening_ip, port))
+        logging.info(f"UDP DNS server started on {listening_ip}:{port}")
+        return EventNames.SERVER_STARTED.name, f"UDP DNS server started on {listening_ip}:{port}"
 
     def wait_for_query(self, timeout, response_spec=None):
         self.sock.settimeout(timeout)

{nopasaran-0.2.100 → nopasaran-0.2.102}/nopasaran/utils.py

@@ -426,7 +426,7 @@ def send_tcp_dns_query(server_ip, server_port, domain, query_type="A"):
 
     try:
         logging.debug(f"Building DNS query for domain {domain} with type {query_type_str} ({qtype})")
-        dns_query = DNSRecord.question(domain, qtype=qtype)
+        dns_query = DNSRecord.question(domain, qtype=dnsatypes[qtype])
         dns_query.header.id = random.randint(0, 65535)
         query_packet = dns_query.pack()
         result["query"] = dns_query.toZone()
@@ -463,7 +463,7 @@ def send_tcp_dns_query(server_ip, server_port, domain, query_type="A"):
 
     except Exception as e:
         result["error"] = f"Exception occurred: {str(e)}"
-        logging.exception("An error occurred while sending the TCP DNS query")
+        logging.error("An error occurred while sending the TCP DNS query")
         return result
 
 def send_udp_dns_query(server_ip, server_port, domain, query_type="A"):
@@ -495,7 +495,7 @@ def send_udp_dns_query(server_ip, server_port, domain, query_type="A"):
 
     try:
         logging.debug(f"Building DNS query for domain {domain} with type {query_type_str} ({qtype})")
-        dns_query = DNSRecord.question(domain, qtype=qtype)
+        dns_query = DNSRecord.question(domain, qtype=dnsatypes[qtype])
         dns_query.header.id = random.randint(0, 65535)
         query_packet = dns_query.pack()
         result["query"] = dns_query.toZone()
@@ -516,5 +516,5 @@ def send_udp_dns_query(server_ip, server_port, domain, query_type="A"):
 
     except Exception as e:
         result["error"] = f"Exception occurred: {str(e)}"
-        logging.exception("An error occurred while sending the UDP DNS query")
+        logging.error("An error occurred while sending the UDP DNS query")
         return result

{nopasaran-0.2.100 → nopasaran-0.2.102}/nopasaran.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.100
+Version: 0.2.102
 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.100 → nopasaran-0.2.102}/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.100',
+    version='0.2.102',
     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.",