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.
221 lines
6.9 KiB
Python
221 lines
6.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration tests for mac_system
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import datetime
|
|
import random
|
|
import string
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import skipIf
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.helpers import destructiveTest, skip_if_not_root
|
|
|
|
# Import Salt libs
|
|
import salt.utils.path
|
|
import salt.utils.platform
|
|
from salt.ext.six.moves import range
|
|
|
|
|
|
def __random_string(size=6):
|
|
'''
|
|
Generates a random username
|
|
'''
|
|
return 'RS-' + ''.join(
|
|
random.choice(string.ascii_uppercase + string.digits)
|
|
for x in range(size)
|
|
)
|
|
|
|
|
|
TEST_USER = __random_string()
|
|
NO_USER = __random_string()
|
|
|
|
|
|
@skip_if_not_root
|
|
@skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
|
|
@skipIf(not salt.utils.path.which('dscl'), '\'dscl\' binary not found in $PATH')
|
|
@skipIf(not salt.utils.path.which('pwpolicy'), '\'pwpolicy\' binary not found in $PATH')
|
|
class MacShadowModuleTest(ModuleCase):
|
|
'''
|
|
Validate the mac_system module
|
|
'''
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
self.run_function('user.add', [TEST_USER])
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
self.run_function('user.delete', [TEST_USER])
|
|
|
|
def test_info(self):
|
|
'''
|
|
Test shadow.info
|
|
'''
|
|
# Correct Functionality
|
|
ret = self.run_function('shadow.info', [TEST_USER])
|
|
self.assertEqual(ret['name'], TEST_USER)
|
|
|
|
# User does not exist
|
|
ret = self.run_function('shadow.info', [NO_USER])
|
|
self.assertEqual(ret['name'], '')
|
|
|
|
@destructiveTest
|
|
def test_get_account_created(self):
|
|
'''
|
|
Test shadow.get_account_created
|
|
'''
|
|
# Correct Functionality
|
|
text_date = self.run_function('shadow.get_account_created', [TEST_USER])
|
|
self.assertNotEqual(text_date, 'Invalid Timestamp')
|
|
obj_date = datetime.datetime.strptime(text_date, '%Y-%m-%d %H:%M:%S')
|
|
self.assertIsInstance(obj_date, datetime.date)
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_account_created', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_last_change(self):
|
|
'''
|
|
Test shadow.get_last_change
|
|
'''
|
|
# Correct Functionality
|
|
text_date = self.run_function('shadow.get_last_change', [TEST_USER])
|
|
self.assertNotEqual(text_date, 'Invalid Timestamp')
|
|
obj_date = datetime.datetime.strptime(text_date, '%Y-%m-%d %H:%M:%S')
|
|
self.assertIsInstance(obj_date, datetime.date)
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_last_change', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_login_failed_last(self):
|
|
'''
|
|
Test shadow.get_login_failed_last
|
|
'''
|
|
# Correct Functionality
|
|
text_date = self.run_function('shadow.get_login_failed_last', [TEST_USER])
|
|
self.assertNotEqual(text_date, 'Invalid Timestamp')
|
|
obj_date = datetime.datetime.strptime(text_date, '%Y-%m-%d %H:%M:%S')
|
|
self.assertIsInstance(obj_date, datetime.date)
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_login_failed_last', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_login_failed_count(self):
|
|
'''
|
|
Test shadow.get_login_failed_count
|
|
'''
|
|
# Correct Functionality
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_login_failed_count', [TEST_USER]),
|
|
'0')
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_login_failed_count', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_set_maxdays(self):
|
|
'''
|
|
Test shadow.get_maxdays
|
|
Test shadow.set_maxdays
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(
|
|
self.run_function('shadow.set_maxdays', [TEST_USER, 20]))
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_maxdays', [TEST_USER]), 20)
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.set_maxdays', [NO_USER, 7]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_maxdays', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_set_change(self):
|
|
'''
|
|
Test shadow.get_change
|
|
Test shadow.set_change
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(
|
|
self.run_function('shadow.set_change', [TEST_USER, '02/11/2011']))
|
|
self.assertEqual(self.run_function('shadow.get_change', [TEST_USER]),
|
|
'02/11/2011')
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.set_change', [NO_USER, '02/11/2012']),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_change', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_get_set_expire(self):
|
|
'''
|
|
Test shadow.get_expire
|
|
Test shadow.set_expire
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(
|
|
self.run_function('shadow.set_expire', [TEST_USER, '02/11/2011']))
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_expire', [TEST_USER]), '02/11/2011')
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.set_expire', [NO_USER, '02/11/2012']),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
self.assertEqual(
|
|
self.run_function('shadow.get_expire', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_del_password(self):
|
|
'''
|
|
Test shadow.del_password
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('shadow.del_password', [TEST_USER]))
|
|
self.assertEqual(
|
|
self.run_function('shadow.info', [TEST_USER])['passwd'], '*')
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.del_password', [NO_USER]),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|
|
|
|
@destructiveTest
|
|
def test_set_password(self):
|
|
'''
|
|
Test shadow.set_password
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(
|
|
self.run_function('shadow.set_password', [TEST_USER, 'Pa$$W0rd']))
|
|
|
|
# User does not exist
|
|
self.assertEqual(
|
|
self.run_function('shadow.set_password', [NO_USER, 'P@SSw0rd']),
|
|
'ERROR: User not found: {0}'.format(NO_USER))
|