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

test: add more testing for CRL revocation #7957

Merged
merged 12 commits into from
Jan 24, 2025
Merged

test: add more testing for CRL revocation #7957

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
494c5a8
test: add more testing for CRL revocation
jsha Jan 17, 2025
b64f5de
Fix data race
jsha Jan 17, 2025
7910ce5
Fix data race
jsha Jan 17, 2025
c1071b5
Rearrange parallelism
jsha Jan 18, 2025
9d25fb0
Change crl-updater log levels
jsha Jan 21, 2025
06dca5e
Put a mutex around runUpdater
jsha Jan 21, 2025
fde3fda
Review feedback
jsha Jan 22, 2025
3f04e44
Review feedback
jsha Jan 23, 2025
f85c34c
Refine comment
jsha Jan 23, 2025
4b1ba28
Remove workaround for 404 (no longer needed)
jsha Jan 23, 2025
8efdcdc
Switch to closures
jsha Jan 23, 2025
238530d
Update ocsp-responder configs
jsha Jan 23, 2025
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
12 changes: 6 additions & 6 deletions test/config-next/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-a/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/43104258997432926/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-a.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-a.cert.pem",
Expand All @@ -88,7 +88,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-b",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-b/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/17302365692836921/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-b.cert.pem",
Expand All @@ -99,7 +99,7 @@
"active": false,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-c/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/56560759852043581/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-c.cert.pem",
Expand All @@ -110,7 +110,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-a/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/29947985078257530/",
"location": {
"configFile": "test/certs/webpki/int-rsa-a.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-a.cert.pem",
Expand All @@ -121,7 +121,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-b",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-b/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/6762885421992935/",
"location": {
"configFile": "test/certs/webpki/int-rsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-b.cert.pem",
Expand All @@ -132,7 +132,7 @@
"active": false,
"issuerURL": "http://ca.example.org:4502/int-rsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-c/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/56183656833365902/",
"location": {
"configFile": "test/certs/webpki/int-rsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-c.cert.pem",
Expand Down
2 changes: 1 addition & 1 deletion test/config-next/crl-updater.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"features": {}
},
"syslog": {
"stdoutlevel": 6,
"stdoutlevel": 4,
"sysloglevel": -1
},
"openTelemetry": {
Expand Down
4 changes: 2 additions & 2 deletions test/config-next/ocsp-responder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
],
"liveSigningPeriod": "60h",
"timeout": "4.9s",
"maxInflightSignings": 2,
"maxSigningWaiters": 1,
"maxInflightSignings": 20,
"maxSigningWaiters": 100,
"shutdownStopTimeout": "10s",
"requiredSerialPrefixes": [
"7f"
Expand Down
12 changes: 6 additions & 6 deletions test/config/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-a/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/43104258997432926/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-a.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-a.cert.pem",
Expand All @@ -73,7 +73,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-b",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-b/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/17302365692836921/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-b.cert.pem",
Expand All @@ -84,7 +84,7 @@
"active": false,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-c/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/56560759852043581/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-c.cert.pem",
Expand All @@ -95,7 +95,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-a/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/29947985078257530/",
"location": {
"configFile": "test/certs/webpki/int-rsa-a.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-a.cert.pem",
Expand All @@ -106,7 +106,7 @@
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-b",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-b/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/6762885421992935/",
"location": {
"configFile": "test/certs/webpki/int-rsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-b.cert.pem",
Expand All @@ -117,7 +117,7 @@
"active": false,
"issuerURL": "http://ca.example.org:4502/int-rsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-c/",
"crlURLBase": "http://ca.example.org:4501/lets-encrypt-crls/56183656833365902/",
"location": {
"configFile": "test/certs/webpki/int-rsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-c.cert.pem",
Expand Down
4 changes: 2 additions & 2 deletions test/config/crl-updater.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"features": {}
},
"syslog": {
"stdoutlevel": 6,
"sysloglevel": 6
"stdoutlevel": 4,
"sysloglevel": 4
}
}
7 changes: 7 additions & 0 deletions test/integration/crl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"path"
"path/filepath"
"strings"
"sync"
"testing"
"time"

Expand All @@ -21,10 +22,16 @@ import (
"github.com/letsencrypt/boulder/test/vars"
)

// crlUpdaterMu controls access to `runUpdater`, because two crl-updaters running
// at once will result in errors trying to lease shards that are already leased.
var crlUpdaterMu sync.Mutex

// runUpdater executes the crl-updater binary with the -runOnce flag, and
// returns when it completes.
func runUpdater(t *testing.T, configFile string) {
t.Helper()
crlUpdaterMu.Lock()
defer crlUpdaterMu.Unlock()

binPath, err := filepath.Abs("bin/boulder")
test.AssertNotError(t, err, "computing boulder binary path")
Expand Down
Loading
Loading