[master] Use token's eauth key if load omits it. #66662
Open
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.
What does this PR do?
__get_acl
to check for such a module, either via theeauth_acl_module
configuration value or fallback to theeauth
module'sacl
function, if defined.What issues does this PR fix or reference?
N/A
Previous Behavior
If
load["eauth"]
is not defined,__get_acl()
immediately returnsNone
.New Behavior
In
get_auth_list()
, if the"eauth"
key is not present in theload
dictionary, but is present in thetoken
dictionary, the token's"eauth"
value is added to theload
dictionary. When__get_acl()
is called from withinget_auth_list()
, the former can attempt to perform an ACL lookup via theeauth_acl_module
configuration option or fall back to the eauth module'sacl()
function, if defined.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No
Please review Salt's Contributing Guide for best practices, including the
PR Guidelines.
See GitHub's page on GPG signing for more information about signing commits with GPG.