[Backport 7.x] (PUP-12050) Check for nested Sensitive arguments #9414
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
(cherry picked from commit bdf1a46)
Previously, a manifest containing nested Deferred values did not mark
the corresponding parameter as sensitive, resulting in the following:
$ cat manifest.pp
$vars = {'token' => Deferred('new', [Sensitive, "password"])}
file { '/tmp/a.sh':
ensure => file,
content => Deferred('inline_epp', ['<%= $token %>', $vars])
}
$ truncate --size 0 /tmp/a.sh
$ puppet apply --show_diff manifest.pp
Notice: Compiled catalog for localhost in environment production in 0.01 seconds
Notice: /Stage[main]/Main/File[/tmp/a.sh]/content:
--- /tmp/a.sh 2024-07-03 17:30:37.024543314 -0700
+++ /tmp/puppet-file20240703-1784698-2cu5s9 2024-07-03 17:30:41.880572413 -0700
@@ -0,0 +1 @@
+password
\ No newline at end of file
The issue occurred because we were only checking if the outermost DeferredValue
contained any Sensitive arguments, in this case the arguments passed to
`inline_epp` function, but not the `password` passed to the `new` function.
This is not an issue when deferred values are preprocessed, because Deferred
values are completely resolved and we can check if resolved value is Sensitive.
(cherry picked from commit a94d5d0)
cthorn42
approved these changes
Jul 12, 2024
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.
Backport #9410 to 7.x