Server/Core: drop privileges even if not running as daemon

1 files changed, 10 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Server/CherryPyCore.py b/src/lib/Bcfg2/Server/CherryPyCore.py
index d097fd08f..c1581679c 100644
--- a/src/lib/Bcfg2/Server/CherryPyCore.py
+++ b/src/lib/Bcfg2/Server/CherryPyCore.py
@@ -103,17 +103,21 @@ class Core(BaseCore):
         return cherrypy.serving.response.body
 
     def _daemonize(self):
-        """ Drop privileges with
-        :class:`cherrypy.process.plugins.DropPrivileges`, daemonize
-        with :class:`cherrypy.process.plugins.Daemonizer`, and write a
+        """ Drop privileges, daemonize
+        with :class:`cherrypy.process.plugins.Daemonizer` and write a
         PID file with :class:`cherrypy.process.plugins.PIDFile`. """
+        self._drop_privileges()
+        Daemonizer(cherrypy.engine).subscribe()
+        PIDFile(cherrypy.engine, self.setup['daemon']).subscribe()
+        return True
+
+    def _drop_privileges(self):
+        """ Drop privileges with
+        :class:`cherrypy.process.plugins.DropPrivileges` """
         DropPrivileges(cherrypy.engine,
                        uid=self.setup['daemon_uid'],
                        gid=self.setup['daemon_gid'],
                        umask=int(self.setup['umask'], 8)).subscribe()
-        Daemonizer(cherrypy.engine).subscribe()
-        PIDFile(cherrypy.engine, self.setup['daemon']).subscribe()
-        return True
 
     def _run(self):
         """ Start the server listening. """