feat(canary): API-trashing defense — 4-layer fingerprint validation
Adds per-mint nonce gating, structural shape validation, mint UUID consistency checks, and a per-(token, IP) rate limiter to the canary worker so attackers who extract a canary from a decky filesystem cannot poison fingerprint forensics by replaying or forging ?d= submissions. Changes: base.py fingerprint_nonce: Optional[str] added to CanaryArtifact so generators can surface the nonce to the cultivator without coupling the generator directly to DB code. obfuscator.py nonce_for(callback_token, mint_uuid): HMAC-SHA256 keyed on DECNET_CANARY_FINGERPRINT_SECRET, truncated to 16 hex chars. FingerprintSecretMissing raised at mint time if env var is unset. render_fingerprint_js() now accepts nonce= and substitutes MINT_NONCE. fingerprint_payload.js New MINT_NONCE placeholder. Appended as &k= on all beacon URLs (bare-open, single-shot, chunked). Using &k= avoids colliding with &n= (chunk total). fingerprint_html.py / fingerprint_svg.py Derive nonce via nonce_for() and pass to render_fingerprint_js(). Set artifact.fingerprint_nonce so the cultivator can persist it. cultivator.py Passes fingerprint_nonce into create_canary_token() when present on the artifact; NULL for all non-fingerprint generators. canary.py (model) fingerprint_nonce: Optional[str] = Field(default=None, max_length=16) added to CanaryToken. None for non-fingerprint tokens. worker.py _extract_fingerprint now returns (meta_dict, parsed_fp) tuple. _record_hit accepts parsed_fp + raw_nonce and runs 4 layers after token lookup: nonce match, shape check, mint UUID consistency, rate limit. Each failure sets _fp_invalid_* flag and drops structured _fp. Trigger row always lands regardless. tests/canary/conftest.py Session-scoped autouse fixture sets DECNET_CANARY_FINGERPRINT_SECRET so fingerprint generator and worker tests work offline. tests 5 new worker HTTP tests and 2 new generator tests covering each validation layer.
This commit is contained in:
@@ -55,10 +55,12 @@ def test_render_fingerprint_js_substitutes_then_obfuscates() -> None:
|
||||
callback_token="tok-12345",
|
||||
http_base="https://canary.example.test",
|
||||
mint_uuid="11111111-2222-3333-4444-555555555555",
|
||||
nonce="deadbeef01234567",
|
||||
)
|
||||
# Template placeholders must NOT survive into the output.
|
||||
assert "{{BEACON_URL}}" not in out
|
||||
assert "{{MINT_UUID}}" not in out
|
||||
assert "{{MINT_NONCE}}" not in out
|
||||
assert out.strip()
|
||||
# Should be syntactically valid JS — Node parses it without throwing.
|
||||
proc = subprocess.run(
|
||||
@@ -74,6 +76,7 @@ def test_render_fingerprint_js_is_deterministic() -> None:
|
||||
callback_token="tok-12345",
|
||||
http_base="https://canary.example.test",
|
||||
mint_uuid="11111111-2222-3333-4444-555555555555",
|
||||
nonce="deadbeef01234567",
|
||||
)
|
||||
a = obfuscator.render_fingerprint_js(**kw)
|
||||
b = obfuscator.render_fingerprint_js(**kw)
|
||||
|
||||
Reference in New Issue
Block a user