Merge branch '2017.7' into win_fix_inet_pton

salt/utils/verify.py

@@ -536,7 +536,14 @@ def win_verify_env(path, dirs, permissive=False, pki_dir='', skip_extra=False):
 
     # Make sure the file_roots is not set to something unsafe since permissions
     # on that directory are reset
-    if not salt.utils.path.safe_path(path=path):
+
+    # `salt.utils.path.safe_path` will consider anything inside `C:\Windows` to
+    # be unsafe. In some instances the test suite uses
+    # `C:\Windows\Temp\salt-tests-tmpdir\rootdir` as the file_roots. So, we need
+    # to consider anything in `C:\Windows\Temp` to be safe
+    system_root = os.environ.get('SystemRoot', r'C:\Windows')
+    allow_path = '\\'.join([system_root, 'TEMP'])
+    if not salt.utils.path.safe_path(path=path, allow_path=allow_path):
         raise CommandExecutionError(
             '`file_roots` set to a possibly unsafe location: {0}'.format(path)
         )

tests/unit/utils/test_parsers.py

@@ -5,6 +5,7 @@
 
 # Import python libs
 from __future__ import absolute_import
+import os
 
 # Import Salt Testing Libs
 from tests.support.unit import skipIf, TestCase
@@ -488,6 +489,31 @@ class LogSettingsParserTests(TestCase):
         # Check log file logger
         self.assertEqual(self.log_setup.log_level_logfile, log_level_logfile)
 
+    def test_log_created(self):
+        '''
+        Tests that log file is created
+        '''
+        args = self.args
+        log_file = self.log_file
+        log_file_name = self.logfile_config_setting_name
+        opts = self.default_config.copy()
+        opts.update({'log_file': log_file})
+        if log_file_name is not 'log_file':
+            opts.update({log_file_name:
+                         getattr(self, log_file_name)})
+
+        if log_file_name is 'key_logfile':
+            self.skipTest('salt-key creates log file outside of parse_args.')
+
+        parser = self.parser()
+        with patch(self.config_func, MagicMock(return_value=opts)):
+            parser.parse_args(args)
+
+        if log_file_name is 'log_file':
+            self.assertEqual(os.path.getsize(log_file), 0)
+        else:
+            self.assertEqual(os.path.getsize(getattr(self, log_file_name)), 0)
+
 
 @skipIf(NO_MOCK, NO_MOCK_REASON)
 @skipIf(salt.utils.is_windows(), 'Windows uses a logging listener')
@@ -589,6 +615,7 @@ class SyndicOptionParserTestCase(LogSettingsParserTests):
 
         # Log file
         self.log_file = '/tmp/salt_syndic_parser_test'
+        self.syndic_log_file = '/tmp/salt_syndic_log'
         # Function to patch
         self.config_func = 'salt.config.syndic_config'
 
@@ -678,6 +705,7 @@ class SaltKeyOptionParserTestCase(LogSettingsParserTests):
 
         # Log file
         self.log_file = '/tmp/salt_key_parser_test'
+        self.key_logfile = '/tmp/key_logfile'
         # Function to patch
         self.config_func = 'salt.config.master_config'
 
@@ -853,6 +881,7 @@ class SaltSSHOptionParserTestCase(LogSettingsParserTests):
 
         # Log file
         self.log_file = '/tmp/salt_ssh_parser_test'
+        self.ssh_log_file = '/tmp/ssh_logfile'
         # Function to patch
         self.config_func = 'salt.config.master_config'
 
@@ -919,6 +948,7 @@ class SPMParserTestCase(LogSettingsParserTests):
 
         # Log file
         self.log_file = '/tmp/spm_parser_test'
+        self.spm_logfile = '/tmp/spm_logfile'
         # Function to patch
         self.config_func = 'salt.config.spm_config'
 
@@ -952,6 +982,7 @@ class SaltAPIParserTestCase(LogSettingsParserTests):
 
         # Log file
         self.log_file = '/tmp/salt_api_parser_test'
+        self.api_logfile = '/tmp/api_logfile'
         # Function to patch
         self.config_func = 'salt.config.api_config'