Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,603 changes: 938 additions & 665 deletions limbo.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions limbo/testcases/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ def crl(
revoked: list[x509.RevokedCertificate] = [],
aki: _Extension[x509.AuthorityKeyIdentifier] | Literal[True] | None = True,
crl_number: _Extension[x509.CRLNumber] | Literal[True] | None = True,
extra_extension: _Extension[x509.ExtensionType] | None = None,
) -> x509.CertificateRevocationList:
if issuer is None:
if signer:
Expand Down Expand Up @@ -405,6 +406,9 @@ def crl(
elif crl_number:
builder = builder.add_extension(x509.CRLNumber(1337), critical=False)

if extra_extension is not None:
builder = builder.add_extension(extra_extension.ext, critical=extra_extension.critical)

crl = builder.sign(
private_key=key,
algorithm=hashes.SHA256(),
Expand Down
27 changes: 12 additions & 15 deletions limbo/testcases/crl.py → limbo/testcases/crl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
from cryptography import x509
from cryptography.x509.oid import ExtendedKeyUsageOID, NameOID

from .. import models
from ..models import Feature, Importance, PeerKind
from ._core import Builder, ext, testcase
from limbo.models import Feature, Importance, PeerKind, PeerName
from limbo.testcases._core import Builder, ext, testcase

from .structure import * # noqa: F403


@testcase
Expand Down Expand Up @@ -52,7 +53,7 @@ def revoked_certificate_with_crl(builder: Builder) -> None:
builder.features([Feature.has_crl]).importance(
Importance.HIGH
).server_validation().trusted_certs(root).peer_certificate(leaf).expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="revoked.example.com")
PeerName(kind=PeerKind.DNS, value="revoked.example.com")
).crls(crl).validation_time(validation_time).fails()


Expand Down Expand Up @@ -100,9 +101,7 @@ def crlnumber_missing(builder: Builder) -> None:
.server_validation()
.trusted_certs(root)
.peer_certificate(leaf)
.expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="missing-crlnumber.example.com")
)
.expected_peer_name(PeerName(kind=PeerKind.DNS, value="missing-crlnumber.example.com"))
.crls(crl)
.validation_time(leaf.cert.not_valid_before_utc + timedelta(seconds=2))
.fails()
Expand Down Expand Up @@ -140,7 +139,7 @@ def certificate_not_on_crl(builder: Builder) -> None:
builder.features([Feature.has_crl]).importance(
Importance.HIGH
).server_validation().trusted_certs(root).peer_certificate(leaf).expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="example.com")
PeerName(kind=PeerKind.DNS, value="example.com")
).crls(crl).validation_time(validation_time).succeeds()


Expand Down Expand Up @@ -189,7 +188,7 @@ def certificate_serial_on_crl_different_issuer(builder: Builder) -> None:
Importance.HIGH
).server_validation().trusted_certs(root_ca_1, root_ca_2).peer_certificate(
leaf
).expected_peer_name(models.PeerName(kind=PeerKind.DNS, value="example.com")).crls(
).expected_peer_name(PeerName(kind=PeerKind.DNS, value="example.com")).crls(
crl1, crl2
).validation_time(validation_time).succeeds()

Expand Down Expand Up @@ -239,9 +238,7 @@ def crlnumber_critical(builder: Builder) -> None:
.server_validation()
.trusted_certs(root)
.peer_certificate(leaf)
.expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="crlnumber-critical.example.com")
)
.expected_peer_name(PeerName(kind=PeerKind.DNS, value="crlnumber-critical.example.com"))
.crls(crl)
.validation_time(leaf.cert.not_valid_before_utc + timedelta(seconds=2))
.fails()
Expand Down Expand Up @@ -306,7 +303,7 @@ def issuer_missing_crlsign(builder: Builder) -> None:
builder.features([Feature.has_crl]).importance(
Importance.HIGH
).server_validation().trusted_certs(root).peer_certificate(leaf).expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="issuer-missing-crlsign.example.com")
PeerName(kind=PeerKind.DNS, value="issuer-missing-crlsign.example.com")
).crls(crl).validation_time(validation_time).fails()


Expand Down Expand Up @@ -361,7 +358,7 @@ def issuer_no_keyusage_extension(builder: Builder) -> None:
builder.features([Feature.has_crl]).importance(
Importance.HIGH
).server_validation().trusted_certs(root).peer_certificate(leaf).expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="issuer-no-keyusage.example.com")
PeerName(kind=PeerKind.DNS, value="issuer-no-keyusage.example.com")
).crls(crl).validation_time(validation_time).succeeds()


Expand Down Expand Up @@ -421,5 +418,5 @@ def issuer_valid_crlsign_and_keycertsign(builder: Builder) -> None:
builder.features([Feature.has_crl]).importance(
Importance.HIGH
).server_validation().trusted_certs(root).peer_certificate(leaf).expected_peer_name(
models.PeerName(kind=PeerKind.DNS, value="issuer-valid-crlsign.example.com")
PeerName(kind=PeerKind.DNS, value="issuer-valid-crlsign.example.com")
).crls(crl).validation_time(validation_time).succeeds()
Loading
Loading