converted Trigger to use ClientRunHooks instead of abusing Statistics; fix major security flaw in Trigger plugin

1 files changed, 37 insertions, 28 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Trigger.py b/src/lib/Bcfg2/Server/Plugins/Trigger.py
index b0d21545c..313a1bf03 100644
--- a/src/lib/Bcfg2/Server/Plugins/Trigger.py
+++ b/src/lib/Bcfg2/Server/Plugins/Trigger.py
@@ -1,43 +1,52 @@
 import os
+import pipes
 import Bcfg2.Server.Plugin
+from subprocess import Popen, PIPE
 
+class TriggerFile(Bcfg2.Server.Plugin.FileBacked):
+    def HandleEvent(self, event=None):
+        return
 
-def async_run(prog, args):
-    pid = os.fork()
-    if pid:
-        os.waitpid(pid, 0)
-    else:
-        dpid = os.fork()
-        if not dpid:
-            os.system(" ".join([prog] + args))
-        os._exit(0)
+    def __str__(self):
+        return "%s: %s" % (self.__class__.__name__, self.name)
 
 
 class Trigger(Bcfg2.Server.Plugin.Plugin,
-              Bcfg2.Server.Plugin.Statistics):
+              Bcfg2.Server.Plugin.ClientRunHooks,
+              Bcfg2.Server.Plugin.DirectoryBacked):
     """Trigger is a plugin that calls external scripts (on the server)."""
     name = 'Trigger'
     __author__ = 'bcfg-dev@mcs.anl.gov'
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Statistics.__init__(self)
-        try:
-            os.stat(self.data)
-        except:
-            self.logger.error("Trigger: spool directory %s does not exist; "
-                              "unloading" % self.data)
-            raise Bcfg2.Server.Plugin.PluginInitError
-
-    def process_statistics(self, metadata, _):
+        Bcfg2.Server.Plugin.ClientRunHooks.__init__(self)
+        Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data,
+                                                     self.core.fam)
+
+    def async_run(self, args):
+        pid = os.fork()
+        if pid:
+            os.waitpid(pid, 0)
+        else:
+            dpid = os.fork()
+            if not dpid:
+                self.debug_log("Running %s" % " ".join(pipes.quote(a)
+                                                       for a in args))
+                proc = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+                (out, err) = proc.communicate()
+                rv = proc.wait()
+                if rv != 0:
+                    self.logger.error("Trigger: Error running %s (%s): %s" %
+                                      (args[0], rv, err))
+                elif err:
+                    self.debug_log("Trigger: Error: %s" % err)
+            os._exit(0)
+
+
+    def end_client_run(self, metadata):
         args = [metadata.hostname, '-p', metadata.profile, '-g',
                 ':'.join([g for g in metadata.groups])]
-        for notifier in os.listdir(self.data):
-            if ((notifier[-1] == '~') or
-                (notifier[:2] == '.#') or
-                (notifier[-4:] == '.swp') or
-                (notifier in ['SCCS', '.svn', '4913'])):
-                continue
-            npath = self.data + '/' + notifier
-            self.logger.debug("Running %s %s" % (npath, " ".join(args)))
-            async_run(npath, args)
+        for notifier in self.entries.keys():
+            npath = os.path.join(self.data, notifier)
+            self.async_run([npath] + args)