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.

Sign up for GitHub

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

Jump to bottom

[master] Use token's eauth key if load omits it. #66662

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+81 −0
Open

[master] Use token's eauth key if load omits it. #66662

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714aca2
Use token's eauth key if load omits it.
Jun 24, 2024
c80f435
Add tests
RyanFrantz Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions salt/auth/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ def get_auth_list(self, load, token=None):
# Get auth list from token
if token and self.opts["keep_acl_in_token"] and "auth_list" in token:
return token["auth_list"]

# If eauth is not present in the load, but is in the token, set it in
# the load so that we can engage the ACL lookup code inside __get_acl().
if "eauth" not in load and "eauth" in token:
load["eauth"] = token["eauth"]

# Get acl from eauth module.
auth_list = self.__get_acl(load)
if auth_list is not None:
Expand Down
Loading