Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix payload handling across py2/py3 and supress scapy warnings #67

Merged
merged 1 commit into from
Feb 15, 2022
Merged

fix payload handling across py2/py3 and supress scapy warnings #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions Source/Module/pcap_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down