fixed xincludes to properly handle includes-in-includes, includes that aren't top-level, and other misc. stuff

3 files changed, 47 insertions, 23 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index 3cdfdbb41..d284ffe35 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -592,6 +592,29 @@ class SingleXMLFileBacked(XMLFileBacked):
         self.fam = fam
         self.fam.AddMonitor(filename, self)
 
+    def _follow_xincludes(self, fname=None, xdata=None):
+        ''' follow xincludes, adding included files to fam and to
+        self.extras '''
+        if xdata is None:
+            if fname is None:
+                xdata = self.xdata.getroottree()
+            else:
+                xdata = lxml.etree.parse(fname)
+        included = [ent.get('href')
+                    for ent in xdata.findall('//{http://www.w3.org/2001/XInclude}include')]
+        for name in included:
+            if name not in self.extras:
+                if name.startswith("/"):
+                    fpath = name
+                else:
+                    fpath = os.path.join(os.path.dirname(self.name), name)
+                self.add_monitor(fpath, name)
+                self._follow_xincludes(fname=fpath)
+
+    def add_monitor(self, fpath, fname):
+        self.fam.AddMonitor(fpath, self)
+        self.extras.append(fname)
+
     def Index(self):
         """Build local data structures."""
         try:
@@ -601,22 +624,14 @@ class SingleXMLFileBacked(XMLFileBacked):
             logger.error("Failed to parse %s: %s" % (self.name, err))
             raise Bcfg2.Server.Plugin.PluginInitError
 
-        included = [ent.get('href')
-                    for ent in self.xdata.findall('./{http://www.w3.org/2001/XInclude}include')]
-        if included:
-            for name in included:
-                if name not in self.extras:
-                    self.fam.AddMonitor(os.path.join(os.path.dirname(self.name),
-                                                     name),
-                                        self)
-                    self.extras.append(name)
+        self._follow_xincludes()
+        if self.extras:
             try:
                 self.xdata.getroottree().xinclude()
             except lxml.etree.XIncludeError:
                 err = sys.exc_info()[1]
                 logger.error("XInclude failed on %s: %s" % (self.name, err))
 
-
         self.entries = self.xdata.getchildren()
         if self.__identifier__ is not None:
             self.label = self.xdata.attrib[self.__identifier__]
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index f39993496..5ba4de12f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -36,13 +36,16 @@ class MetadataRuntimeError(Exception):
     pass
 
 
-class XMLMetadataConfig(object):
+class XMLMetadataConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked):
     """Handles xml config files and all XInclude statements"""
     def __init__(self, metadata, watch_clients, basefile):
+        Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self,
+                                                         os.path.join(metadata.data,
+                                                                      basefile),
+                                                         metadata.core.fam)
         self.metadata = metadata
         self.basefile = basefile
         self.should_monitor = watch_clients
-        self.extras = []
         self.data = None
         self.basedata = None
         self.basedir = metadata.data
@@ -62,11 +65,10 @@ class XMLMetadataConfig(object):
             raise MetadataRuntimeError
         return self.basedata
 
-    def add_monitor(self, fname):
+    def add_monitor(self, fpath, fname):
         """Add a fam monitor for an included file"""
         if self.should_monitor:
-            self.metadata.core.fam.AddMonitor(os.path.join(self.basedir, fname),
-                                              self.metadata)
+            self.metadata.core.fam.AddMonitor(fpath, self.metadata)
             self.extras.append(fname)
 
     def load_xml(self):
@@ -76,13 +78,10 @@ class XMLMetadataConfig(object):
         except lxml.etree.XMLSyntaxError:
             self.logger.error('Failed to parse %s' % self.basefile)
             return
+        self.extras = []
         self.basedata = copy.copy(xdata)
-        included = [ent.get('href') for ent in \
-                    xdata.findall('./{http://www.w3.org/2001/XInclude}include')]
-        if included:
-            for name in included:
-                if name not in self.extras:
-                    self.add_monitor(name)
+        self._follow_xincludes(xdata=xdata)
+        if self.extras:
             try:
                 xdata.xinclude()
             except lxml.etree.XIncludeError:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index 3511cfc3d..8d0067b6a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -44,8 +44,18 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
 
     def HandleEvent(self, event=None):
         Bcfg2.Server.Plugin.SingleXMLFileBacked.HandleEvent(self, event=event)
-        if event.filename != self.name:
-            self.parsed.add(os.path.basename(event.filename))
+        if event and event.filename != self.name:
+            for fname in self.extras:
+                fpath = None
+                if fname.startswith("/"):
+                    fpath = os.path.abspath(fname)
+                else:
+                    fpath = \
+                        os.path.abspath(os.path.join(os.path.dirname(self.name),
+                                                                     fname))
+                if fpath == os.path.abspath(event.filename):
+                    self.parsed.add(fname)
+                    break
 
         if sorted(list(self.parsed)) == sorted(self.extras):
             self.logger.info("Reloading Packages plugin")