Add web frontend with JWT auth, RBAC, SSE dashboard, and config editor
- FastAPI + htmx + Jinja2 web frontend, started with --web flag - JWT HS256 auth (WEB_SECRET_KEY) with httpOnly cookies; access (15 min) + refresh (7 day) tokens; refresh rotation + JTI revocation in data/web.db - RBAC: superadmin > admin > reader enforced per route - Live SSE dashboard fed by tui/events broadcast queue - Config editor: keyword groups and channel list saved to data/runtime_config.json and hot-reloaded in-process (scorer.reload_from_config, signal_channel_changed) - config.py migrated to load groups/channels from runtime_config.json; falls back to hardcoded defaults when file absent - tui/events.py: subscribe/unsubscribe broadcast, set_bot_context/signal_channel_changed - utils/scorer.py: import config as _config (fixes local binding); reload_from_config() - utils/database.py: count_by_severity, recent_for_domains, count_by_severity_for_domains - 53 new tests (events bus, JWT lifecycle, web DB CRUD, RBAC enforcement, config round-trip); total 141 passing
This commit is contained in:
61
config.py
61
config.py
@@ -2,12 +2,16 @@
|
||||
config.py — Loads and validates all settings from .env
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from pathlib import Path
|
||||
from dotenv import load_dotenv
|
||||
|
||||
load_dotenv()
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
# -- Timeouts --
|
||||
BOT_REPLY_TIMEOUT = 10
|
||||
|
||||
@@ -18,19 +22,21 @@ BOT_TOKEN = os.environ["BOT_TOKEN"]
|
||||
NOTIFY_CHAT_ID = int(os.environ["NOTIFY_CHAT_ID"])
|
||||
SESSION_NAME = os.getenv("SESSION_NAME", "monitor_session")
|
||||
|
||||
# ─── Target keywords ─────────────────────────────────────────────────────────
|
||||
# ─── Runtime config path ─────────────────────────────────────────────────────
|
||||
RUNTIME_CONFIG_PATH = Path("./data/runtime_config.json")
|
||||
|
||||
# ─── Hardcoded defaults (used when runtime_config.json is absent) ─────────────
|
||||
# Add your org's domains, email patterns, IP ranges, known usernames, etc.
|
||||
# All patterns are case-insensitive regex.
|
||||
TARGET_KEYWORDS: list[str] = [
|
||||
_DEFAULT_KEYWORDS: list[str] = [
|
||||
r"sanatorioaleman\.cl",
|
||||
r"@sanatorioaleman\.cl",
|
||||
# r"192\.168\.10\.", # internal IP range example
|
||||
# r"specificuser", # known internal usernames
|
||||
]
|
||||
|
||||
# ─── Channels to watch ───────────────────────────────────────────────────────
|
||||
# Use usernames (without @) or numeric channel IDs (-100xxxxxxxxxx)
|
||||
WATCHED_CHANNELS: list[str | int] = [
|
||||
_DEFAULT_CHANNELS: list[str | int] = [
|
||||
#-1002230225603,
|
||||
"cloudxlog",
|
||||
#-1001967030016, # daisycloud
|
||||
@@ -50,6 +56,53 @@ WATCHED_CHANNELS: list[str | int] = [
|
||||
#-1001234567890, # private channel by ID
|
||||
]
|
||||
|
||||
# ─── Runtime config helpers ───────────────────────────────────────────────────
|
||||
|
||||
def _load_runtime_config() -> dict:
|
||||
"""Load runtime_config.json; return empty dict if absent or malformed."""
|
||||
if not RUNTIME_CONFIG_PATH.exists():
|
||||
return {}
|
||||
try:
|
||||
with open(RUNTIME_CONFIG_PATH) as f:
|
||||
return json.load(f)
|
||||
except Exception as e:
|
||||
log.warning("Failed to load %s: %s", RUNTIME_CONFIG_PATH, e)
|
||||
return {}
|
||||
|
||||
|
||||
def _keywords_from_groups(groups: list[dict]) -> list[str]:
|
||||
"""Flatten all group patterns into a single keyword list."""
|
||||
return [p["regex"] for g in groups for p in g.get("patterns", [])]
|
||||
|
||||
|
||||
# ─── Live config ──────────────────────────────────────────────────────────────
|
||||
# Populated from runtime_config.json at import; falls back to hardcoded defaults.
|
||||
|
||||
_cfg = _load_runtime_config()
|
||||
|
||||
KEYWORD_GROUPS: list[dict] = _cfg.get("groups", [])
|
||||
TARGET_KEYWORDS: list[str] = (
|
||||
_keywords_from_groups(KEYWORD_GROUPS) if KEYWORD_GROUPS else _DEFAULT_KEYWORDS
|
||||
)
|
||||
WATCHED_CHANNELS: list[str | int] = _cfg.get("channels", _DEFAULT_CHANNELS)
|
||||
|
||||
|
||||
def save_runtime_config(groups: list[dict], channels: list[str | int]) -> None:
|
||||
"""
|
||||
Persist keyword groups + channel list to runtime_config.json.
|
||||
Updates module globals so the running process sees the new values immediately.
|
||||
Called by web config routes after validating input.
|
||||
"""
|
||||
global KEYWORD_GROUPS, TARGET_KEYWORDS, WATCHED_CHANNELS
|
||||
data = {"groups": groups, "channels": channels}
|
||||
RUNTIME_CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
with open(RUNTIME_CONFIG_PATH, "w") as f:
|
||||
json.dump(data, f, indent=2)
|
||||
KEYWORD_GROUPS = groups
|
||||
TARGET_KEYWORDS = _keywords_from_groups(groups) if groups else _DEFAULT_KEYWORDS
|
||||
WATCHED_CHANNELS = channels
|
||||
|
||||
|
||||
# ─── File handling ───────────────────────────────────────────────────────────
|
||||
TEMP_DIR = Path("./tmp")
|
||||
HITS_FILE = Path("./hits.txt")
|
||||
|
||||
Reference in New Issue
Block a user