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

nopasaran/primitives/action_primitives/dns_primitives.py

@@ -3,7 +3,6 @@ import random
 import string
 import logging
 from nopasaran.decorators import parsing_decorator
-from scapy.layers.dns import dnsqtypes
 
 
 class DNSPrimitives:
@@ -839,6 +838,7 @@ class DNSPrimitives:
 
         dns_layer = None
 
+        # Try to extract DNS layer directly or from Raw
         if hasattr(packet, 'haslayer') and packet.haslayer(DNS):
             dns_layer = packet.getlayer(DNS)
         elif hasattr(packet, 'haslayer') and packet.haslayer('Raw'):
@@ -864,9 +864,9 @@ class DNSPrimitives:
                 "answers": []
             }
 
-            # Handle DNS questions
-            if getattr(dns_layer, "qdcount", 0) > 0 and getattr(dns_layer, "qd", None):
-                try:
+            # Parse questions
+            try:
+                if getattr(dns_layer, "qdcount", 0) > 0 and getattr(dns_layer, "qd", None):
                     question = dns_layer.qd
                     formatted_response["questions"].append({
                         "qname": question.qname.decode() if isinstance(question.qname, bytes) else question.qname,
@@ -874,26 +874,29 @@ class DNSPrimitives:
                         "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}")
+            except Exception as e:
+                logging.error(f"[Parsing] Failed to parse DNS question: {e}")
 
-            # Handle DNS answers (support for lists and chained payloads)
+            # Parse answers (assuming it's a list or iterable)
             try:
-                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": 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
+                answers = dns_layer.an
+                if isinstance(answers, list):
+                    answer_rrs = answers
+                else:
+                    answer_rrs = [answers]  # wrap single DNSRR for uniform handling
+
+                for ans in answer_rrs:
+                    if isinstance(ans, DNSRR):
+                        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": ans.rdata.decode() if isinstance(ans.rdata, bytes) else str(ans.rdata),
+                            "rdlen": getattr(ans, "rdlen", None)
+                        }
+                        formatted_response["answers"].append(answer_info)
             except Exception as e:
                 logging.error(f"[Parsing] Failed to parse DNS answers: {e}")
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.92
+Version: 0.2.94
 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.92.dist-info → nopasaran-0.2.94.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=grtwAMKBSUPWX4t-tOMGPejDasS7KVflrUKSSOcfM0A,33371
+nopasaran/primitives/action_primitives/dns_primitives.py,sha256=QvOFYZQVdRs_0i8-L-yjjNOq4tLwCbTDqZYc3I74Mk4,33504
 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.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,,
+nopasaran-0.2.94.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nopasaran-0.2.94.dist-info/METADATA,sha256=h3YEwDi616TkWxvHYO3SAUuGLrR7_HnZlMBb9xVB9co,5474
+nopasaran-0.2.94.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+nopasaran-0.2.94.dist-info/entry_points.txt,sha256=LaOz5GlWuMLjzg4KOEB5OVTattCXVW6a4nSW-WQajCw,55
+nopasaran-0.2.94.dist-info/top_level.txt,sha256=60R1FzpprzU8iiJ1cBMNOA0F083_lYoctFo7pzOpMwY,16
+nopasaran-0.2.94.dist-info/RECORD,,