Skip to content

[tests] No local signer for test CA if external CA is desired #2223

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
aaronlehmann merged 1 commit into from
Jun 8, 2017
Merged

[tests] No local signer for test CA if external CA is desired #2223

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
20 changes: 18 additions & 2 deletions ca/testutils/cautils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,28 @@ func NewTestCAFromAPIRootCA(t *testing.T, tempBaseDir string, apiRootCA api.Root

if External {
// Start the CA API server - ensure that the external server doesn't have any intermediates
externalSigningServer, err = NewExternalSigningServer(rootCA, tempBaseDir)
assert.NoError(t, err)
var extRootCA ca.RootCA
if apiRootCA.RootRotation != nil {
extRootCA, err = ca.NewRootCA(
apiRootCA.RootRotation.CACert, apiRootCA.RootRotation.CACert, apiRootCA.RootRotation.CAKey, ca.DefaultNodeCertExpiration, nil)
// remove the key from the API root CA so that once the CA server starts up, it won't have a local signer
apiRootCA.RootRotation.CAKey = nil
} else {
extRootCA, err = ca.NewRootCA(
apiRootCA.CACert, apiRootCA.CACert, apiRootCA.CAKey, ca.DefaultNodeCertExpiration, nil)
// remove the key from the API root CA so that once the CA server starts up, it won't have a local signer
apiRootCA.CAKey = nil
}
require.NoError(t, err)

externalSigningServer, err = NewExternalSigningServer(extRootCA, tempBaseDir)
require.NoError(t, err)

externalCAs = []*api.ExternalCA{
{
Protocol: api.ExternalCA_CAProtocolCFSSL,
URL: externalSigningServer.URL,
CACert: extRootCA.Certs,
},
}
}
Expand Down