Merge "Handle empty PATH environment variable"

openstack/common/rootwrap/filters.py

@@ -217,7 +217,8 @@ class KillFilter(CommandFilter):
 
         return (os.path.isabs(command) and
                 kill_command == os.path.basename(command) and
-                os.path.dirname(command) in os.environ['PATH'].split(':'))
+                os.path.dirname(command) in os.environ.get('PATH', ''
+                                                           ).split(':'))
 
 
 class ReadFileFilter(CommandFilter):

openstack/common/rootwrap/wrapper.py

@@ -46,8 +46,10 @@ class RootwrapConfig(object):
         if config.has_option("DEFAULT", "exec_dirs"):
             self.exec_dirs = config.get("DEFAULT", "exec_dirs").split(",")
         else:
+            self.exec_dirs = []
             # Use system PATH if exec_dirs is not specified
-            self.exec_dirs = os.environ["PATH"].split(':')
+            if "PATH" in os.environ:
+                self.exec_dirs = os.environ['PATH'].split(':')
 
         # syslog_log_facility
         if config.has_option("DEFAULT", "syslog_log_facility"):

tests/unit/test_rootwrap.py

@@ -178,8 +178,9 @@ class RootwrapTestCase(utils.BaseTestCase):
             # Filter shouldn't be able to find binary in $PATH, so fail
             with fixtures.EnvironmentVariable("PATH", "/foo:/bar"):
                 self.assertFalse(f.match(usercmd))
-            pass
-
+            # ensure that unset $PATH is not causing an exception
+            with fixtures.EnvironmentVariable("PATH"):
+                self.assertFalse(f.match(usercmd))
         finally:
             # Terminate the "cat" process and wait for it to finish
             p.terminate()
@@ -314,6 +315,11 @@ class RootwrapTestCase(utils.BaseTestCase):
         config = wrapper.RootwrapConfig(raw)
         self.assertEqual(config.filters_path, ['/a', '/b'])
         self.assertEqual(config.exec_dirs, os.environ["PATH"].split(':'))
+
+        with fixtures.EnvironmentVariable("PATH"):
+            c = wrapper.RootwrapConfig(raw)
+            self.assertEqual(c.exec_dirs, [])
+
         self.assertFalse(config.use_syslog)
         self.assertEqual(config.syslog_log_facility,
                          logging.handlers.SysLogHandler.LOG_SYSLOG)