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

saltstack / salt

Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt software package repository here:

Apache License 2.0

13.98k stars 5.47k forks source link

What does this PR do?

For token-based authentication, where administrators would also like to write a custom eauth ACL module, this update allows __get_acl to check for such a module, either via the eauth_acl_module configuration value or fallback to the eauth module's acl function, if defined.

What issues does this PR fix or reference?

N/A

Previous Behavior

If load["eauth"] is not defined, __get_acl() immediately returns None.

New Behavior

In get_auth_list(), if the "eauth" key is not present in the load dictionary, but is present in the token dictionary, the token's "eauth" value is added to the load dictionary. When __get_acl() is called from within get_auth_list(), the former can attempt to perform an ACL lookup via the eauth_acl_module configuration option or fall back to the eauth module's acl() function, if defined.

Merge requirements satisfied?

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

[ ] Docs
[ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
[ ] Tests written/updated

Commits signed with GPG?

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.

Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as possible. In the meantime, here’s some information that may help as you continue your Salt journey. Please be sure to review our Code of Conduct. Also, check out some of our community resources including:

There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar. If you have additional questions, email us at saltproject@vmware.com. We’re glad you’ve joined our community and look forward to doing awesome things with you!

saltstack / salt