nopasaran 0.2.91__tar.gz → 0.2.93__tar.gz

{nopasaran-0.2.91 → nopasaran-0.2.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nopasaran
-Version: 0.2.91
+Version: 0.2.93
 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.91 → nopasaran-0.2.93}/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:
@@ -837,15 +836,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)
@@ -869,33 +863,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.91 → nopasaran-0.2.93}/nopasaran.egg-info/PKG-INFO

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