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.
191 lines
7.5 KiB
Python
191 lines
7.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Mike Place <mp@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import tempfile
|
|
|
|
# Import Salt Testing libs
|
|
from tests.integration import AdaptedConfigurationTestCaseMixin
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.paths import FILES, TMP, TMP_STATE_TREE
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
|
|
|
|
# Import Salt libs
|
|
import salt.fileserver.roots
|
|
import salt.fileclient
|
|
import salt.utils.files
|
|
import salt.utils.platform
|
|
|
|
try:
|
|
import win32file
|
|
except ImportError:
|
|
pass
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
self.tmp_cachedir = tempfile.mkdtemp(dir=TMP)
|
|
self.opts = self.get_temp_config('master')
|
|
self.opts['cachedir'] = self.tmp_cachedir
|
|
empty_dir = os.path.join(TMP_STATE_TREE, 'empty_dir')
|
|
if not os.path.isdir(empty_dir):
|
|
os.makedirs(empty_dir)
|
|
return {salt.fileserver.roots: {'__opts__': self.opts}}
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
'''
|
|
Create special file_roots for symlink test on Windows
|
|
'''
|
|
if salt.utils.platform.is_windows():
|
|
root_dir = tempfile.mkdtemp(dir=TMP)
|
|
source_sym = os.path.join(root_dir, 'source_sym')
|
|
with salt.utils.files.fopen(source_sym, 'w') as fp_:
|
|
fp_.write('hello world!\n')
|
|
cwd = os.getcwd()
|
|
try:
|
|
os.chdir(root_dir)
|
|
win32file.CreateSymbolicLink('dest_sym', 'source_sym', 0)
|
|
finally:
|
|
os.chdir(cwd)
|
|
cls.test_symlink_list_file_roots = {'base': [root_dir]}
|
|
else:
|
|
cls.test_symlink_list_file_roots = None
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
'''
|
|
Remove special file_roots for symlink test
|
|
'''
|
|
if salt.utils.platform.is_windows():
|
|
try:
|
|
salt.utils.files.rm_rf(cls.test_symlink_list_file_roots['base'][0])
|
|
except OSError:
|
|
pass
|
|
|
|
def tearDown(self):
|
|
del self.opts
|
|
|
|
def test_file_list(self):
|
|
ret = salt.fileserver.roots.file_list({'saltenv': 'base'})
|
|
self.assertIn('testfile', ret)
|
|
|
|
def test_find_file(self):
|
|
ret = salt.fileserver.roots.find_file('testfile')
|
|
self.assertEqual('testfile', ret['rel'])
|
|
|
|
full_path_to_file = os.path.join(FILES, 'file', 'base', 'testfile')
|
|
self.assertEqual(full_path_to_file, ret['path'])
|
|
|
|
def test_serve_file(self):
|
|
with patch.dict(salt.fileserver.roots.__opts__, {'file_buffer_size': 262144}):
|
|
load = {'saltenv': 'base',
|
|
'path': os.path.join(FILES, 'file', 'base', 'testfile'),
|
|
'loc': 0
|
|
}
|
|
fnd = {'path': os.path.join(FILES, 'file', 'base', 'testfile'),
|
|
'rel': 'testfile'}
|
|
ret = salt.fileserver.roots.serve_file(load, fnd)
|
|
|
|
data = 'Scene 24\n\n \n OLD MAN: Ah, hee he he ha!\n ' \
|
|
'ARTHUR: And this enchanter of whom you speak, he ' \
|
|
'has seen the grail?\n OLD MAN: Ha ha he he he ' \
|
|
'he!\n ARTHUR: Where does he live? Old man, where ' \
|
|
'does he live?\n OLD MAN: He knows of a cave, a ' \
|
|
'cave which no man has entered.\n ARTHUR: And the ' \
|
|
'Grail... The Grail is there?\n OLD MAN: Very much ' \
|
|
'danger, for beyond the cave lies the Gorge\n ' \
|
|
'of Eternal Peril, which no man has ever crossed.\n ' \
|
|
'ARTHUR: But the Grail! Where is the Grail!?\n ' \
|
|
'OLD MAN: Seek you the Bridge of Death.\n ARTHUR: ' \
|
|
'The Bridge of Death, which leads to the Grail?\n ' \
|
|
'OLD MAN: Hee hee ha ha!\n\n'
|
|
if salt.utils.platform.is_windows():
|
|
data = 'Scene 24\r\n\r\n \r\n OLD MAN: Ah, hee he he ' \
|
|
'ha!\r\n ARTHUR: And this enchanter of whom you ' \
|
|
'speak, he has seen the grail?\r\n OLD MAN: Ha ha ' \
|
|
'he he he he!\r\n ARTHUR: Where does he live? Old ' \
|
|
'man, where does he live?\r\n OLD MAN: He knows of ' \
|
|
'a cave, a cave which no man has entered.\r\n ' \
|
|
'ARTHUR: And the Grail... The Grail is there?\r\n ' \
|
|
'OLD MAN: Very much danger, for beyond the cave lies ' \
|
|
'the Gorge\r\n of Eternal Peril, which no man ' \
|
|
'has ever crossed.\r\n ARTHUR: But the Grail! ' \
|
|
'Where is the Grail!?\r\n OLD MAN: Seek you the ' \
|
|
'Bridge of Death.\r\n ARTHUR: The Bridge of Death, ' \
|
|
'which leads to the Grail?\r\n OLD MAN: Hee hee ha ' \
|
|
'ha!\r\n\r\n'
|
|
|
|
self.assertDictEqual(
|
|
ret,
|
|
{'data': data,
|
|
'dest': 'testfile'})
|
|
|
|
@skipIf(True, "Update test not yet implemented")
|
|
def test_update(self):
|
|
pass
|
|
|
|
def test_file_hash(self):
|
|
load = {
|
|
'saltenv': 'base',
|
|
'path': os.path.join(FILES, 'file', 'base', 'testfile'),
|
|
}
|
|
fnd = {
|
|
'path': os.path.join(FILES, 'file', 'base', 'testfile'),
|
|
'rel': 'testfile'
|
|
}
|
|
ret = salt.fileserver.roots.file_hash(load, fnd)
|
|
|
|
# Hashes are different in Windows. May be how git translates line
|
|
# endings
|
|
hsum = 'baba5791276eb99a7cc498fb1acfbc3b4bd96d24cfe984b4ed6b5be2418731df'
|
|
if salt.utils.platform.is_windows():
|
|
hsum = '754aa260e1f3e70f43aaf92149c7d1bad37f708c53304c37660e628d7553f687'
|
|
|
|
self.assertDictEqual(
|
|
ret,
|
|
{
|
|
'hsum': hsum,
|
|
'hash_type': 'sha256'
|
|
}
|
|
)
|
|
|
|
def test_file_list_emptydirs(self):
|
|
ret = salt.fileserver.roots.file_list_emptydirs({'saltenv': 'base'})
|
|
self.assertIn('empty_dir', ret)
|
|
|
|
def test_dir_list(self):
|
|
ret = salt.fileserver.roots.dir_list({'saltenv': 'base'})
|
|
self.assertIn('empty_dir', ret)
|
|
|
|
def test_symlink_list(self):
|
|
if self.test_symlink_list_file_roots:
|
|
self.opts['file_roots'] = self.test_symlink_list_file_roots
|
|
ret = salt.fileserver.roots.symlink_list({'saltenv': 'base'})
|
|
self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
|
|
|
|
|
|
class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
|
|
|
|
def test_limit_traversal(self):
|
|
'''
|
|
1) Set up a deep directory structure
|
|
2) Enable the configuration option for 'limit_directory_traversal'
|
|
3) Ensure that we can find SLS files in a directory so long as there is an SLS file in a directory above.
|
|
4) Ensure that we cannot find an SLS file in a directory that does not have an SLS file in a directory above.
|
|
'''
|
|
file_client_opts = self.get_temp_config('master')
|
|
file_client_opts['fileserver_limit_traversal'] = True
|
|
|
|
ret = salt.fileclient.Client(file_client_opts).list_states('base')
|
|
self.assertIn('test_deep.test', ret)
|
|
self.assertIn('test_deep.a.test', ret)
|
|
self.assertNotIn('test_deep.b.2.test', ret)
|