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:
61
app/logging_setup.py
Normal file
61
app/logging_setup.py
Normal file
@@ -0,0 +1,61 @@
|
||||
# app/logging_setup.py
|
||||
import logging
|
||||
import sys
|
||||
|
||||
_LOGGING_WIRED = False # module-level guard
|
||||
|
||||
def _clear(logger: logging.Logger) -> None:
|
||||
for h in list(logger.handlers):
|
||||
logger.removeHandler(h)
|
||||
|
||||
def wire_logging_once(app) -> None:
|
||||
global _LOGGING_WIRED
|
||||
if _LOGGING_WIRED:
|
||||
return
|
||||
_LOGGING_WIRED = True
|
||||
|
||||
# Reuse gunicorn handlers if present
|
||||
guni = logging.getLogger("gunicorn.error")
|
||||
|
||||
# Clear Flask's default handlers
|
||||
try:
|
||||
app.logger.handlers.clear()
|
||||
except Exception:
|
||||
for h in list(app.logger.handlers):
|
||||
app.logger.removeHandler(h)
|
||||
|
||||
for name in ("sneakyscope.app", "sneakyscope.engine"):
|
||||
_clear(logging.getLogger(name))
|
||||
|
||||
|
||||
# Fallback formatter shows logger name to distinguish engine/app
|
||||
h = logging.StreamHandler(sys.stdout)
|
||||
fmt = logging.Formatter(
|
||||
"[%(asctime)s] pid=%(process)d %(levelname)-8s %(name)s %(module)-18s %(message)s (line %(lineno)s)"
|
||||
)
|
||||
h.setFormatter(fmt)
|
||||
h.setFormatter(fmt)
|
||||
h.setLevel(logging.INFO)
|
||||
|
||||
# 3) Attach to app + project loggers; stop propagation everywhere
|
||||
app.logger.addHandler(h); app.logger.setLevel(logging.INFO); app.logger.propagate = False
|
||||
eng = logging.getLogger("sneakyscope.engine")
|
||||
app_lg = logging.getLogger("sneakyscope.app")
|
||||
eng.addHandler(h); eng.setLevel(logging.INFO); eng.propagate = False
|
||||
app_lg.addHandler(h); app_lg.setLevel(logging.INFO); app_lg.propagate = False
|
||||
|
||||
|
||||
def get_engine_logger() -> logging.Logger:
|
||||
logger = logging.getLogger("sneakyscope.engine")
|
||||
logger.propagate = False
|
||||
if logger.level == logging.NOTSET:
|
||||
logger.setLevel(logging.INFO)
|
||||
return logger
|
||||
|
||||
|
||||
def get_app_logger() -> logging.Logger:
|
||||
logger = logging.getLogger("sneakyscope.app")
|
||||
logger.propagate = False
|
||||
if logger.level == logging.NOTSET:
|
||||
logger.setLevel(logging.INFO)
|
||||
return logger
|
||||
Reference in New Issue
Block a user