nopasaran 0.2.90__py3-none-any.whl → 0.2.92__py3-none-any.whl

nopasaran/primitives/action_primitives/dns_primitives.py

@@ -155,42 +155,32 @@ class DNSPrimitives:
         dns_packet['DNS'].qr = 1
         state_machine.set_variable_value(outputs[0], dns_packet)
 
-
     @staticmethod
     @parsing_decorator(input_args=1, output_args=1)
     def get_DNS_transaction_id(inputs, outputs, state_machine):
         """
         Get the transaction ID from the DNS packet.
-
-        Number of input arguments: 1
-
-        Number of output arguments: 1
-
-        Optional input arguments: No
-
-        Optional output arguments: No
-
-        Args:
-            inputs (List[str]): The list of input variable names. It contains one mandatory input argument, which is the name of the variable containing the DNS packet.
-
-            outputs (List[str]): The list of output variable names. It contains one mandatory output argument, which is the name of the variable to store the transaction ID.
-
-            state_machine: The state machine object.
-
-        Returns:
-            None
         """
         dns_packet = state_machine.get_variable_value(inputs[0])
-        if 'Raw' in dns_packet:
+        dns_layer = None
+
+        # Try to get the DNS layer directly
+        if hasattr(dns_packet, 'haslayer') and dns_packet.haslayer(DNS):
+            dns_layer = dns_packet.getlayer(DNS)
+
+        # If no DNS layer, try to decode from Raw
+        elif hasattr(dns_packet, 'haslayer') and dns_packet.haslayer('Raw'):
             try:
                 dns_layer = DNS(dns_packet['Raw'].load)
-                transaction_id = dns_layer.id
-                state_machine.set_variable_value(outputs[0], transaction_id)
             except Exception as e:
-                logging.error(f"Failed to decode Raw payload as DNS: {e}")
-                state_machine.set_variable_value(outputs[0], None)
+                logging.error(f"[Parsing] Failed to decode Raw payload as DNS: {e}")
+
+        # Extract transaction ID if DNS layer is found
+        if dns_layer:
+            transaction_id = dns_layer.id
+            state_machine.set_variable_value(outputs[0], transaction_id)
         else:
-            logging.error("DNS layer not found and no Raw layer to decode")
+            logging.error("[Parsing] DNS layer not found in packet")
             state_machine.set_variable_value(outputs[0], None)
 
     @staticmethod
@@ -282,42 +272,31 @@ class DNSPrimitives:
 
         state_machine.set_variable_value(outputs[0], dns_packet)
 
-
     @staticmethod
     @parsing_decorator(input_args=1, output_args=1)
     def get_DNS_query_from_DNS_packet(inputs, outputs, state_machine):
         """
         Get the DNS query field (DNSQR) from a DNS packet.
-
-        Number of input arguments: 1
-
-        Number of output arguments: 1
-
-        Optional input arguments: No
-
-        Optional output arguments: No
-
-        Args:
-            inputs (List[str]): The list of input variable names. It contains one mandatory input argument, which is the name of the variable containing the DNS packet.
-
-            outputs (List[str]): The list of output variable names. It contains one mandatory output argument, which is the name of the variable to store the DNS query.
-
-            state_machine: The state machine object.
-
-        Returns:
-            None
         """
         dns_packet = state_machine.get_variable_value(inputs[0])
-        if 'Raw' in dns_packet:
+        dns_layer = None
+
+        # Try to get DNS layer directly if present
+        if hasattr(dns_packet, 'haslayer') and dns_packet.haslayer(DNS):
+            dns_layer = dns_packet.getlayer(DNS)
+
+        # Attempt to decode Raw payload as DNS if DNS layer isn't directly present
+        elif hasattr(dns_packet, 'haslayer') and dns_packet.haslayer('Raw'):
             try:
                 dns_layer = DNS(dns_packet['Raw'].load)
-                dns_query = dns_layer.qd
-                state_machine.set_variable_value(outputs[0], dns_query)
             except Exception as e:
-                logging.error(f"Failed to decode Raw payload as DNS: {e}")
-                state_machine.set_variable_value(outputs[0], None)
+                logging.error(f"[Parsing] Failed to decode Raw payload as DNS: {e}")
+
+        if dns_layer and getattr(dns_layer, "qd", None):
+            dns_query = dns_layer.qd
+            state_machine.set_variable_value(outputs[0], dns_query)
         else:
-            logging.error("DNS layer not found and no Raw layer to decode")
+            logging.error("[Parsing] DNS query not found in packet")
             state_machine.set_variable_value(outputs[0], None)
 
     @staticmethod
@@ -858,15 +837,10 @@ class DNSPrimitives:
             48: "DNSKEY", 255: "ANY"
         }
 
-        dnsqtypes = dnsatypes  # if you meant dnsatypes to cover both
-
         dns_layer = None
 
-        # Try to get DNS layer from packet
         if hasattr(packet, 'haslayer') and packet.haslayer(DNS):
             dns_layer = packet.getlayer(DNS)
-
-        # Try to parse DNS from Raw if not directly available
         elif hasattr(packet, 'haslayer') and packet.haslayer('Raw'):
             try:
                 dns_layer = DNS(packet['Raw'].load)
@@ -890,33 +864,36 @@ class DNSPrimitives:
                 "answers": []
             }
 
-            # Handle DNS question
+            # Handle DNS questions
             if getattr(dns_layer, "qdcount", 0) > 0 and getattr(dns_layer, "qd", None):
                 try:
                     question = dns_layer.qd
                     formatted_response["questions"].append({
                         "qname": question.qname.decode() if isinstance(question.qname, bytes) else question.qname,
                         "qtype": question.qtype,
-                        "qtype_name": dnsqtypes.get(question.qtype, f"Unknown({question.qtype})"),
+                        "qtype_name": dnsatypes.get(question.qtype, f"Unknown({question.qtype})"),
                         "qclass": question.qclass
                     })
                 except Exception as e:
                     logging.error(f"[Parsing] Failed to parse DNS question: {e}")
 
-            # Handle DNS answers
+            # Handle DNS answers (support for lists and chained payloads)
             try:
-                ans = dns_layer.an if getattr(dns_layer, "ancount", 0) > 0 else None
-                while ans and isinstance(ans, DNSRR):
+                ans = dns_layer.an
+                for _ in range(getattr(dns_layer, "ancount", 0)):
+                    if not isinstance(ans, DNSRR):
+                        break
                     answer_info = {
                         "rrname": ans.rrname.decode() if isinstance(ans.rrname, bytes) else ans.rrname,
                         "type": ans.type,
                         "type_name": dnsatypes.get(ans.type, f"Unknown({ans.type})"),
                         "rclass": ans.rclass,
                         "ttl": ans.ttl,
-                        "rdata": str(ans.rdata),
+                        "rdata": ans.rdata.decode() if isinstance(ans.rdata, bytes) else str(ans.rdata),
+                        "rdlen": getattr(ans, "rdlen", None)
                     }
                     formatted_response["answers"].append(answer_info)
-                    ans = ans.payload if isinstance(ans.payload, DNSRR) else None
+                    ans = ans.payload
             except Exception as e:
                 logging.error(f"[Parsing] Failed to parse DNS answers: {e}")
 

{nopasaran-0.2.90.dist-info → nopasaran-0.2.92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.90
+Version: 0.2.92
 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.90.dist-info → nopasaran-0.2.92.dist-info}/RECORD

@@ -34,7 +34,7 @@ nopasaran/primitives/action_primitives/client_echo_primitives.py,sha256=2Qupem0N
 nopasaran/primitives/action_primitives/control_channel_primitives.py,sha256=_OMgxLLtaK0vvobwhPvSAJhYCOgn4optcGhXOdgh1Q4,11281
 nopasaran/primitives/action_primitives/data_channel_primitives.py,sha256=gDnjw76kFeMtDD4Mnv31vsx6xQsxvavsbYr4yhRH_hg,4557
 nopasaran/primitives/action_primitives/data_manipulation.py,sha256=mt-BNOEIxyvXzHTwRO1ch1DzzYHQK1AduhRs11TOKH4,15450
-nopasaran/primitives/action_primitives/dns_primitives.py,sha256=mnt7zecpoLO61PPb45jGXw-Pm_PNTQNBSUxUBzbimfY,33983
+nopasaran/primitives/action_primitives/dns_primitives.py,sha256=grtwAMKBSUPWX4t-tOMGPejDasS7KVflrUKSSOcfM0A,33371
 nopasaran/primitives/action_primitives/event_primitives.py,sha256=V2FurvbeRy6nAcDne3Xm4Y86bvo5UYpEeUJFos842tY,2699
 nopasaran/primitives/action_primitives/http_1_request_primitives.py,sha256=ov4OLXyNiWNjJYS0GjHwuRFkS5DLQaAh6P6ETy1r5ng,14562
 nopasaran/primitives/action_primitives/http_1_response_primitives.py,sha256=0wS61tl1KSAlIkYkPXMjbbnY5LqKzl9UtuoK56S4IHQ,7947
@@ -73,9 +73,9 @@ nopasaran/tools/http_2_socket_client.py,sha256=5mmc8FuT2dNVAihbMdvyytVwME_xSc7me
 nopasaran/tools/http_2_socket_server.py,sha256=8W-bxmdoGyK5moxpC87V1EGuZ9jJpIKhokvZrDV84kk,5551
 nopasaran/tools/https_1_socket_server.py,sha256=0mJ_0zCC-7rtvyjehTnm1QJxWx8R4YHkAWRHm2msvL4,9217
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nopasaran-0.2.90.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-nopasaran-0.2.90.dist-info/METADATA,sha256=qc43mImD-jJXXlih1AfzFd1_MwIIDFvuwP-7qQHAugY,5474
-nopasaran-0.2.90.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-nopasaran-0.2.90.dist-info/entry_points.txt,sha256=LaOz5GlWuMLjzg4KOEB5OVTattCXVW6a4nSW-WQajCw,55
-nopasaran-0.2.90.dist-info/top_level.txt,sha256=60R1FzpprzU8iiJ1cBMNOA0F083_lYoctFo7pzOpMwY,16
-nopasaran-0.2.90.dist-info/RECORD,,
+nopasaran-0.2.92.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nopasaran-0.2.92.dist-info/METADATA,sha256=qdh8BZCslIEOBGYQHXFLZ1_bWUv9sUuegmP0EA6OFqw,5474
+nopasaran-0.2.92.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+nopasaran-0.2.92.dist-info/entry_points.txt,sha256=LaOz5GlWuMLjzg4KOEB5OVTattCXVW6a4nSW-WQajCw,55
+nopasaran-0.2.92.dist-info/top_level.txt,sha256=60R1FzpprzU8iiJ1cBMNOA0F083_lYoctFo7pzOpMwY,16
+nopasaran-0.2.92.dist-info/RECORD,,