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

Syndics honor MoM acl #63428

Merged
merged 14 commits into from
Jan 12, 2023
Merged

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Jan 7, 2023

What does this PR do?

This is an alternate approach to #63257

What issues does this PR fix or reference?

Fixes:

#62618
#62577

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@dwoz dwoz requested a review from a team as a code owner January 7, 2023 07:45
@dwoz dwoz requested review from Ch3LL and removed request for a team January 7, 2023 07:45
@dwoz dwoz force-pushed the issue/master/62618 branch 5 times, most recently from a6bb27a to 43ecda0 Compare January 7, 2023 09:36
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

Only one problem that I see, and that's in the test suite.

I'm going to check this out and bang on it a bit more. I'm also seeing some failures here: https://github.com/saltstack/salt/actions/runs/3864153908/jobs/6586792092 that are concerning

tests/pytests/unit/utils/test_minions.py Show resolved Hide resolved
@Ch3LL Ch3LL added the Sulfur v3006.0 release code name and version label Jan 9, 2023
whytewolf
whytewolf previously approved these changes Jan 9, 2023
@dwoz dwoz changed the title [WIP] Syndics honor MoM acl Syndics honor MoM acl Jan 9, 2023
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

Okay, I opened a PR against your fork and I've also added I think what would make the docstring 👍 - if you want to finish this up I can close mine in favor of this PR, or vice versa and I can go ahead and combine these changes with my PR.

Those smol changes and this is ready to rock! 🎉

tests/pytests/unit/utils/test_minions.py Show resolved Hide resolved
doc/topics/hardening.rst Outdated Show resolved Hide resolved
@Ch3LL
Copy link
Contributor

Ch3LL commented Jan 10, 2023

Looks like the test failures are possibly related to this change.

@dwoz dwoz force-pushed the issue/master/62618 branch from 7090670 to 8ace01d Compare January 11, 2023 10:36
dwoz and others added 9 commits January 11, 2023 10:35
We want to ensure that targeting invalid minions does *not* allow us to
run any sort of shenanigans on the minions in question! This ensures
that valid commands (i.e. file.touch in this case) cannot inadvertently
be sent to minions that we don't have ACL for.
@dwoz dwoz force-pushed the issue/master/62618 branch from ee5ab12 to 9d0ba70 Compare January 11, 2023 17:37
It's possible that the output of ls is different for some reason, but
test -f should always return 0 if the file exists, or 1 otherwise. We
want it to be not 0.
@dwoz dwoz requested review from waynew, whytewolf and Ch3LL January 12, 2023 17:49
@Ch3LL Ch3LL mentioned this pull request Jan 12, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sulfur v3006.0 release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants