oci: preserve dir mode when extracting tar layers#1151
Merged
stefanprodan merged 1 commit intofluxcd:mainfrom Apr 14, 2026
Merged
oci: preserve dir mode when extracting tar layers#1151stefanprodan merged 1 commit intofluxcd:mainfrom
stefanprodan merged 1 commit intofluxcd:mainfrom
Conversation
6f83d33 to
e6725e8
Compare
stefanprodan
reviewed
Apr 9, 2026
Member
stefanprodan
left a comment
There was a problem hiding this comment.
With this change, a maliciously crafted artifact could now create world-writable directories (0o777) that source-controller would process. Not sure if this would not result in a CVE. cc @hiddeco
e6725e8 to
a187017
Compare
hiddeco
reviewed
Apr 13, 2026
4164d36 to
7b19d37
Compare
7b19d37 to
81b2c28
Compare
Member
|
Hey @frazew is Scaleway using Flux? If so, could you please add it to the adopters page here: https://fluxcd.io/adopters/ Thanks! |
hiddeco
approved these changes
Apr 14, 2026
Member
|
@frazew can you rebase with upstream main and force push. |
OCI push/pull/diff is currently not "round-trip" safe, because the tar extraction function hardcodes 0o750 for directories Signed-off-by: François HORTA <fhorta@scaleway.com>
81b2c28 to
84aa850
Compare
stefanprodan
approved these changes
Apr 14, 2026
Contributor
Author
|
thanks a lot for your reviews and time! |
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
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.
OCI push/pull/diff is currently not "round-trip" safe, because the tar extraction function hardcodes
0o750for directoriesThis:
Outputs the following, which feels very weird:
This was noticed while debugging why
flux diffalways returned a diff, even for seemingly identical file trees. Maybe there's a specific reason for doing that, but I couldn't find one while looking around the git / Github PR history!There's (in my opinion) another issue with file modes not being fixed when creating the tar layers, but that would need to be in another PR and might need discussion because it might be a breaking change? (i.e. I think the code here should also rewrite
header.Modeto0o750/0o640so that umask differences between machines don't impact the final artifact)