yaro/wifi_test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enhance analyze_pcap function to track SSID encryption status and improve handling of hidden SSIDs

Browse source
This commit is contained in:
Yaro Kasear 2025-04-21 15:32:29 -05:00
parent 0129ddeaa2
commit ddc27d9313
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
enrich.py
View file

@ -318,6 +318,8 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
except Exception: except Exception:
continue continue
ssid_encryption_status = {}
for packet in filtered_packets: for packet in filtered_packets:
try: try:
if 'radiotap' not in packet or 'wlan' not in packet: if 'radiotap' not in packet or 'wlan' not in packet:
@ -333,30 +335,28 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
packet_channel = get_channel_from_freq(packet_freq) packet_channel = get_channel_from_freq(packet_freq)
subtype = int(getattr(wlan, 'type_subtype', 0), 16) subtype = int(getattr(wlan, 'type_subtype', 0), 16)
if subtype not in (5, 8): # Probe Response or Beacon if subtype not in (5, 8): # Beacon or Probe Response
continue continue
# Grab management layer once
try: try:
mgt = packet.get_multiple_layers('wlan.mgt')[0] mgt = packet.get_multiple_layers('wlan.mgt')[0]
tags = mgt._all_fields.get('wlan.tagged.all', {}).get('wlan.tag', []) tags = mgt._all_fields.get('wlan.tagged.all', {}).get('wlan.tag', [])
except Exception as e: except Exception:
continue continue
ssid = None ssid = None
hidden_ssid = False hidden_ssid = False
is_open = True # Assume open until proven encrypted
is_open = True
capabilities = getattr(wlan, 'capabilities', None) capabilities = getattr(wlan, 'capabilities', None)
if capabilities: if capabilities:
try: try:
cap_int = int(capabilities, 16) cap_int = int(capabilities, 16)
if cap_int & 0x0010 == 0: if (cap_int & 0x0010): # Privacy bit set = not open
is_open = False is_open = False
except ValueError: except ValueError:
pass pass
for tag in tags: for tag in tags:
tag_number = tag.get('wlan.tag.number') tag_number = tag.get('wlan.tag.number')
@ -379,7 +379,6 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
cisco_ssid_clients[ssid].append(num_clients) cisco_ssid_clients[ssid].append(num_clients)
except (TypeError, ValueError): except (TypeError, ValueError):
pass pass
if ssid: if ssid:
ssid_hidden_status[ssid] = hidden_ssid ssid_hidden_status[ssid] = hidden_ssid
ssid_packet_counts[ssid] += 1 ssid_packet_counts[ssid] += 1
@ -391,14 +390,17 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
cisco_reported_clients.append(num_clients) cisco_reported_clients.append(num_clients)
except (TypeError, ValueError): except (TypeError, ValueError):
pass pass
if not ssid: if not ssid:
continue continue
ssid_hidden_status[ssid] = hidden_ssid
ssid_encryption_status[ssid] = is_open
ssid_packet_counts[ssid] += 1
bssid = getattr(wlan, 'bssid', '').lower() bssid = getattr(wlan, 'bssid', '').lower()
if not bssid or bssid == 'ff:ff:ff:ff:ff:ff': if not bssid or bssid == 'ff:ff:ff:ff:ff:ff':
continue continue
bssid_to_ssid[bssid] = ssid bssid_to_ssid[bssid] = ssid
ssid_to_bssids[ssid].add(bssid) ssid_to_bssids[ssid].add(bssid)
@ -406,9 +408,10 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
if signal: if signal:
ssid_signals[ssid].append(int(signal)) ssid_signals[ssid].append(int(signal))
except Exception as e: except Exception:
continue continue
our_ssid = bssid_to_ssid.get(ap_bssid, None) our_ssid = bssid_to_ssid.get(ap_bssid, None)
clients_on_ap = get_clients_on_ap(filtered_packets, ap_bssid) clients_on_ap = get_clients_on_ap(filtered_packets, ap_bssid)
@ -430,7 +433,7 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
ssid_summary.append({ ssid_summary.append({
'SSID': ssid, 'SSID': ssid,
'Hidden': ssid == '', 'Hidden': ssid == '',
'Open': is_open, 'Open': ssid_encryption_status.get(ssid, True),
'BSSID_Count': len(bssids), 'BSSID_Count': len(bssids),
'BSSIDs': ";".join(sorted(bssids)), 'BSSIDs': ";".join(sorted(bssids)),
'Avg_Signal': mean(signals) if signals else 0, 'Avg_Signal': mean(signals) if signals else 0,