feat: HTTPS auto-normalization; robust TLS intel UI; global rules state; clean logging; preload
- Add SSL/TLS intelligence pipeline:
- crt.sh lookup with expired-filtering and root-domain wildcard resolution
- live TLS version/cipher probe with weak/legacy flags and probe notes
- UI: card + matrix rendering, raw JSON toggle, and host/wildcard cert lists
- Front page: checkbox to optionally fetch certificate/CT data
- Introduce `URLNormalizer` with punycode support and typo repair
- Auto-prepend `https://` for bare domains (e.g., `google.com`)
- Optional quick HTTPS reachability + `http://` fallback
- Provide singleton via function-cached `@singleton_loader`:
- `get_url_normalizer()` reads defaults from Settings (if present)
- Standardize function-rule return shape to `(bool, dict|None)` across
`form_*` and `script_*` rules; include structured payloads (`note`, hosts, ext, etc.)
- Harden `FunctionRuleAdapter`:
- Coerce legacy returns `(bool)`, `(bool, str)` → normalized outputs
- Adapt non-dict inputs to facts (category-aware and via provided adapter)
- Return `(True, dict)` on match, `(False, None)` on miss
- Bind-time logging with file:line + function id for diagnostics
- `RuleEngine`:
- Back rules by private `self._rules`; `rules` property returns copy
- Idempotent `add_rule(replace=False)` with in-place replace and regex (re)compile
- Fix AttributeError from property assignment during `__init__`
- Replace hidden singleton factory with explicit builder + global state:
- `app/rules/factory.py::build_rules_engine()` builds and logs totals
- `app/state.py` exposes `set_rules_engine()` / `get_rules_engine()` as the SOF
- `app/wsgi.py` builds once at preload and publishes via `set_rules_engine()`
- Add lightweight debug hooks (`SS_DEBUG_RULES=1`) to trace engine id and rule counts
- Unify logging wiring:
- `wire_logging_once(app)` clears and attaches a single handler chain
- Create two named loggers: `sneakyscope.app` and `sneakyscope.engine`
- Disable propagation to prevent dupes; include pid/logger name in format
- Remove stray/duplicate handlers and import-time logging
- Optional dedup filter for bursty repeats (kept off by default)
- Gunicorn: enable `--preload` in entrypoint to avoid thread races and double registration
- Documented foreground vs background log “double consumer” caveat (attach vs `compose logs`)
- Jinja: replace `{% return %}` with structured `if/elif/else` branches
- Add toggle button to show raw JSON for TLS/CT section
- Consumers should import the rules engine via:
- `from app.state import get_rules_engine`
- Use `build_rules_engine()` **only** during preload/init to construct the instance,
then publish with `set_rules_engine()`. Do not call old singleton factories.
- New/changed modules (high level):
- `app/utils/urltools.py` (+) — URLNormalizer + `get_url_normalizer()`
- `app/rules/function_rules.py` (±) — normalized payload returns
- `engine/function_rule_adapter.py` (±) — coercion, fact adaptation, bind logs
- `app/utils/rules_engine.py` (±) — `_rules`, idempotent `add_rule`, fixes
- `app/rules/factory.py` (±) — pure builder; totals logged post-registration
- `app/state.py` (+) — process-global rules engine
- `app/logging_setup.py` (±) — single chain, two named loggers
- `app/wsgi.py` (±) — preload build + `set_rules_engine()`
- `entrypoint.sh` (±) — add `--preload`
- templates (±) — TLS card, raw toggle; front-page checkbox
Closes: flaky rule-type warnings, duplicate logs, and multi-worker race on rules init.
This commit is contained in:
@@ -30,12 +30,14 @@ import time
|
||||
from flask import Blueprint, request, jsonify, current_app, send_file, abort
|
||||
from pathlib import Path
|
||||
|
||||
from app.logging_setup import get_app_logger
|
||||
from app.utils.settings import get_settings
|
||||
from app.utils.external_fetcher import ExternalScriptFetcher
|
||||
from werkzeug.exceptions import HTTPException
|
||||
|
||||
api_bp = Blueprint("api", __name__, url_prefix="/api")
|
||||
|
||||
app_logger = get_app_logger()
|
||||
|
||||
def _resolve_results_path(job_id: str) -> str:
|
||||
"""
|
||||
@@ -83,7 +85,7 @@ def _api_500(err):
|
||||
Return JSON for server errors and log the exception.
|
||||
"""
|
||||
try:
|
||||
current_app.logger.exception("API 500")
|
||||
app_logger.exception("API 500")
|
||||
except Exception:
|
||||
pass
|
||||
return jsonify({"ok": False, "error": "internal server error"}), 500
|
||||
@@ -107,7 +109,7 @@ def analyze_script():
|
||||
script_url = (script_url_raw or "").strip() if isinstance(script_url_raw, str) else ""
|
||||
|
||||
# log this request
|
||||
current_app.logger.info(f"Got request to analyze {script_url} via API ")
|
||||
app_logger.info(f"Got request to analyze {script_url} via API ")
|
||||
|
||||
if not job_id or not script_url:
|
||||
return jsonify({"ok": False, "error": "Missing job_id (or uuid) or url"}), 400
|
||||
@@ -174,7 +176,7 @@ def analyze_script():
|
||||
findings = matched
|
||||
except Exception as exc:
|
||||
try:
|
||||
current_app.logger.error("Rule engine error", extra={"error": str(exc)})
|
||||
app_logger.error("Rule engine error", extra={"error": str(exc)})
|
||||
except Exception:
|
||||
pass
|
||||
findings = []
|
||||
|
||||
Reference in New Issue
Block a user