fix(orchestrator): refuse RS256 passkeys under 2048 bits

passkey.py accepted an RS256 public key of any modulus size. It now refuses a modulus under 2048 bits at registration and at every verification, before either signature backend, with a fixed error asking for a new passkey; the library backend checks key_size again and the openssl backend's key_type requires the same size. The SubjectPublicKeyInfo is read as strict DER (no negative or padded INTEGERs, minimal lengths, no unused bits, no trailing data) and the rsaEncryption identifier must match exactly. ES256 and EdDSA are unchanged. An already pinned weak key is refused on every use until a new passkey is pinned. Accepted MEDUSA findings: AIC-EXFIL-005 and PRIV-SCAN-762 at tests/hub_support.py:151 (public half of a throwaway test key) and PQC001 at passkey.py:236 (WebAuthn offers no post-quantum algorithm yet).

🎯 Fix: 95 %
💥 Break: 3 %
💸 Cost: –
⏱️ Time: –
🛡️ Security: 100 %
🏆 Score: 92
🚦 Gate: ✅ 90/5, cost and time <= 100, security 100 %

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Kevin Veen-BirkenbachandClaude Opus 5.5 committed 2026-11-13 18:48:04 +00:00
1 parent 5b65fb5284
commit 0e569323fb
3 files changed
+140 -10

No files matched your search

+16 -5
View File
@@ -103,10 +103,16 @@ ORIGIN = "http://localhost:8737"
PRESENT = 0x05
REGISTERED = 0x45
ZERO_LED_TRIES = 4096
def rsa_spec(bits: int) -> list[str]:
return ["-algorithm", "RSA", "-pkeyopt", f"rsa_keygen_bits:{bits}"]
KEY_SPECS = {
-7: ["-algorithm", "EC", "-pkeyopt", "ec_paramgen_curve:P-256"],
-8: ["-algorithm", "ED25519"],
-257: ["-algorithm", "RSA", "-pkeyopt", "rsa_keygen_bits:2048"],
-257: rsa_spec(2048),
}
@@ -139,10 +145,10 @@ def cbor_encode(value: object) -> bytes:
class Key:
def __init__(self, alg: int, name: str) -> None:
def __init__(self, alg: int, name: str, spec: list[str]) -> None:
self.alg = alg
self.pem = Path(KEYS.name) / f"{name}{alg}.pem"
openssl(["genpkey", *KEY_SPECS[alg], "-out", str(self.pem)], b"")
openssl(["genpkey", *spec, "-out", str(self.pem)], b"")
self.spki = openssl(["pkey", "-in", str(self.pem), "-pubout", "-outform", "DER"], b"")
self.raw_id = os.urandom(16)
self.id = b64(self.raw_id)
@@ -188,7 +194,12 @@ class Key:
@functools.cache
def key(alg: int, name: str) -> Key:
return Key(alg, name)
return Key(alg, name, KEY_SPECS[alg])
@functools.cache
def rsa_key(bits: int) -> Key:
return Key(-257, f"rsa{bits}", rsa_spec(bits))
@functools.cache
@@ -202,7 +213,7 @@ def zero_led(label: int) -> Key:
"""
with concurrent.futures.ThreadPoolExecutor() as pool:
for start in range(0, ZERO_LED_TRIES, 64):
for signer in pool.map(lambda attempt: Key(-7, f"zero{label}-{attempt}"), range(start, start + 64)):
for signer in pool.map(lambda attempt: Key(-7, f"zero{label}-{attempt}", KEY_SPECS[-7]), range(start, start + 64)):
if signer.cose()[label][0] == 0:
return signer
raise AssertionError(f"no P-256 key with a zero-led coordinate {label} in {ZERO_LED_TRIES} tries")
+65 -2
View File
@@ -29,12 +29,14 @@ from hub_support import (
hub_api,
key,
passkey,
rsa_key,
signing,
verifier,
zero_led,
)
PASSKEY_PAGE = HUB / "templates" / "page-passkey.js"
BACKENDS = [passkey.by_openssl] if passkey.serialization is None else [passkey.by_openssl, passkey.by_library]
PASSKEY_PROBE = """
const fs = require("fs");
const vm = require("vm");
@@ -88,6 +90,30 @@ class TestApproval(unittest.TestCase):
verifier.check(signer.proof(self.payload([self.item], int(self.now) + 60), ORIGIN), self.item, "", self.trust, self.now)
self.assertEqual([entry["alg"] for entry in verifier.pinned(self.approvers)], [-7, -8, -257])
def test_an_rs256_key_under_2048_bits_is_refused_at_registration_and_at_every_verification(self):
payloads = {
"approval": self.payload([self.item], int(self.now) + 60),
"rule": signing.rule_payload("fedcba9876543210", ["ask"], "Bash", "make *", "/repo*", int(self.now) + 3600),
}
for bits in (1024, 2047):
signer = rsa_key(bits)
self.assertEqual(int.from_bytes(signer.cose()[-1], "big").bit_length(), bits)
with self.subTest(bits=bits, at="registration"), self.assertRaisesRegex(signing.Refused, "modulus under 2048 bits"):
passkey.attested(signer.credential(ORIGIN, "localhost", REGISTERED), ORIGIN)
weak = verifier.Trust(approvers=self.base / f"weak-{bits}.json", replay=self.base / f"weak-{bits}-replay.json", origin=ORIGIN)
verifier.pin(weak.approvers, {"id": signer.id, "alg": -257, "spki": b64(signer.spki)}, self.now)
for name, payload in payloads.items():
with self.subTest(bits=bits, at=name), self.assertRaisesRegex(signing.Refused, "modulus under 2048 bits"):
verifier.check(signer.proof(payload, ORIGIN), self.item, "", weak, self.now)
signer = rsa_key(2048)
self.assertEqual(passkey.attested(signer.credential(ORIGIN, "localhost", REGISTERED), ORIGIN)["spki"], b64(signer.spki))
signer.pin(self.approvers, ORIGIN)
for payload in payloads.values():
verifier.check(signer.proof(payload, ORIGIN), self.item, "", self.trust, self.now)
mislabelled = key(-7, "main")
verifier.pin(self.approvers, {"id": mislabelled.id, "alg": -257, "spki": b64(mislabelled.spki)}, self.now)
self.refused(mislabelled.proof(payloads["approval"], ORIGIN), self.item, "", "no RSA public key")
def test_every_broken_part_of_a_signature_is_refused(self):
signer = key(-7, "main")
signer.pin(self.approvers, ORIGIN)
@@ -279,12 +305,11 @@ class TestApproval(unittest.TestCase):
passkey.cbor(data, 0, 0)
def test_both_backends_verify_and_reject_the_same(self):
backends = [passkey.by_openssl] if passkey.serialization is None else [passkey.by_openssl, passkey.by_library]
for alg in (-7, -8, -257):
signer = key(alg, "main")
data = os.urandom(64)
signature = signer.sign(data)
for backend in backends:
for backend in BACKENDS:
with self.subTest(alg=alg, backend=backend.__name__):
self.assertTrue(backend(alg, signer.spki, data, signature))
self.assertFalse(backend(alg, signer.spki, data + b"x", signature))
@@ -296,6 +321,44 @@ class TestApproval(unittest.TestCase):
with mock.patch.object(passkey, "serialization", None):
verifier.check(signer.proof(self.payload([self.item], int(self.now) + 60), ORIGIN), self.item, "", self.trust, self.now)
def test_both_backends_refuse_a_valid_signature_of_an_rs256_key_under_2048_bits(self):
data = os.urandom(64)
for bits in (1024, 2047):
signer = rsa_key(bits)
signature = signer.sign(data)
for backend in BACKENDS:
with self.subTest(bits=bits, backend=backend.__name__):
self.assertFalse(backend(-257, signer.spki, data, signature))
with mock.patch.object(passkey, "RSA_MIN_BITS", 1024):
self.assertTrue(backend(-257, signer.spki, data, signature))
def test_the_rsa_key_parser_reads_strict_der_only(self):
signer = rsa_key(2048)
modulus = signer.cose()[-1]
exponent = passkey.der_integer((65537).to_bytes(3, "big"))
def wrapped(integers: bytes, unused: int) -> bytes:
return passkey.der(0x30, passkey.RSA_IDENTIFIER + passkey.der(0x03, bytes([unused]) + passkey.der(0x30, integers)))
valid = wrapped(passkey.der_integer(modulus) + exponent, 0)
self.assertEqual(valid, signer.spki)
self.assertEqual((passkey.rsa_bits(valid), passkey.key_type(-257, valid)), (2048, True))
for name, given in (
("negative modulus", wrapped(passkey.der(0x02, b"\xff" * 256) + exponent, 0)),
("superfluous leading zero", wrapped(passkey.der(0x02, b"\x00\x00" + modulus) + exponent, 0)),
("short length in long form", wrapped(passkey.der_integer(modulus) + b"\x02\x81\x03\x01\x00\x01", 0)),
("zero-led long length", wrapped(b"\x02\x83\x00\x01\x01\x00" + modulus + exponent, 0)),
("nonzero unused bits", wrapped(passkey.der_integer(modulus) + exponent, 1)),
("trailing data in the key", wrapped(passkey.der_integer(modulus) + exponent + b"\x05\x00", 0)),
("trailing data after the key", valid + b"\x00"),
("shifted identifier", passkey.der(0x30, b"\x05\x00" + valid[4:])),
):
with self.subTest(name=name):
with self.assertRaisesRegex(signing.Refused, "no RSA public key"):
passkey.rsa_bits(given)
self.assertFalse(passkey.key_type(-257, given))
self.assertEqual((passkey.rsa_bits(rsa_key(2047).spki), passkey.key_type(-257, rsa_key(2047).spki)), (2047, False))
def test_openssl_without_a_temporary_directory_refuses_cleanly(self):
signer = key(-7, "main")
data = os.urandom(64)