fix(fgp): add null-byte separator in HMAC input to prevent concatenation collision

Without a separator, UA='foobar'+AL='' and UA='foo'+AL='bar' produced the same
HMAC input, allowing a token fingerprint to match a different header split.
Fix: use '\x00' as separator between user_agent and accept_lang fields.

Regression test added: test_fgp_no_concatenation_collision (FGP-05).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
curo1305
2026-06-06 23:03:48 +02:00
co-authored by Claude Sonnet 4.6
parent de622e8004
commit c77b97b6d3
2 changed files with 27 additions and 1 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ def _compute_fgp(user_agent: str, accept_lang: str) -> str:
"""Return 16-char hex fingerprint binding a token to its client context (D-04)."""
return hmac.new(
settings.secret_key.encode(),
(user_agent + accept_lang).encode(),
(user_agent + "\x00" + accept_lang).encode(),
hashlib.sha256,
).hexdigest()[:16]
+26
View File
@@ -164,6 +164,32 @@ async def test_no_fgp_claim_allowed(auth_client, db_session):
assert resp.status_code == 200
@pytest.mark.asyncio
async def test_fgp_no_concatenation_collision(auth_client, db_session):
"""FGP-05 regression: token bound to UA='foobar'+AL='' must not match UA='foo'+AL='bar'.
Without a separator in the HMAC input, both produce the same bytes ('foobar'),
allowing a different header split to pass fingerprint validation.
"""
from services.auth import create_access_token
user = await _create_user(db_session, role="user")
# Token issued for UA='foobar', no Accept-Language
token = create_access_token(str(user.id), "user", user_agent="foobar", accept_lang="")
# Request arrives from a split: UA='foo', AL='bar' — same concatenation without sep
resp = await auth_client.get(
"/test/me",
headers={
"Authorization": f"Bearer {token}",
"User-Agent": "foo",
"Accept-Language": "bar",
},
)
assert resp.status_code == 401
assert resp.json()["detail"] == "Token fingerprint mismatch"
@pytest.mark.asyncio
async def test_missing_headers_empty_string_binding(auth_client, db_session):
"""FGP-04: token issued with empty-string binding, request with empty UA → 200.