saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31826 from gtmanfred/2014.7

Browse source 
Remove ability of authenticating user to specify pam service
This commit is contained in:
Nicole Thomas 2016-03-11 13:41:01 -07:00
commit c5e7c03953
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/auth/pam.py
View file

@ -12,6 +12,13 @@ a user against the Pluggable Authentication Modules (PAM) on the system.
Implemented using ctypes, so no compilation is necessary.
There is one extra configuration option for pam. The `pam_service` that is
authenticated against. This defaults to `login`
.. code-block:: yaml
auth.pam.service: login
.. note:: PAM authentication will not work for the ``root`` user.
The Python interface to PAM does not support authenticating as ``root``.
@ -124,7 +131,7 @@ def __virtual__():
return HAS_PAM
def authenticate(username, password, service='login'):
def authenticate(username, password):
'''
Returns True if the given username and password authenticate for the
given service. Returns False otherwise
@ -132,10 +139,9 @@ def authenticate(username, password, service='login'):
``username``: the username to authenticate
``password``: the password in plain text
``service``: the PAM service to authenticate against.
Defaults to 'login'
'''
service = __opts__.get('auth.pam.service', 'login')
@CONV_FUNC
def my_conv(n_messages, messages, p_response, app_data):
'''
@ -171,7 +177,7 @@ def auth(username, password, **kwargs):
'''
Authenticate via pam
'''
return authenticate(username, password, kwargs.get('service', 'login'))
return authenticate(username, password)
def groups(username, *args, **kwargs):