joachim/vehicle-counter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fps_test: Zugangsdaten in URL maskieren (Hilfe/Ausgabe/Fehler)

Browse Source 
CAMERA_URL kann Credentials enthalten (z.B. rtsp://user:pass@host).
Diese werden in Hilfetext, Lauf-Ausgabe und Fehlermeldung jetzt zu
***:*** maskiert. Default im Code auf neutralen Platzhalter gesetzt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Joachim Hummel
2026-06-03 09:39:52 +02:00
parent 7f162b2568
commit 8a7323a35f
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/fps_test.py
View File

@@ -15,6 +15,7 @@ import argparse
import os import os
import sys import sys
import time import time
from urllib.parse import urlparse, urlunparse
import requests import requests
@@ -25,19 +26,33 @@ except ImportError:
pass pass
APP_URL = "http://localhost:8080/webcam_feed" APP_URL = "http://localhost:8080/webcam_feed"
CAM_URL = os.environ.get("CAMERA_URL", "http://192.168.10.99:81/stream") CAM_URL = os.environ.get("CAMERA_URL", "http://CAMERA-IP:81/stream")
SOI = b"\xff\xd8" # JPEG Start-of-Image SOI = b"\xff\xd8" # JPEG Start-of-Image
EOI = b"\xff\xd9" # JPEG End-of-Image EOI = b"\xff\xd9" # JPEG End-of-Image
def redact(url: str) -> str:
"""Zugangsdaten (user:pass@) in einer URL maskieren -> nie im Klartext anzeigen."""
try:
p = urlparse(url)
if p.username or p.password:
host = p.hostname or ""
if p.port:
host += f":{p.port}"
return urlunparse(p._replace(netloc=f"***:***@{host}"))
except Exception:
pass
return url
def measure(url: str, seconds: float) -> int: def measure(url: str, seconds: float) -> int:
print(f"Messe {seconds:.0f}s an: {url}\n", flush=True) print(f"Messe {seconds:.0f}s an: {redact(url)}\n", flush=True)
try: try:
resp = requests.get(url, stream=True, timeout=(5, 10)) resp = requests.get(url, stream=True, timeout=(5, 10))
resp.raise_for_status() resp.raise_for_status()
except requests.RequestException as exc: except requests.RequestException as exc:
print(f"FEHLER: {exc}") print(f"FEHLER: {str(exc).replace(url, redact(url))}")
return 1 return 1
buf = b"" buf = b""
@@ -97,7 +112,7 @@ def main() -> int:
p = argparse.ArgumentParser(description="Misst FPS/Durchsatz einer MJPEG-Quelle.") p = argparse.ArgumentParser(description="Misst FPS/Durchsatz einer MJPEG-Quelle.")
p.add_argument("url", nargs="?", help="MJPEG-URL (Default: App-Stream)") p.add_argument("url", nargs="?", help="MJPEG-URL (Default: App-Stream)")
p.add_argument("--app", action="store_true", help=f"App-Pipeline messen ({APP_URL})") p.add_argument("--app", action="store_true", help=f"App-Pipeline messen ({APP_URL})")
p.add_argument("--cam", action="store_true", help=f"Kamera direkt messen (CAMERA_URL: {CAM_URL})") p.add_argument("--cam", action="store_true", help=f"Kamera direkt messen (CAMERA_URL: {redact(CAM_URL)})")
p.add_argument("-t", "--seconds", type=float, default=10, help="Messdauer in Sekunden (Default 10)") p.add_argument("-t", "--seconds", type=float, default=10, help="Messdauer in Sekunden (Default 10)")
args = p.parse_args() args = p.parse_args()