Reject duplicate serials and make keep_serial renewal safe
Add shared serial collision checking against existing certificates and issuer revocations, reuse it for automatic serial allocation, and enforce it for user-supplied serials so duplicate serials no longer break the OCSP snapshot. make keep_serial renewal require replace_old, refuse keep_serial + revoke_old, and reject serials already revoked by the issuer so revoked serials cannot be inherited by renewed certificates.
This commit is contained in:
@@ -368,6 +368,157 @@ class ExtendedRouteTests(unittest.TestCase):
|
||||
assert response.json()["reason"] == "superseded"
|
||||
|
||||
|
||||
class SerialRenewalTests(unittest.TestCase):
|
||||
@async_test
|
||||
async def test_explicit_serial_must_be_unique_and_not_revoked(self) -> None:
|
||||
async with api_client() as client:
|
||||
with oidc_user("alice"):
|
||||
vault_id = await _vault(client)
|
||||
ca_key = await _key(client, vault_id, "serial ca")
|
||||
ca = await _cert(client, vault_id, ca_key["id"], "Serial CA", ca=True)
|
||||
leaf_key = await _key(client, vault_id, "serial leaf")
|
||||
|
||||
async def issue(name: str, serial: str):
|
||||
now = datetime.now(timezone.utc)
|
||||
return await client.post(
|
||||
f"/api/vaults/{vault_id}/certificates",
|
||||
json={
|
||||
"name": name,
|
||||
"key_id": leaf_key["id"],
|
||||
"signer_id": ca["id"],
|
||||
"subject": _subject(name),
|
||||
"serial_hex": serial,
|
||||
"not_before": now.isoformat(),
|
||||
"not_after": (now + timedelta(days=365)).isoformat(),
|
||||
"extensions": _extensions(False),
|
||||
},
|
||||
)
|
||||
|
||||
response = await issue("Serial leaf", "00ab")
|
||||
assert response.status_code == 201, response.text
|
||||
assert response.json()["serial_hex"] == "ab"
|
||||
|
||||
response = await issue("Duplicate serial", "AB")
|
||||
assert response.status_code == 400, response.text
|
||||
assert "serial" in response.json()["error"]
|
||||
|
||||
response = await client.post(
|
||||
f"/api/vaults/{vault_id}/certificates/{ca['id']}/revocations",
|
||||
json={"serial_hex": "beef", "reason": "superseded"},
|
||||
)
|
||||
assert response.status_code == 201, response.text
|
||||
response = await issue("Revoked serial", "beef")
|
||||
assert response.status_code == 400, response.text
|
||||
assert "serial" in response.json()["error"]
|
||||
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates")
|
||||
assert len(response.json()["results"]) == 2
|
||||
|
||||
@async_test
|
||||
async def test_keep_serial_rejects_duplicate_and_revoked_renewals(self) -> None:
|
||||
async with api_client() as client:
|
||||
with oidc_user("alice"):
|
||||
vault_id = await _vault(client)
|
||||
ca_key = await _key(client, vault_id, "renewal ca")
|
||||
ca = await _cert(client, vault_id, ca_key["id"], "Renewal CA", ca=True)
|
||||
leaf_key = await _key(client, vault_id, "renewal leaf")
|
||||
leaf = await _cert(
|
||||
client, vault_id, leaf_key["id"], "Renewal Leaf", signer_id=ca["id"]
|
||||
)
|
||||
renew_url = f"/api/vaults/{vault_id}/certificates/{leaf['id']}/renew"
|
||||
|
||||
for payload in (
|
||||
{"keep_serial": True, "revoke_old": True, "replace_old": True},
|
||||
{"keep_serial": True},
|
||||
):
|
||||
response = await client.post(renew_url, json=payload)
|
||||
assert response.status_code == 400, response.text
|
||||
assert "serial" in response.json()["error"]
|
||||
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates/{leaf['id']}")
|
||||
assert response.status_code == 200
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates")
|
||||
assert len(response.json()["results"]) == 2
|
||||
response = await client.get(
|
||||
f"/api/vaults/{vault_id}/certificates/{ca['id']}/revocations"
|
||||
)
|
||||
assert response.json()["results"] == []
|
||||
|
||||
response = await client.post(
|
||||
f"/api/vaults/{vault_id}/certificates/{leaf['id']}/revoke",
|
||||
json={"reason": "superseded"},
|
||||
)
|
||||
assert response.status_code == 200, response.text
|
||||
response = await client.post(
|
||||
renew_url, json={"keep_serial": True, "replace_old": True}
|
||||
)
|
||||
assert response.status_code == 400, response.text
|
||||
assert "serial" in response.json()["error"]
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates/{leaf['id']}")
|
||||
assert response.status_code == 200
|
||||
assert response.json()["revoked"] is True
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates")
|
||||
assert len(response.json()["results"]) == 2
|
||||
|
||||
@async_test
|
||||
async def test_safe_serial_renewals_have_distinct_ocsp_status(self) -> None:
|
||||
async with api_client() as client:
|
||||
with oidc_user("alice"):
|
||||
vault_id = await _vault(client)
|
||||
ca_key = await _key(client, vault_id, "ocsp renewal ca")
|
||||
ca = await _cert(client, vault_id, ca_key["id"], "OCSP Renewal CA", ca=True)
|
||||
leaf_key = await _key(client, vault_id, "ocsp renewal leaf")
|
||||
leaf = await _cert(
|
||||
client, vault_id, leaf_key["id"], "Kept Serial Leaf", signer_id=ca["id"]
|
||||
)
|
||||
kept_serial = leaf["serial_hex"]
|
||||
|
||||
response = await client.post(
|
||||
f"/api/vaults/{vault_id}/certificates/{leaf['id']}/renew",
|
||||
json={
|
||||
"keep_serial": True,
|
||||
"replace_old": True,
|
||||
"validity": {"amount": 30, "unit": "days"},
|
||||
},
|
||||
)
|
||||
assert response.status_code == 201, response.text
|
||||
renewed = response.json()
|
||||
assert renewed["serial_hex"] == kept_serial
|
||||
response = await client.get(f"/api/vaults/{vault_id}/certificates/{leaf['id']}")
|
||||
assert response.status_code == 404
|
||||
|
||||
response = await client.get(
|
||||
f"/api/vaults/{vault_id}/certificates/{ca['id']}/ocsp-status"
|
||||
)
|
||||
entries = response.json()["snapshot"]["entries"]
|
||||
assert len(entries) == 1
|
||||
assert entries[0]["serial_hex"] == kept_serial.lower()
|
||||
assert entries[0]["status"] == "valid"
|
||||
|
||||
old_leaf = await _cert(
|
||||
client, vault_id, leaf_key["id"], "New Serial Leaf", signer_id=ca["id"]
|
||||
)
|
||||
response = await client.post(
|
||||
f"/api/vaults/{vault_id}/certificates/{old_leaf['id']}/renew",
|
||||
json={"revoke_old": True, "replace_old": True},
|
||||
)
|
||||
assert response.status_code == 201, response.text
|
||||
new_leaf = response.json()
|
||||
assert new_leaf["serial_hex"] != old_leaf["serial_hex"]
|
||||
assert new_leaf["revoked"] is False
|
||||
|
||||
response = await client.get(
|
||||
f"/api/vaults/{vault_id}/certificates/{ca['id']}/ocsp-status"
|
||||
)
|
||||
entries = {
|
||||
entry["serial_hex"]: entry for entry in response.json()["snapshot"]["entries"]
|
||||
}
|
||||
assert len(entries) == 3
|
||||
assert entries[kept_serial.lower()]["status"] == "valid"
|
||||
assert entries[old_leaf["serial_hex"].lower()]["status"] == "revoked"
|
||||
assert entries[new_leaf["serial_hex"].lower()]["status"] == "valid"
|
||||
|
||||
|
||||
class VaultExportTests(unittest.TestCase):
|
||||
@async_test
|
||||
async def test_vault_zip_export(self) -> None:
|
||||
|
||||
Reference in New Issue
Block a user