mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +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.
188 lines
6.2 KiB
Python
188 lines
6.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import string
|
|
import random
|
|
|
|
# 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,
|
|
requires_system_grains
|
|
)
|
|
|
|
# Import Salt libs
|
|
import salt.utils.platform
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
|
|
|
|
|
|
@destructiveTest
|
|
@skipIf(not salt.utils.platform.is_linux(), 'These tests can only be run on linux')
|
|
@skip_if_not_root
|
|
class UseraddModuleTestLinux(ModuleCase):
|
|
|
|
def setUp(self):
|
|
super(UseraddModuleTestLinux, self).setUp()
|
|
os_grain = self.run_function('grains.item', ['kernel'])
|
|
if os_grain['kernel'] not in ('Linux', 'Darwin'):
|
|
self.skipTest(
|
|
'Test not applicable to \'{kernel}\' kernel'.format(
|
|
**os_grain
|
|
)
|
|
)
|
|
|
|
def __random_string(self, size=6):
|
|
return 'RS-' + ''.join(
|
|
random.choice(string.ascii_uppercase + string.digits)
|
|
for x in range(size)
|
|
)
|
|
|
|
@requires_system_grains
|
|
def test_groups_includes_primary(self, grains):
|
|
# Let's create a user, which usually creates the group matching the
|
|
# name
|
|
uname = self.__random_string()
|
|
if self.run_function('user.add', [uname]) is not True:
|
|
# Skip because creating is not what we're testing here
|
|
self.run_function('user.delete', [uname, True, True])
|
|
self.skipTest('Failed to create user')
|
|
|
|
try:
|
|
uinfo = self.run_function('user.info', [uname])
|
|
if grains['os_family'] in ('Suse',):
|
|
self.assertIn('users', uinfo['groups'])
|
|
else:
|
|
self.assertIn(uname, uinfo['groups'])
|
|
|
|
# This uid is available, store it
|
|
uid = uinfo['uid']
|
|
|
|
self.run_function('user.delete', [uname, True, True])
|
|
|
|
# Now, a weird group id
|
|
gname = self.__random_string()
|
|
if self.run_function('group.add', [gname]) is not True:
|
|
self.run_function('group.delete', [gname, True, True])
|
|
self.skipTest('Failed to create group')
|
|
|
|
ginfo = self.run_function('group.info', [gname])
|
|
|
|
# And create the user with that gid
|
|
if self.run_function('user.add', [uname, uid, ginfo['gid']]) is False:
|
|
# Skip because creating is not what we're testing here
|
|
self.run_function('user.delete', [uname, True, True])
|
|
self.skipTest('Failed to create user')
|
|
|
|
uinfo = self.run_function('user.info', [uname])
|
|
self.assertIn(gname, uinfo['groups'])
|
|
|
|
except AssertionError:
|
|
self.run_function('user.delete', [uname, True, True])
|
|
raise
|
|
|
|
def test_user_primary_group(self):
|
|
'''
|
|
Tests the primary_group function
|
|
'''
|
|
name = 'saltyuser'
|
|
|
|
# Create a user to test primary group function
|
|
if self.run_function('user.add', [name]) is not True:
|
|
self.run_function('user.delete', [name])
|
|
self.skipTest('Failed to create a user')
|
|
|
|
try:
|
|
# Test useradd.primary_group
|
|
primary_group = self.run_function('user.primary_group', [name])
|
|
uid_info = self.run_function('user.info', [name])
|
|
self.assertIn(primary_group, uid_info['groups'])
|
|
|
|
except:
|
|
self.run_function('user.delete', [name])
|
|
raise
|
|
|
|
|
|
@destructiveTest
|
|
@skipIf(not salt.utils.platform.is_windows(), 'These tests can only be run on Windows')
|
|
@skip_if_not_root
|
|
class UseraddModuleTestWindows(ModuleCase):
|
|
|
|
def __random_string(self, size=6):
|
|
return 'RS-' + ''.join(
|
|
random.choice(string.ascii_uppercase + string.digits)
|
|
for x in range(size))
|
|
|
|
def test_add_user(self):
|
|
'''
|
|
Test adding a user
|
|
'''
|
|
user_name = self.__random_string()
|
|
|
|
try:
|
|
if self.run_function('user.add', [user_name]) is False:
|
|
self.run_function('user.delete', [user_name, True, True])
|
|
self.skipTest('Failed to create user')
|
|
|
|
user_list = self.run_function('user.list_users')
|
|
self.assertIn(user_name, user_list)
|
|
|
|
except AssertionError:
|
|
raise
|
|
|
|
finally:
|
|
self.run_function('user.delete', [user_name, True, True])
|
|
|
|
def test_add_group(self):
|
|
'''
|
|
Test adding a user
|
|
'''
|
|
group_name = self.__random_string()
|
|
try:
|
|
if self.run_function('group.add', [group_name]) is False:
|
|
# Skip because creating is not what we're testing here
|
|
self.run_function('group.delete', [group_name, True, True])
|
|
self.skipTest('Failed to create group')
|
|
|
|
group_list = self.run_function('group.list_groups')
|
|
self.assertIn(group_name, group_list)
|
|
|
|
except AssertionError:
|
|
raise
|
|
|
|
finally:
|
|
self.run_function('group.delete', [group_name])
|
|
|
|
def test_add_user_to_group(self):
|
|
'''
|
|
Test adding a user to a group
|
|
'''
|
|
group_name = self.__random_string()
|
|
user_name = self.__random_string()
|
|
try:
|
|
# Let's create a group
|
|
if self.run_function(
|
|
'group.add', [group_name])['result'] is not True:
|
|
self.run_function('group.delete', [group_name, True, True])
|
|
self.skipTest('Failed to create group')
|
|
|
|
# And create the user as a member of that group
|
|
if self.run_function(
|
|
'user.add', [user_name], groups=group_name) is False:
|
|
self.run_function('user.delete', [user_name, True, True])
|
|
self.skipTest('Failed to create user')
|
|
|
|
user_info = self.run_function('user.info', [user_name])
|
|
self.assertIn(group_name, user_info['groups'])
|
|
|
|
except AssertionError:
|
|
raise
|
|
|
|
finally:
|
|
self.run_function('user.delete', [user_name, True, True])
|
|
self.run_function('group.delete', [group_name])
|