Skip to content

[ca] Minor cleanups #2067

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
cyli merged 1 commit into from
Mar 29, 2017
Merged

[ca] Minor cleanups #2067

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
15 changes: 15 additions & 0 deletions ca/certificates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,14 @@ func TestNewRootCAInvalidCertAndKeys(t *testing.T) {
notYetValidIntermediate := testutils.ReDateCert(t, testutils.ECDSACertChain[1],
testutils.ECDSACertChain[2], testutils.ECDSACertChainKeys[2], now.Add(time.Hour), now.Add(2*time.Hour))

certChainRootCA, err := ca.NewRootCA(testutils.ECDSACertChain[2], testutils.ECDSACertChain[2], testutils.ECDSACertChainKeys[2],
ca.DefaultNodeCertExpiration, nil)
require.NoError(t, err)

cert, _, _ := testutils.CreateRootCertAndKey("alternateIntermediate")
alternateIntermediate, err := certChainRootCA.CrossSignCACertificate(cert)
require.NoError(t, err)

invalids := []invalidNewRootCATestCase{
// invalid root or signer cert
{
Expand Down Expand Up @@ -772,6 +780,13 @@ func TestNewRootCAInvalidCertAndKeys(t *testing.T) {
intermediates: testutils.ECDSA256SHA256Cert,
errorStr: "unknown authority", // intermediates don't chain up to root
},
{
roots: testutils.ECDSACertChain[2],
cert: testutils.ECDSACertChain[1],
key: testutils.ECDSACertChainKeys[1],
intermediates: alternateIntermediate,
errorStr: "the first intermediate must have the same subject and public key as the signing cert",
},
}

for i, invalid := range invalids {
Expand Down
3 changes: 1 addition & 2 deletions ca/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ func (s *Server) UpdateRootCA(ctx context.Context, cluster *api.Cluster) error {

s.secConfigMu.Lock()
defer s.secConfigMu.Unlock()
var err error
rCA := cluster.RootCA
rootCAChanged := len(rCA.CACert) != 0 && !equality.RootCAEqualStable(s.lastSeenClusterRootCA, &cluster.RootCA)
externalCAChanged := !equality.ExternalCAsEqualStable(s.lastSeenExternalCAs, cluster.Spec.CAConfig.ExternalCAs)
Expand All @@ -565,7 +564,7 @@ func (s *Server) UpdateRootCA(ctx context.Context, cluster *api.Cluster) error {
}
} else {
// NodeCertExpiry seems to be nil
logger.WithError(err).Warn("failed to parse certificate expiration, using default")
logger.Warn("no certificate expiration specified, using default")
}
// Attempt to update our local RootCA with the new parameters
var intermediates []byte
Expand Down