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

Forward PKI revocation requests received by standby nodes to active node #19624

Merged
merged 4 commits into from
Mar 20, 2023
Merged

Forward PKI revocation requests received by standby nodes to active node #19624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a748019
Forward PKI revocation requests received by standby nodes to active node
stevendpclark Mar 20, 2023
173c0c5
Add cl
stevendpclark Mar 20, 2023
6a224d3
Properly wrap storage errors in PKI crl utils
stevendpclark Mar 20, 2023
03f1917
Add test for basic PKI operations against standby nodes
stevendpclark Mar 20, 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
4 changes: 2 additions & 2 deletions builtin/logical/pki/crl_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,13 +973,13 @@ func revokeCert(sc *storageContext, config *crlConfig, cert *x509.Certificate) (

revEntry, err := logical.StorageEntryJSON(revokedPath+hyphenSerial, revInfo)
if err != nil {
return nil, fmt.Errorf("error creating revocation entry")
return nil, fmt.Errorf("error creating revocation entry: %w", err)
}

certsCounted := sc.Backend.certsCounted.Load()
err = sc.Storage.Put(sc.Context, revEntry)
if err != nil {
return nil, fmt.Errorf("error saving revoked certificate to new location")
return nil, fmt.Errorf("error saving revoked certificate to new location: %w", err)
}
sc.Backend.ifCountEnabledIncrementTotalRevokedCertificatesCount(certsCounted, revEntry.Key)

Expand Down
9 changes: 9 additions & 0 deletions builtin/logical/pki/path_revoke.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"strings"
"time"

"github.com/hashicorp/vault/sdk/helper/consts"

"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/errutil"
Expand Down Expand Up @@ -591,6 +593,13 @@ func (b *backend) pathRevokeWrite(ctx context.Context, req *logical.Request, dat
}
}

// Assumption: this check is cheap. Call this twice, in the cert-import
// case, to allow cert verification to get rejected on the standby node,
// but we still need it to protect the serial number case.
if b.System().ReplicationState().HasState(consts.ReplicationPerformanceStandby) {
return nil, logical.ErrReadOnly
}

b.revokeStorageLock.Lock()
defer b.revokeStorageLock.Unlock()

Expand Down