nopasaran 0.2.100__py3-none-any.whl → 0.2.102__py3-none-any.whl

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/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/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/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/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.dist-info → nopasaran-0.2.102.dist-info}/METADATA

@@ -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.dist-info → nopasaran-0.2.102.dist-info}/RECORD

@@ -2,7 +2,7 @@ nopasaran/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nopasaran/__main__.py,sha256=9dY9M5gbwdR74rBezoSAvQPO3acAVHFA5Kov9KkrXO8,2461
 nopasaran/decorators.py,sha256=4QcUtZAMYZqNWwv7OsIAhHcec8C_MfxThA8kmUXw1Xo,2941
 nopasaran/http_2_utils.py,sha256=eQL8uG2USCN5ab2brrYtxcTnYk-g3s_b7v4bZ3YdA-Y,26324
-nopasaran/utils.py,sha256=eIb6i_qo-dOpemccP0X9b2NFnGOhpSt81vYv8eoiD6E,16442
+nopasaran/utils.py,sha256=eCmEOHO9XJEmlrhr-0wHfbO9zrvTCw4XO24dszjWQHA,16456
 nopasaran/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nopasaran/controllers/controller.py,sha256=kh6_ByvSMRiz8o8DgfR00WfylmClVZKdHe1OIcnltp8,7326
 nopasaran/controllers/factory.py,sha256=e1c6oea4ePiSZcQuAUn-515kjgmBIOqFXQ_78huEXHw,1287
@@ -52,12 +52,12 @@ nopasaran/primitives/action_primitives/replay_primitives.py,sha256=pRMq6eZsm82rf
 nopasaran/primitives/action_primitives/server_echo_primitives.py,sha256=CSw99moDTUqWnwJ19kcLmsRsUZfsysWk50N8pJWqcbo,6660
 nopasaran/primitives/action_primitives/signaling_primitive.py,sha256=4gmG3r5lXX1KsicPwepGTrnouNpc6j0Bkf8pV5jJTmw,6634
 nopasaran/primitives/action_primitives/tcp_dns_request_primitives.py,sha256=sJGSc0bl7LtE_dFE0ezj1HWvY-cWEIUBQuXaQAVk2K0,1328
-nopasaran/primitives/action_primitives/tcp_dns_response_primitives.py,sha256=Ogf9idWfMgoo3oXFSzyG358jsgDybdti7JXHF-xVMmo,1657
+nopasaran/primitives/action_primitives/tcp_dns_response_primitives.py,sha256=kxePHX62tdKpcce--RsbC9pRwNVg-v_z_lKAEioiwP0,1728
 nopasaran/primitives/action_primitives/tcp_primitives.py,sha256=H4lpqeL5uhqqwC0RYrelO0BlrTocrfGl4dbd6FUi5FI,16909
 nopasaran/primitives/action_primitives/timing_primitives.py,sha256=hq4Q2_9nbL9ihf5TRAMRPWZuybqP4CXZxfstelAF6R8,980
 nopasaran/primitives/action_primitives/tls_primitives.py,sha256=UZ-bwYBDCVxPrZjodGTTdICYGjfA9WPymIAqaOeaZYI,6163
 nopasaran/primitives/action_primitives/udp_dns_request_primitives.py,sha256=p-FsvWJUDTOI34oeuV46oPh8FEvT0LR23lc_oAwuNI8,1328
-nopasaran/primitives/action_primitives/udp_dns_response_primitives.py,sha256=F93weT7OU6Qsu3g26k6Frdiclr67pLWQ2hBhcthOWFo,1657
+nopasaran/primitives/action_primitives/udp_dns_response_primitives.py,sha256=MpuVE66QIa6U2T1WjCel4cPfqdO4UipeLLCM1DxBzYY,1743
 nopasaran/primitives/action_primitives/udp_primitives.py,sha256=SHYzi1FS4EEIssSwMEUOTyQlSnyung8iWR6LzJLrarM,7533
 nopasaran/primitives/condition_primitives/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nopasaran/primitives/condition_primitives/condition_primitives.py,sha256=-AQdtK_lQfy7Qo3CVVII8MKPKtE9nvea2fh8sDOjdlc,307
@@ -76,12 +76,12 @@ nopasaran/tools/http_2_socket_base.py,sha256=KDfkU4Nr_TXxqzp1-ZHec_UawfDZ5oIIj-J
 nopasaran/tools/http_2_socket_client.py,sha256=5mmc8FuT2dNVAihbMdvyytVwME_xSc7mez_jwU3YZOA,6256
 nopasaran/tools/http_2_socket_server.py,sha256=8W-bxmdoGyK5moxpC87V1EGuZ9jJpIKhokvZrDV84kk,5551
 nopasaran/tools/https_1_socket_server.py,sha256=ytLVYdH5je4L6ElCKKhhsbU_53gT6QF9l5ym7q5TMmo,8162
-nopasaran/tools/tcp_dns_socket_server.py,sha256=RHbeydTHZ5nIe3llGGX81BLcVSV0pkM38rhxJgn5Edw,7924
-nopasaran/tools/udp_dns_socket_server.py,sha256=OlQYNfnoLP_A-H61qyfVMvXFK-dg0rmx8r-wnQYMKRk,5600
+nopasaran/tools/tcp_dns_socket_server.py,sha256=SoocyqybKYeU0Oq4Zjk2bkekWWQ2GGmZYUc6MbvSIyE,7968
+nopasaran/tools/udp_dns_socket_server.py,sha256=5V-iELbdqM1zGSpZU2T8HqkHgiQqZtKXaSO-MqnSeaI,5604
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nopasaran-0.2.100.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-nopasaran-0.2.100.dist-info/METADATA,sha256=ptgsvI-vdzT9TSRfI_h1GxXnAqde_5IAjT-OJeY1foo,5497
-nopasaran-0.2.100.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-nopasaran-0.2.100.dist-info/entry_points.txt,sha256=LaOz5GlWuMLjzg4KOEB5OVTattCXVW6a4nSW-WQajCw,55
-nopasaran-0.2.100.dist-info/top_level.txt,sha256=60R1FzpprzU8iiJ1cBMNOA0F083_lYoctFo7pzOpMwY,16
-nopasaran-0.2.100.dist-info/RECORD,,
+nopasaran-0.2.102.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nopasaran-0.2.102.dist-info/METADATA,sha256=8t0cs78NA8q-fX3Gsn_yMXc_CF2xv44hGyYcko18b9Y,5497
+nopasaran-0.2.102.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+nopasaran-0.2.102.dist-info/entry_points.txt,sha256=LaOz5GlWuMLjzg4KOEB5OVTattCXVW6a4nSW-WQajCw,55
+nopasaran-0.2.102.dist-info/top_level.txt,sha256=60R1FzpprzU8iiJ1cBMNOA0F083_lYoctFo7pzOpMwY,16
+nopasaran-0.2.102.dist-info/RECORD,,