mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +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.
72 lines
1.8 KiB
Python
72 lines
1.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Erik Johnson <erik@saltstack.com>`
|
|
'''
|
|
|
|
# Import Pytohn libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
import salt.utils.platform
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import TestCase, skipIf
|
|
|
|
# Import salt libs
|
|
try:
|
|
import salt.modules.shadow as shadow
|
|
HAS_SHADOW = True
|
|
except ImportError:
|
|
HAS_SHADOW = False
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
_PASSWORD = 'lamepassword'
|
|
|
|
# Not testing blowfish as it is not available on most Linux distros
|
|
_HASHES = dict(
|
|
md5=dict(
|
|
pw_salt='TgIp9OTu',
|
|
pw_hash='$1$TgIp9OTu$.d0FFP6jVi5ANoQmk6GpM1'
|
|
),
|
|
sha256=dict(
|
|
pw_salt='3vINbSrC',
|
|
pw_hash='$5$3vINbSrC$hH8A04jAY3bG123yU4FQ0wvP678QDTvWBhHHFbz6j0D'
|
|
),
|
|
sha512=dict(
|
|
pw_salt='PiGA3V2o',
|
|
pw_hash='$6$PiGA3V2o$/PrntRYufz49bRV/V5Eb1V6DdHaS65LB0fu73Tp/xxmDFr6HWJKptY2TvHRDViXZugWpnAcOnrbORpOgZUGTn.'
|
|
),
|
|
)
|
|
|
|
|
|
@skipIf(not salt.utils.platform.is_linux(), 'minion is not Linux')
|
|
class LinuxShadowTest(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
return {shadow: {}}
|
|
|
|
def test_gen_password(self):
|
|
'''
|
|
Test shadow.gen_password
|
|
'''
|
|
self.assertTrue(HAS_SHADOW)
|
|
for algorithm, hash_info in six.iteritems(_HASHES):
|
|
self.assertEqual(
|
|
shadow.gen_password(
|
|
_PASSWORD,
|
|
crypt_salt=hash_info['pw_salt'],
|
|
algorithm=algorithm
|
|
),
|
|
hash_info['pw_hash']
|
|
)
|
|
|
|
# 'list_users' function tests: 1
|
|
|
|
def test_list_users(self):
|
|
'''
|
|
Test if it returns a list of all users
|
|
'''
|
|
self.assertTrue(shadow.list_users())
|