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

Compare public keys on trusted leaf certs, to prevent use of alternate certs with the same/forged serial numbers #25649

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Compare public keys on trusted leaf certs, to prevent use of alternate certs with the same/forged serial numbers #25649

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
580ef2b
Compare public keys on trusted leaf certs, to prevent use of alternat…
sgmiller Feb 26, 2024
8b65e7e
changelog
sgmiller Feb 26, 2024
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
8 changes: 8 additions & 0 deletions builtin/credential/cert/path_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,14 @@ func (b *backend) verifyCredentials(ctx context.Context, req *logical.Request, d
// Check for client cert being explicitly listed in the config (and matching other constraints)
if tCert.SerialNumber.Cmp(clientCert.SerialNumber) == 0 &&
bytes.Equal(tCert.AuthorityKeyId, clientCert.AuthorityKeyId) {
pkMatch, err := certutil.ComparePublicKeysAndType(tCert.PublicKey, clientCert.PublicKey)
if err != nil {
return nil, nil, err
}
if !pkMatch {
// Someone may be trying to pass off a forged certificate as the trusted non-CA cert. Reject early.
return nil, logical.ErrorResponse("public key mismatch of a trusted leaf certificate"), nil
}
matches, err := b.matchesConstraints(ctx, clientCert, trustedNonCA.Certificates, trustedNonCA, verifyConf)

// matchesConstraints returns an error when OCSP verification fails,
Expand Down
5 changes: 5 additions & 0 deletions changelog/25649.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
```release-note:security
auth/cert: compare public keys of trusted non-CA certificates with incoming
client certificates to prevent trusting certs with the same serial number
but not the same public/private key.
```
Loading