Merge pull request #67 from Srinivas11789/r3.1

fix payload handling across py2/py3 and supress scapy warnings
Srinivas11789 · Feb 15, 2022 · 262d6e5 · 262d6e5
2 parents dc2bd65 + 27cb2ae
commit 262d6e5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Source/Module/pcap_reader.py b/Source/Module/pcap_reader.py
@@ -65,6 +65,9 @@ def __init__(self, pcap_file_name, pcap_parser_engine="scapy"):
             if tls_view_feature:
                 load_layer("tls")
 
+            # Supress scapy warnings and prefer errors only
+            logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
             # Scapy sessions and other types use more O(N) iterations so just
             # - use rdpcap + our own iteration (create full duplex streams)
             self.packets = rdpcap(pcap_file_name)
@@ -329,10 +332,13 @@ def analyse_packet_data(self):
                                 elif "SSLv3" in packet:
                                     memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["SSLv3"].msg))
                                 else:
-                                    memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["TCP"].payload)) 
+                                    if "_TLSEncryptedContent" in packet["TCP"]: # handle encrypted payload
+                                        memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["TCP"].payload.show(True)))
+                                    else:
+                                        memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["TCP"].payload))
                             else:
                                 # TODO: clean this payload dump
-                                memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["TCP"].payload))
+                                memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["TCP"].payload.show(True)))
                             payload_string = packet["TCP"].payload
                         elif "UDP" in packet:
                             memory.packet_db[source_private_ip]["Payload"][payload].append(str(packet["UDP"].payload))