Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3006.x] Fix #66133: roots fileserver path verification for symlinks #66419

Merged
merged 2 commits into from May 16, 2024

Conversation

hurzhurz
Copy link
Contributor

What does this PR do?

Changes of the path verification so that symlinks to destinations outside of the roots directory work again.
This is broken since the CVE fix commit e0cdb80.

What issues does this PR fix or reference?

Fixes #66133, #66052, #65977

@hurzhurz hurzhurz requested a review from a team as a code owner April 22, 2024 18:30
@hurzhurz hurzhurz requested review from twangboy and removed request for a team April 22, 2024 18:30
Copy link
Contributor

@dwoz dwoz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer that salt.utils.verify.clean_path be modified to optionally allow for symlinks.

@hurzhurz
Copy link
Contributor Author

I thought about that but wasn't sure if I should touch the function.
Hope it is ok how I have done it now...

@dwoz
Copy link
Contributor

dwoz commented May 1, 2024

Yes, I like this approach better. Please hold off on merging this. I have a few things I would like to validate before we proceed.

@dwoz dwoz merged commit 1694f84 into saltstack:3006.x May 16, 2024
192 of 194 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants