Skip to content

Update x509.CertPool equality checks (release-2.3) #2879

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

Merged
merged 1 commit into from
Aug 30, 2021
Merged

Update x509.CertPool equality checks (release-2.3) #2879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion common/fabhttp/tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ var _ = Describe("TLS", func() {

tlsConfig, err := httpTLS.Config()
Expect(err).NotTo(HaveOccurred())

// https://go-review.googlesource.com/c/go/+/229917
Expect(tlsConfig.ClientCAs.Subjects()).To(Equal(clientCAPool.Subjects()))
tlsConfig.ClientCAs = nil

Expect(tlsConfig).To(Equal(&tls.Config{
MinVersion: tls.VersionTLS12,
Certificates: []tls.Certificate{cert},
Expand All @@ -70,7 +75,6 @@ var _ = Describe("TLS", func() {
tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
},
ClientCAs: clientCAPool,
ClientAuth: tls.RequireAndVerifyClientCert,
}))
})
Expand Down
29 changes: 8 additions & 21 deletions internal/pkg/comm/creds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,38 +125,25 @@ func TestAddRootCA(t *testing.T) {
t.Parallel()

caPEM, err := ioutil.ReadFile(filepath.Join("testdata", "certs", "Org1-cert.pem"))
if err != nil {
t.Fatalf("failed to read root certificate: %v", err)
}

cert := &x509.Certificate{
EmailAddresses: []string{"[email protected]"},
}
require.NoError(t, err, "failed to read root certificate")

expectedCertPool := x509.NewCertPool()
ok := expectedCertPool.AppendCertsFromPEM(caPEM)
if !ok {
t.Fatalf("failed to create expected certPool")
}
require.True(t, ok, "failed to create expected certPool")

cert := &x509.Certificate{EmailAddresses: []string{"[email protected]"}}
expectedCertPool.AddCert(cert)

certPool := x509.NewCertPool()
ok = certPool.AppendCertsFromPEM(caPEM)
if !ok {
t.Fatalf("failed to create certPool")
}
require.True(t, ok, "failed to create certPool")

tlsConfig := &tls.Config{
ClientCAs: certPool,
}
config := comm.NewTLSConfig(tlsConfig)

require.Equal(t, config.Config().ClientCAs, certPool)
config := comm.NewTLSConfig(&tls.Config{ClientCAs: certPool})
require.Same(t, config.Config().ClientCAs, certPool)

// https://go-review.googlesource.com/c/go/+/229917
config.AddClientRootCA(cert)

require.Equal(t, config.Config().ClientCAs, expectedCertPool, "The CertPools should be equal")
require.Equal(t, certPool.Subjects(), expectedCertPool.Subjects(), "subjects in the pool should be equal")
}

func TestSetClientCAs(t *testing.T) {
Expand Down