Repository navigation
fix(blueprint): keep the scheduled plan unmasked after PATCH /blueprints - #9247
Open
Thanatos9404 wants to merge 1 commit into
Open
Thanatos9404 wants to merge 1 commit into
Thanatos9404 wants to merge 1 commit into
Conversation
PatchBlueprint sanitized the blueprint it had just handed to the cron job, and the gitextractor sanitizer rewrote the options map in place. The next scheduled pipeline then cloned with a masked URL until the server restarted. Normal-mode blueprints with credentials in beforePlan or afterPlan were hit too, since those tasks are shared with the generated plan. Sanitizing now works on copies: SanitizePluginOption masks a clone of the options, SanitizeTask returns a new task, and SanitizeBlueprint and SanitizePipeline build a new plan. PatchBlueprint sanitizes a copy of the saved blueprint for its response, so the plan it returns is still masked. Closes apache#9243 Signed-off-by: Yashvardhan Thanvi <yashvt9404@gmail.com>
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
1 participant
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.
Summary
After
PATCH /blueprints/:id,PatchBlueprintsanitized the same blueprint object the cron job had just been given, and the gitextractor sanitizer rewroteoptions["url"]in place. Scheduled runs then cloned with a masked URL until the server restarted. Normal-mode blueprints with credentials inbeforePlanorafterPlanwere affected too, since those tasks are shared with the generated plan.Sanitizing now works on copies: the options map is cloned before masking,
SanitizeTaskreturns a new task, andSanitizeBlueprintandSanitizePipelinebuild a new plan.PatchBlueprintsanitizes a copy for its response, so the returned plan is still masked. ItsbeforePlanandafterPlannow come back unmasked, as GET already returns them; before, they were masked only through this aliasing.Two new unit tests in
blueprint_test.gofail on main and pass here, andgo test,go vetand golangci-lint are clean forserver/services.Does this close any open issues?
Closes #9243