fix(secrets): fix file prefix for saml keystore #1276
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
dibyom
approved these changes
Apr 15, 2019
dibyom
reviewed
Apr 15, 2019
...main/java/com/netflix/spinnaker/halyard/deploy/config/v1/secrets/DecryptingObjectMapper.java
Outdated
Show resolved
Hide resolved
KathrynLewis
force-pushed
the
fix-keystore
branch
from
df9ed48
to
410455d
Compare
|
Fixes spinnaker/spinnaker#4294 |
|
@spinnakerbot cherry-pick 1.19 |
|
Cherry pick failed: Command failed (cherry pick commit 9fa9f0e) with exit code 1: |
|
@spinnakerbot cherry-pick 1.19 |
spinnakerbot
pushed a commit
that referenced
this pull request
Apr 17, 2019
|
Cherry pick successful: #1284 |
dibyom
pushed a commit
that referenced
this pull request
Apr 17, 2019
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.
The saml keystore requires a "file:" prefix in the
gate.yml, which is currently added in thesecretFileSerializer. The bug: when secret decryption is supported in the services AND the keystore file is not an encrypted secret, the code skips the custom secretFileSerializer, which means "file:" doesn't get prepended to the path. This fixes the logic so that an encrypted secret that should stay encrypted doesn't get the prefix, but all other cases do.