mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
234 lines
7.7 KiB
Python
234 lines
7.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration tests for shadow linux
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import random
|
|
import string
|
|
import os
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import destructiveTest, skip_if_not_root
|
|
|
|
# Import Salt libs
|
|
import salt.utils.files
|
|
import salt.utils.platform
|
|
from salt.ext.six.moves import range
|
|
|
|
|
|
@skip_if_not_root
|
|
@skipIf(not salt.utils.platform.is_linux(), 'These tests can only be run on linux')
|
|
class ShadowModuleTest(ModuleCase):
|
|
'''
|
|
Validate the linux shadow system module
|
|
'''
|
|
|
|
def __init__(self, arg):
|
|
super(self.__class__, self).__init__(arg)
|
|
self._test_user = self.__random_string()
|
|
self._no_user = self.__random_string()
|
|
self._password = self.run_function('shadow.gen_password', ['Password1234'])
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
super(ShadowModuleTest, self).setUp()
|
|
os_grain = self.run_function('grains.item', ['kernel'])
|
|
if os_grain['kernel'] not in 'Linux':
|
|
self.skipTest(
|
|
'Test not applicable to \'{kernel}\' kernel'.format(
|
|
**os_grain
|
|
)
|
|
)
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
self.run_function('user.delete', [self._test_user])
|
|
|
|
def __random_string(self, size=6):
|
|
'''
|
|
Generates a random username
|
|
'''
|
|
return 'tu-' + ''.join(
|
|
random.choice(string.ascii_lowercase + string.digits)
|
|
for x in range(size)
|
|
)
|
|
|
|
@destructiveTest
|
|
def test_info(self):
|
|
'''
|
|
Test shadow.info
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
ret = self.run_function('shadow.info', [self._test_user])
|
|
self.assertEqual(ret['name'], self._test_user)
|
|
|
|
# User does not exist
|
|
ret = self.run_function('shadow.info', [self._no_user])
|
|
self.assertEqual(ret['name'], '')
|
|
|
|
@destructiveTest
|
|
def test_del_password(self):
|
|
'''
|
|
Test shadow.del_password
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.del_password', [self._test_user]))
|
|
self.assertEqual(
|
|
self.run_function('shadow.info', [self._test_user])['passwd'], '')
|
|
|
|
# User does not exist
|
|
self.assertFalse(self.run_function('shadow.del_password', [self._no_user]))
|
|
|
|
@destructiveTest
|
|
def test_set_password(self):
|
|
'''
|
|
Test shadow.set_password
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_password', [self._test_user, self._password]))
|
|
|
|
# User does not exist
|
|
self.assertFalse(self.run_function('shadow.set_password', [self._no_user, self._password]))
|
|
|
|
@destructiveTest
|
|
def test_set_inactdays(self):
|
|
'''
|
|
Test shadow.set_inactdays
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_inactdays', [self._test_user, 12]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_inactdays', [self._no_user, 12]))
|
|
|
|
@destructiveTest
|
|
def test_set_maxdays(self):
|
|
'''
|
|
Test shadow.set_maxdays
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_maxdays', [self._test_user, 12]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_maxdays', [self._no_user, 12]))
|
|
|
|
@destructiveTest
|
|
def test_set_mindays(self):
|
|
'''
|
|
Test shadow.set_mindays
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_mindays', [self._test_user, 12]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_mindays', [self._no_user, 12]))
|
|
|
|
@destructiveTest
|
|
def test_lock_password(self):
|
|
'''
|
|
Test shadow.lock_password
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
self.run_function('shadow.set_password', [self._test_user, self._password])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.lock_password', [self._test_user]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.lock_password', [self._no_user]))
|
|
|
|
@destructiveTest
|
|
def test_unlock_password(self):
|
|
'''
|
|
Test shadow.lock_password
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
self.run_function('shadow.set_password', [self._test_user, self._password])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.unlock_password', [self._test_user]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.unlock_password', [self._no_user]))
|
|
|
|
@destructiveTest
|
|
def test_set_warndays(self):
|
|
'''
|
|
Test shadow.set_warndays
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_warndays', [self._test_user, 12]))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_warndays', [self._no_user, 12]))
|
|
|
|
@destructiveTest
|
|
def test_set_date(self):
|
|
'''
|
|
Test shadow.set_date
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_date', [self._test_user, '2016-08-19']))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_date', [self._no_user, '2016-08-19']))
|
|
|
|
@destructiveTest
|
|
def test_set_expire(self):
|
|
'''
|
|
Test shadow.set_exipre
|
|
'''
|
|
self.run_function('user.add', [self._test_user])
|
|
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.set_expire', [self._test_user, '2016-08-25']))
|
|
|
|
# User does not exist (set_inactdays return None is user does not exist)
|
|
self.assertFalse(self.run_function('shadow.set_expire', [self._no_user, '2016-08-25']))
|
|
|
|
@destructiveTest
|
|
def test_set_del_root_password(self):
|
|
'''
|
|
Test set/del password for root
|
|
'''
|
|
#saving shadow file
|
|
if not os.access("/etc/shadow", os.R_OK | os.W_OK):
|
|
self.skipTest('Could not save initial state of /etc/shadow')
|
|
with salt.utils.files.fopen('/etc/shadow', 'r') as sFile:
|
|
shadow = sFile.read()
|
|
#set root password
|
|
self.assertTrue(self.run_function('shadow.set_password', ['root', self._password]))
|
|
self.assertEqual(
|
|
self.run_function('shadow.info', ['root'])['passwd'], self._password)
|
|
#delete root password
|
|
self.assertTrue(self.run_function('shadow.del_password', ['root']))
|
|
self.assertEqual(
|
|
self.run_function('shadow.info', ['root'])['passwd'], '')
|
|
#restore shadow file
|
|
with salt.utils.files.fopen('/etc/shadow', 'w') as sFile:
|
|
sFile.write(shadow)
|