fix: avoid duplicate secret accessor conversion #6809
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
Fixes regression from 08cb122. Essentially, it became possible to construct an input which would apply the secret accessor translation twice. If one of the frontend inputs was constructed from dagger, it could already have an accessor secret ID as part of it's build graph (if `WithExec` was used alongside a secret). However, this input could appear inside the frontend request - which would result in double-wrapping the secret accessor to a secret that definitely can't exist, which presents the weird error. The easiest solution to this is to just track the inputs for dagger calls to buildkit's Solve request, and to ensure that we avoid secret filtering for those inputs. Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
spirulence
reviewed
Mar 5, 2024
| @@ -147,6 +153,8 @@ func (dag *OpDAG) walk(f func(*OpDAG) error, memo map[*OpDAG]struct{}) error { | |||
| return nil | |||
| } | |||
|
|
|||
| var SkipInputs = fmt.Errorf("skip inputs") //nolint:stylecheck // Err prefix isn't convention for Walk control errors | |||
There was a problem hiding this comment.
Would it be beneficial to ignore just the style check rule that's flagging the Err prefix here instead of the whole style check linter? I'm not sure what the convention is for dagger but I have done this with terraform lint and security tools in private codebases before.
sipsma
approved these changes
Mar 5, 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.
Fixes regression from #6601, see discord discussion.
Essentially, it became possible to construct an input which would apply the secret accessor translation twice. If one of the frontend inputs was constructed from dagger, it could already have an accessor secret ID as part of it's build graph (if
WithExecwas used alongside a secret).However, this input could appear inside the frontend request - which would result in double-wrapping the secret accessor to a secret that definitely can't exist, which presents the weird error.
The easiest solution to this is to just track the inputs for dagger calls to buildkit's Solve request, and to ensure that we avoid secret filtering for those inputs.