made SSLCA respect info.xml

3 files changed, 55 insertions, 45 deletions

diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index d51a13804..fa5e3ca9d 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -50,6 +50,19 @@ info_regex = re.compile( \
     'perms:(\s)*(?P<perms>\w+)|' +
     'sensitive:(\s)*(?P<sensitive>\S+)|')
 
+def bind_info(entry, metadata, infoxml=None, default=default_file_metadata):
+    for attr, val in list(default.items()):
+        entry.set(attr, val)
+    if infoxml:
+        mdata = dict()
+        infoxml.pnode.Match(metadata, mdata, entry=entry)
+        if 'Info' not in mdata:
+            msg = "Failed to set metadata for file %s" % entry.get('name')
+            logger.error(msg)
+            raise PluginExecutionError(msg)
+        for attr, val in list(mdata['Info'][None].items()):
+            entry.set(attr, val)
+
 
 class PluginInitError(Exception):
     """Error raised in cases of Plugin initialization errors."""
@@ -1074,18 +1087,7 @@ class EntrySet:
         return cmp(x.specific.prio, y.specific.prio)
 
     def bind_info_to_entry(self, entry, metadata):
-        # first set defaults from global metadata/:info
-        for key in self.metadata:
-            entry.set(key, self.metadata[key])
-        if self.infoxml:
-            mdata = {}
-            self.infoxml.pnode.Match(metadata, mdata, entry=entry)
-            if 'Info' not in mdata:
-                logger.error("Failed to set metadata for file %s" % \
-                             (entry.get('name')))
-                raise PluginExecutionError
-            [entry.attrib.__setitem__(key, value) \
-             for (key, value) in list(mdata['Info'][None].items())]
+        bind_info(entry, metadata, infoxml=self.infoxml, default=self.metadata)
 
     def bind_entry(self, entry, metadata):
         """Return the appropriate interpreted template from the set of available templates."""
diff --git a/src/lib/Server/Plugins/SSLCA.py b/src/lib/Server/Plugins/SSLCA.py
index e5bc38fba..97644ebda 100644
--- a/src/lib/Server/Plugins/SSLCA.py
+++ b/src/lib/Server/Plugins/SSLCA.py
@@ -23,6 +23,10 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
     cert_specs = {}
     CAs = {}
 
+    def __init__(self, core, datastore):
+        Bcfg2.Server.Plugin.GroupSpool.__init__(self, core, datastore)
+        self.infoxml = dict()
+
     def HandleEvent(self, event=None):
         """
         Updates which files this plugin handles based upon filesystem events.
@@ -38,7 +42,7 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
         else:
             ident = self.handles[event.requestID][:-1]
 
-        fname = "".join([ident, '/', event.filename])
+        fname = os.path.join(ident, event.filename)
 
         if event.filename.endswith('.xml'):
             if action in ['exists', 'created', 'changed']:
@@ -70,6 +74,10 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
                     cp.read(self.core.cfile)
                     self.CAs[ca] = dict(cp.items('sslca_' + ca))
                     self.Entries['Path'][ident] = self.get_cert
+                elif event.filename.endswith("info.xml"):
+                    self.infoxml[ident] = Bcfg2.Server.Plugin.InfoXML(epath,
+                                                                      noprio=True)
+                    self.infoxml[ident].HandleEvent(event)
             if action == 'deleted':
                 if ident in self.Entries['Path']:
                     del self.Entries['Path'][ident]
@@ -93,28 +101,26 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
         either grabs a prexisting key hostfile, or triggers the generation
         of a new key if one doesn't exist.
         """
-        # set path type and permissions, otherwise bcfg2 won't bind the file
-        permdata = {'owner': 'root',
-                    'group': 'root',
-                    'type': 'file',
-                    'perms': '644'}
-        [entry.attrib.__setitem__(key, permdata[key]) for key in permdata]
-
         # check if we already have a hostfile, or need to generate a new key
         # TODO: verify key fits the specs
         path = entry.get('name')
-        filename = "".join([path, '/', path.rsplit('/', 1)[1],
-                            '.H_', metadata.hostname])
+        filename = os.path.join(path, "%s.H_%s" % (os.path.basename(path),
+                                                   metadata.hostname))
         if filename not in list(self.entries.keys()):
             key = self.build_key(filename, entry, metadata)
             open(self.data + filename, 'w').write(key)
             entry.text = key
-            self.entries[filename] = self.__child__("%s%s" % (self.data,
-                                                              filename))
+            self.entries[filename] = self.__child__(self.data + filename)
             self.entries[filename].HandleEvent()
         else:
             entry.text = self.entries[filename].data
 
+        if path in self.infoxml:
+            Bcfg2.Server.Plugin.bind_info(entry, metadata,
+                                          infoxml=self.infoxml[path])
+        else:
+            Bcfg2.Server.Plugin.bind_info(entry, metadata)
+
     def build_key(self, filename, entry, metadata):
         """
         generates a new key according the the specification
@@ -133,39 +139,36 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
         either grabs a prexisting cert hostfile, or triggers the generation
         of a new cert if one doesn't exist.
         """
-        # set path type and permissions, otherwise bcfg2 won't bind the file
-        permdata = {'owner': 'root',
-                    'group': 'root',
-                    'type': 'file',
-                    'perms': '644'}
-        [entry.attrib.__setitem__(key, permdata[key]) for key in permdata]
-
         path = entry.get('name')
-        filename = "".join([path, '/', path.rsplit('/', 1)[1],
-                            '.H_', metadata.hostname])
+        filename = os.path.join(path, "%s.H_%s" % (os.path.basename(path),
+                                                   metadata.hostname))
 
         # first - ensure we have a key to work with
         key = self.cert_specs[entry.get('name')].get('key')
-        key_filename = "".join([key, '/', key.rsplit('/', 1)[1],
-                                '.H_', metadata.hostname])
+        key_filename = os.path.join(key, "%s.H_%s" % (os.path.basename(key),
+                                                      metadata.hostname))
         if key_filename not in self.entries:
             e = lxml.etree.Element('Path')
-            e.attrib['name'] = key
+            e.set('name', key)
             self.core.Bind(e, metadata)
 
         # check if we have a valid hostfile
-        if filename in list(self.entries.keys()) and self.verify_cert(filename,
-                                                                      key_filename,
-                                                                      entry):
+        if (filename in list(self.entries.keys()) and 
+            self.verify_cert(filename, key_filename, entry)):
             entry.text = self.entries[filename].data
         else:
             cert = self.build_cert(key_filename, entry, metadata)
             open(self.data + filename, 'w').write(cert)
-            self.entries[filename] = self.__child__("%s%s" % (self.data,
-                                                              filename))
+            self.entries[filename] = self.__child__(self.data + filename)
             self.entries[filename].HandleEvent()
             entry.text = cert
 
+        if path in self.infoxml:
+            Bcfg2.Server.Plugin.bind_info(entry, metadata,
+                                          infoxml=self.infoxml[path])
+        else:
+            Bcfg2.Server.Plugin.bind_info(entry, metadata)
+
     def verify_cert(self, filename, key_filename, entry):
         if self.verify_cert_against_ca(filename, entry):
             if self.verify_cert_against_key(filename, key_filename):
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index e09b7ed87..70e327ef3 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -108,11 +108,13 @@ def displayTrace(trace, num=80, sort=('time', 'calls')):
 
 class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core):
     """Main class for bcfg2-info."""
-    def __init__(self, repo, plgs, passwd, encoding, event_debug, filemonitor='default'):
+    def __init__(self, repo, plgs, passwd, encoding, event_debug,
+                 cfile='/etc/bcfg2.conf', filemonitor='default'):
         cmd.Cmd.__init__(self)
         try:
             Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd,
-                                            encoding, filemonitor=filemonitor)
+                                            encoding, cfile=cfile,
+                                            filemonitor=filemonitor)
             if event_debug:
                 self.fam.debug = True
         except Bcfg2.Server.Core.CoreInitError:
@@ -590,12 +592,15 @@ if __name__ == '__main__':
         prof = profile.Profile()
         loop = prof.runcall(infoCore, setup['repo'], setup['plugins'],
                             setup['password'], setup['encoding'],
-                            setup['event debug'], setup['filemonitor'])
+                            setup['event debug'], cfile=setup['configfile'],
+                            filemonitor=setup['filemonitor'])
         displayTrace(prof)
     else:
         if setup['profile']:
             print("Profiling functionality not available.")
         loop = infoCore(setup['repo'], setup['plugins'], setup['password'],
-                        setup['encoding'], setup['event debug'], setup['filemonitor'])
+                        setup['encoding'], setup['event debug'],
+                        cfile=setup['configfile'],
+                        filemonitor=setup['filemonitor'])
 
     loop.Run(setup['args'])