Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not require that X509 CAs minted by an upstream authority have a URI SAN #3997

Merged
merged 2 commits into from
Mar 21, 2023
Merged

Do not require that X509 CAs minted by an upstream authority have a URI SAN #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ec03d
Do not require that X509 CAs minted by an upstream authority have a U…
amartinezfayo Mar 17, 2023
6169579
Merge branch 'main' into x509ca-validation-uri
amartinezfayo Mar 21, 2023
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
14 changes: 11 additions & 3 deletions pkg/server/credvalidator/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (v *Validator) ValidateX509CA(ca *x509.Certificate) error {
if ca.KeyUsage&^(x509.KeyUsageCertSign|x509.KeyUsageCRLSign) > 0 {
return errors.New("invalid X509 CA: only keyCertSign and cRLSign key usage can be set")
}
if err := checkURISAN(ca, v.x509CAID); err != nil {
if err := checkURISAN(ca, true, v.x509CAID); err != nil {
return fmt.Errorf("invalid X509 CA: %w", err)
}
if err := checkX509CertificateExpiration(ca, v.clock.Now()); err != nil {
Expand Down Expand Up @@ -95,7 +95,7 @@ func (v *Validator) ValidateX509SVID(svid *x509.Certificate, id spiffeid.ID) err
}
}

if err := checkURISAN(svid, id); err != nil {
if err := checkURISAN(svid, false, id); err != nil {
return fmt.Errorf("invalid X509-SVID: %w", err)
}
if err := checkX509CertificateExpiration(svid, v.clock.Now()); err != nil {
Expand Down Expand Up @@ -133,10 +133,18 @@ func (v *Validator) ValidateWorkloadJWTSVID(rawToken string, id spiffeid.ID) err
return nil
}

func checkURISAN(cert *x509.Certificate, id spiffeid.ID) error {
func checkURISAN(cert *x509.Certificate, isCA bool, id spiffeid.ID) error {
if len(cert.URIs) == 0 {
if isCA {
// A signing certificate should itself be an SVID, but it's not
// mandatory.
return nil
}
return errors.New("missing URI SAN")
}

// There is at least one URI.
// These validations apply for both CA and non CA certificates.
if len(cert.URIs) > 1 {
return fmt.Errorf("expected URI SAN %q but got %q", id, cert.URIs)
}
Expand Down
1 change: 0 additions & 1 deletion pkg/server/credvalidator/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func TestValidateX509CA(t *testing.T) {
setup: func(ca *x509.Certificate) {
ca.URIs = nil
},
expectErr: "invalid X509 CA: missing URI SAN",
},
{
desc: "more than one URI SAN",
Expand Down