marcus/mitm-webserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test tshark fix
All checks were successful
Build and Deploy MITM Webserver / build (push) Successful in 9s
Details

Browse Source
This commit is contained in:
malmert
2026-03-07 19:59:16 +01:00
parent 22bb6b8526
commit 09b4add62b
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/utilities/tshark_manager.py
View File

@@ -281,6 +281,13 @@ class TsharkManager:
self._workers: Dict[str, Dict[str, Any]] = {}
self._cache: Dict[Tuple[str, int, str, str, int, int, int], List[Dict[str, Any]]] = {}
self._last_error_by_iface: Dict[str, str] = {}
self._stats: Dict[str, Any] = {
"events_total": 0,
"events_useful": 0,
"lookup_hits": 0,
"backfill_updates_total": 0,
"last_event_by_iface": {},
}
self._lock = threading.Lock()
@property
@@ -338,6 +345,7 @@ class TsharkManager:
event = entries.pop(best_index)
if not entries:
self._cache.pop(signature, None)
self._stats["lookup_hits"] += 1
return _build_enrichment(event)
@@ -356,6 +364,7 @@ class TsharkManager:
},
"cache_entries": sum(len(entries) for entries in self._cache.values()),
"last_error_by_iface": dict(self._last_error_by_iface),
"stats": dict(self._stats),
}
def _start_worker_locked(self, iface: str) -> None:
@@ -465,10 +474,25 @@ class TsharkManager:
with self._lock:
entries = self._cache.setdefault(signature, [])
entries.append(event)
self._stats["events_total"] += 1
self._stats["last_event_by_iface"][iface] = {
"observed_at_ms": event.get("observed_at_ms"),
"protocol": event.get("protocol"),
"src_ip": event.get("src_ip"),
"dst_ip": event.get("dst_ip"),
"src_port": event.get("src_port"),
"dst_port": event.get("dst_port"),
"frame_protocols": event.get("frame_protocols"),
"http": event.get("http"),
"tls": event.get("tls"),
"dns": event.get("dns"),
}
self._purge_cache_locked(now_ms=int(event["observed_at_ms"]))
enrichment = _build_enrichment(event)
if _has_useful_enrichment(enrichment):
with self._lock:
self._stats["events_useful"] += 1
self._schedule_backfill(event, enrichment)
rc = process.poll()
@@ -495,6 +519,8 @@ class TsharkManager:
window_ms=settings.tshark_match_window_ms,
)
if updated:
with self._lock:
self._stats["backfill_updates_total"] += updated
logger.debug(
"Backfilled tshark metadata for %s packets on %s %s:%s -> %s:%s",
updated,