letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update publisher tests to use new realistic test certs (#5280) 

A new, more realistic, test certificate hierarchy was added in #5273.

Update publisher tests to use the test certificate hierarchy now present
at test/hierarchy.

Fixes #5279
This commit is contained in:
Samantha 2021-02-11 15:24:20 -08:00 committed by GitHub
parent 0a4b600a09
commit f13b8db2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
publisher/publisher_test.go
View File

@ -119,34 +119,42 @@ func errorBodyLogSrv() *httptest.Server {
}
func setup(t *testing.T) (*Impl, *x509.Certificate, *ecdsa.PrivateKey) {
// Load our first chain using issuance.LoadChain
// Load chain: R3 <- Root DST
chain1, err := issuance.LoadChain([]string{
"../test/test-ca2.pem",
"../test/test-root.pem",
"../test/hierarchy/int-r3-cross.cert.pem",
"../test/hierarchy/root-dst.cert.pem",
})
test.AssertNotError(t, err, "failed to load chain1.")
// Load our second chain using issuance.LoadChain
// Load chain: R3 <- Root X1
chain2, err := issuance.LoadChain([]string{
"../test/test-ca-cross.pem",
"../test/test-root2.pem",
"../test/hierarchy/int-r3.cert.pem",
"../test/hierarchy/root-x1.cert.pem",
})
test.AssertNotError(t, err, "failed to load chain2.")
// Load our third chain using core.LoadCertBundle
// Load chain: E1 <- Root X2
chain3, err := issuance.LoadChain([]string{
"../test/hierarchy/int-e1.cert.pem",
"../test/hierarchy/root-x2.cert.pem",
})
test.AssertNotError(t, err, "failed to load chain3.")
// Load our fourth chain using core.LoadCertBundle
// TODO(5269): Remove this after all configs have migrated to
// `Chains`.
chain3, err := core.LoadCertBundle("test/testIntermediate.pem")
test.AssertNotError(t, err, "failed to load chain3.")
chain3Issuer := issuance.Certificate{Certificate: chain3[0]}
chain4, err := core.LoadCertBundle("test/testIntermediate.pem")
test.AssertNotError(t, err, "failed to load chain4.")
chain4Issuer := issuance.Certificate{Certificate: chain4[0]}
// Create an example issuerNameID to CT bundle mapping
issuerBundles := map[issuance.IssuerNameID][]ct.ASN1Cert{
chain1[0].NameID(): GetCTBundleForChain(chain1),
chain2[0].NameID(): GetCTBundleForChain(chain2),
chain3[0].NameID(): GetCTBundleForChain(chain3),
// TODO(5269): Remove this after all configs have migrated to
// `Chains`.
chain3Issuer.NameID(): GetCTBundleForCerts(chain3),
chain4Issuer.NameID(): GetCTBundleForCerts(chain4),
}
pub := New(
issuerBundles,
@ -155,8 +163,8 @@ func setup(t *testing.T) (*Impl, *x509.Certificate, *ecdsa.PrivateKey) {
metrics.NoopRegisterer)
// Load leaf certificate
leaf, err := core.LoadCert("../test/test-ee.pem")
test.AssertNotError(t, err, "unable to load ../test/test-ee.pem")
leaf, err := core.LoadCert("../test/hierarchy/ee-r3.cert.pem")
test.AssertNotError(t, err, "unable to load leaf certificate.")
k, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
test.AssertNotError(t, err, "Couldn't generate test key")
@ -378,8 +386,8 @@ func TestHTTPStatusMetric(t *testing.T) {
}
func Test_GetCTBundleForChain(t *testing.T) {
chain, err := issuance.LoadChain([]string{
"../test/test-ca2-cross.pem",
"../test/test-root2.pem",
"../test/hierarchy/int-r3.cert.pem",
"../test/hierarchy/root-x1.cert.pem",
})
test.AssertNotError(t, err, "Failed to load chain.")
expect := []ct.ASN1Cert{{Data: chain[0].Raw}}