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

Add test 35015 (#35945)

Browse source 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
This commit is contained in:
Megan Wilhite 2016-09-09 12:58:50 -06:00 • committed by Nicole Thomas
parent 846f940fd2
commit 393bbef63b
2 changed files with 124 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
tests/integration/shell/key.py
View file

@ -15,6 +15,10 @@ ensure_in_syspath('../../')
import integration
import salt.utils
USERA = 'saltdev'
USERA_PWD = 'saltdev'
HASHED_USERA_PWD = '$6$SALTsalt$ZZFD90fKFWq8AGmmX0L3uBtS9fXL62SrTk5zcnQ6EkD6zoiM3kB88G1Zvs0xm/gZ7WXJRs5nsTBybUvGSqZkT.'
class KeyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
'''
@ -23,6 +27,33 @@ class KeyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
_call_binary_ = 'salt-key'
def _add_user(self):
'''
helper method to add user
'''
try:
add_user = self.run_call('user.add {0} createhome=False'.format(USERA))
add_pwd = self.run_call('shadow.set_password {0} \'{1}\''.format(USERA,
USERA_PWD if salt.utils.is_darwin() else HASHED_USERA_PWD))
self.assertTrue(add_user)
self.assertTrue(add_pwd)
user_list = self.run_call('user.list_users')
self.assertIn(USERA, str(user_list))
except AssertionError:
self.run_call('user.delete {0} remove=True'.format(USERA))
self.skipTest(
'Could not add user or password, skipping test'
)
def _remove_user(self):
'''
helper method to remove user
'''
user_list = self.run_call('user.list_users')
for user in user_list:
if USERA in user:
self.run_call('user.delete {0} remove=True'.format(USERA))
def test_list_accepted_args(self):
'''
test salt-key -l for accepted arguments
@ -141,6 +172,34 @@ class KeyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
expect = ['Accepted Keys:', 'minion', 'sub_minion']
self.assertEqual(data, expect)
def test_list_acc_eauth(self):
'''
test salt-key -l with eauth
'''
self._add_user()
data = self.run_key('-l acc --eauth pam --username {0} --password {1}'.format(USERA, USERA_PWD))
expect = ['Accepted Keys:', 'minion', 'sub_minion']
self.assertEqual(data, expect)
self._remove_user()
def test_list_acc_eauth_bad_creds(self):
'''
test salt-key -l with eauth and bad creds
'''
self._add_user()
data = self.run_key('-l acc --eauth pam --username {0} --password wrongpassword'.format(USERA))
expect = ['Authentication failure of type "eauth" occurred for user {0}.'.format(USERA)]
self.assertEqual(data, expect)
self._remove_user()
def test_list_acc_wrong_eauth(self):
'''
test salt-key -l with wrong eauth
'''
data = self.run_key('-l acc --eauth wrongeauth --username {0} --password {1}'.format(USERA, USERA_PWD))
expect = ['The specified external authentication system "wrongeauth" is not available']
self.assertEqual(data, expect)
def test_list_un(self):
'''
test salt-key -l

65
tests/integration/shell/runner.py
View file

@ -19,6 +19,10 @@ import integration
from integration.utils import testprogram
import salt.utils
USERA = 'saltdev'
USERA_PWD = 'saltdev'
HASHED_USERA_PWD = '$6$SALTsalt$ZZFD90fKFWq8AGmmX0L3uBtS9fXL62SrTk5zcnQ6EkD6zoiM3kB88G1Zvs0xm/gZ7WXJRs5nsTBybUvGSqZkT.'
class RunTest(integration.ShellCase, testprogram.TestProgramCase, integration.ShellCaseCommonTestsMixIn):
'''
@ -27,6 +31,33 @@ class RunTest(integration.ShellCase, testprogram.TestProgramCase, integration.Sh
_call_binary_ = 'salt-run'
def _add_user(self):
'''
helper method to add user
'''
try:
add_user = self.run_call('user.add {0} createhome=False'.format(USERA))
add_pwd = self.run_call('shadow.set_password {0} \'{1}\''.format(USERA,
USERA_PWD if salt.utils.is_darwin() else HASHED_USERA_PWD))
self.assertTrue(add_user)
self.assertTrue(add_pwd)
user_list = self.run_call('user.list_users')
self.assertIn(USERA, str(user_list))
except AssertionError:
self.run_call('user.delete {0} remove=True'.format(USERA))
self.skipTest(
'Could not add user or password, skipping test'
)
def _remove_user(self):
'''
helper method to remove user
'''
user_list = self.run_call('user.list_users')
for user in user_list:
if USERA in user:
self.run_call('user.delete {0} remove=True'.format(USERA))
def test_in_docs(self):
'''
test the salt-run docs system
@ -144,6 +175,40 @@ class RunTest(integration.ShellCase, testprogram.TestProgramCase, integration.Sh
stdout=stdout, stderr=stderr
)
def test_salt_run_with_eauth_all_args(self):
'''
test salt-run with eauth
tests all eauth args
'''
args = ['--auth', '--eauth', '--external-auth', '-a']
self._add_user()
for arg in args:
run_cmd = self.run_run('{0} pam --username {1} --password {2}\
test.arg arg kwarg=kwarg1'.format(arg, USERA, USERA_PWD))
expect = ['args:', ' - arg', 'kwargs:', ' ----------', ' kwarg:', ' kwarg1']
self.assertEqual(expect, run_cmd)
self._remove_user()
def test_salt_run_with_eauth_bad_passwd(self):
'''
test salt-run with eauth and bad password
'''
self._add_user()
run_cmd = self.run_run('-a pam --username {0} --password wrongpassword\
test.arg arg kwarg=kwarg1'.format(USERA))
expect = ['Authentication failure of type "eauth" occurred for user saltdev.']
self.assertEqual(expect, run_cmd)
self._remove_user()
def test_salt_run_with_wrong_eauth(self):
'''
test salt-run with wrong eauth parameter
'''
run_cmd = self.run_run('-a wrongeauth --username {0} --password {1}\
test.arg arg kwarg=kwarg1'.format(USERA, USERA_PWD))
expect = ['The specified external authentication system "wrongeauth" is not available']
self.assertEqual(expect, run_cmd)
if __name__ == '__main__':
integration.run_tests(RunTest)