Remove deprecated upstream_bundle configurable #1702
Merged
Conversation
This file contains 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
Changes the server to always use the upstream bundle as the trust bundle and removes the configurable. One notably change in behavior is that the SPIRE server will no longer present the self-signed CA with its own certificate during the TLS handshake. The self-signed CA was added in the TLS handshake as a side-effect of code added to support presenting the CA certificate during the TLS handshake when an UpstreamAuthority had signed the CA certificate but upstream_bundle was false (to allow agents to bootstrap using the upstream bundle). That code is no longer required though since the server will now always include the intermediate CA when signed by upstream. Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
azdagron
requested review from
ajessup,
amartinezfayo,
APTy,
evan2645 and
mcpherrinm
as code owners
| @@ -188,14 +188,12 @@ func migrateJSONFile(from, to string) (bool, error) { | |||
| if len(chain) == 0 { | |||
| return nil, nil | |||
| } | |||
| // The chain is in one of three states: | |||
| // The chain is in one of two states: | |||
There was a problem hiding this comment.
Do we need any update on the test side?
There was a problem hiding this comment.
Sure! The production code isn't impacted by the change but I can see how the unit-test case could be confused. Removed the test case that didn't have a bundle.
Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
…pstream-bundle Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes the server to always use the upstream bundle as the trust bundle and removes the configurable.
One notably change in behavior is that the SPIRE server will no longer present the self-signed CA with its own certificate during the TLS handshake. The self-signed CA was added in the TLS handshake as a side-effect of code added to support presenting the CA certificate during the TLS handshake when an UpstreamAuthority had signed the CA certificate but upstream_bundle was false (to allow agents to bootstrap using the upstream bundle). That code is no longer required though since the server will now always include the intermediate CA when signed by upstream.
This finishes the last step outlined in #1404 and the final step in fixing #1095.
Fixes #1095