Handle an edge case in CA rotation where we reclaim CA service from an external CA#2681
Merged
anshulpundir merged 1 commit intomoby:masterfrom Oct 11, 2018
Merged
Conversation
…A has an external CA URL, but the root CA also has a key (the external URL is preferred), and the swarm update for removes the external URL without changing the certificate and key. This should succeed. Support the edge case for CA rotation where the current root CA has an external CA URL but not key, and the swarm update adds the same cert and key and removes the external CA URL. Previously this would error, because it first made sure that the external CA URLs needed by the old root CA were present, but this now succeeds because no root rotation is needed, a key is just being provided where none was present before. Signed-off-by: Ying Li <ying.li@docker.com>
Member
|
ping @justincormack @dperny @anshulpundir PTAL |
Collaborator
|
LGTM, I think. |
anshulpundir
approved these changes
Oct 10, 2018
Member
|
@anshulpundir good to go? (not a maintainer; no permissions to merge 😅) |
This was referenced Oct 11, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Support the edge case for CA rotation where the current root CA has an external CA URL but not key, and the swarm update adds the same cert and key and removes
the external CA URL. Previously this would error, because it first made sure that the external CA URLs needed by the old root CA were present. This now succeeds because no root rotation is needed, a key is just being provided where none was present before.
This also adds several additional CA root rotation test cases to validate the case where there was an external CA URL, but the root CA also has a key (the external URL is preferred), and the swarm update for removes the external URL without changing the certificate and key.
This should make it easier to reclaim CA functionality from an external CA if the swarm already has the CA cert and key.
cc @BillMills