merged maint

14 files changed, 68 insertions, 48 deletions

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 8482925b7..d42c5ad4f 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -16,6 +16,7 @@ except ImportError:
 
 from Bcfg2.Component import Component, exposed
 from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
+import Bcfg2.Server
 import Bcfg2.Server.FileMonitor
 import Bcfg2.Server.Plugins.Metadata
 # Compatibility imports
@@ -423,7 +424,8 @@ class Core(Component):
         # clear dynamic groups
         self.metadata.cgroups[meta.hostname] = []
         try:
-            xpdata = lxml.etree.XML(probedata.encode('utf-8'))
+            xpdata = lxml.etree.XML(probedata.encode('utf-8'),
+                                    parser=Bcfg2.Server.XMLParser)
         except:
             self.logger.error("Failed to parse probe data from client %s" % \
                               (address[0]))
@@ -472,7 +474,8 @@ class Core(Component):
     @exposed
     def RecvStats(self, address, stats):
         """Act on statistics upload."""
-        sdata = lxml.etree.XML(stats.encode('utf-8'))
+        sdata = lxml.etree.XML(stats.encode('utf-8'),
+                               parser=Bcfg2.Server.XMLParser)
         client = self.metadata.resolve_client(address)
         self.process_statistics(client, sdata)
         return "<ok/>"
diff --git a/src/lib/Bcfg2/Server/Lint/Deltas.py b/src/lib/Bcfg2/Server/Lint/Deltas.py
deleted file mode 100644
index 114f2e348..000000000
--- a/src/lib/Bcfg2/Server/Lint/Deltas.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import Bcfg2.Server.Lint
-from Bcfg2.Server.Plugins.Cfg import CfgFilter
-
-class Deltas(Bcfg2.Server.Lint.ServerPlugin):
-    """ Warn about usage of .cat and .diff files """
-
-    def Run(self):
-        """ run plugin """
-        if 'Cfg' in self.core.plugins:
-            cfg = self.core.plugins['Cfg']
-            for basename, entry in list(cfg.entries.items()):
-                self.check_entry(basename, entry)
-
-    @classmethod
-    def Errors(cls):
-        return {"cat-file-used":"warning",
-                "diff-file-used":"warning"}
-
-    def check_entry(self, basename, entry):
-        for fname, processor in entry.entries.items():
-            if self.HandlesFile(fname) and isinstance(processor, CfgFilter):
-                extension = fname.split(".")[-1]
-                self.LintError("%s-file-used" % extension,
-                               "%s file used on %s: %s" %
-                               (extension, basename, fname))
diff --git a/src/lib/Bcfg2/Server/Plugins/BB.py b/src/lib/Bcfg2/Server/Plugins/BB.py
index c015ec47c..bd518ad19 100644
--- a/src/lib/Bcfg2/Server/Plugins/BB.py
+++ b/src/lib/Bcfg2/Server/Plugins/BB.py
@@ -1,4 +1,5 @@
 import lxml.etree
+import Bcfg2.Server
 import Bcfg2.Server.Plugin
 import glob
 import os
@@ -16,7 +17,8 @@ class BBfile(Bcfg2.Server.Plugin.XMLFileBacked):
         """Build data into an xml object."""
 
         try:
-            self.data = lxml.etree.XML(self.data)
+            self.data = lxml.etree.XML(self.data,
+                                       parser=Bcfg2.Server.XMLParser)
         except lxml.etree.XMLSyntaxError:
             Bcfg2.Server.Plugin.logger.error("Failed to parse %s" % self.name)
             return
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index ccb99481e..cbc452608 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -6,7 +6,7 @@ import os
 import os.path
 import re
 import sys
-
+import Bcfg2.Server
 import Bcfg2.Server.Plugin
 
 try:
@@ -51,7 +51,8 @@ class Bundler(Bcfg2.Server.Plugin.Plugin,
             raise Bcfg2.Server.Plugin.PluginInitError
 
     def template_dispatch(self, name):
-        bundle = lxml.etree.parse(name)
+        bundle = lxml.etree.parse(name,
+                                  parser=Bcfg2.Server.XMLParser)
         nsmap = bundle.getroot().nsmap
         if name.endswith('.xml'):
             if have_genshi and \
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
index 5beec7be0..556965fca 100644
--- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py
+++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
@@ -10,6 +10,7 @@ import errno
 import binascii
 import lxml.etree
 import Bcfg2.Options
+import Bcfg2.Server
 import Bcfg2.Server.Plugin
 
 probecode = """#!/usr/bin/env python
@@ -102,7 +103,9 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin,
                                   (data.get('name'), metadata.hostname))
             else:
                 try:
-                    self.write_data(lxml.etree.XML(data.text), metadata)
+                    self.write_data(lxml.etree.XML(data.text,
+                                                   parser=Bcfg2.Server.XMLParser),
+                                    metadata)
                 except lxml.etree.XMLSyntaxError:
                     # if we didn't get XML back from the probe, assume
                     # it's an error message
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 970126b80..0cb4dc087 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -6,11 +6,10 @@ import copy
 import fcntl
 import lxml.etree
 import os
-import os.path
 import socket
 import sys
 import time
-
+import Bcfg2.Server
 import Bcfg2.Server.FileMonitor
 import Bcfg2.Server.Plugin
 
@@ -74,7 +73,8 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked):
     def load_xml(self):
         """Load changes from XML"""
         try:
-            xdata = lxml.etree.parse(os.path.join(self.basedir, self.basefile))
+            xdata = lxml.etree.parse(os.path.join(self.basedir, self.basefile),
+                                     parser=Bcfg2.Server.XMLParser)
         except lxml.etree.XMLSyntaxError:
             self.logger.error('Failed to parse %s' % self.basefile)
             return
@@ -145,7 +145,8 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked):
             for included in self.extras:
                 try:
                     xdata = lxml.etree.parse(os.path.join(self.basedir,
-                                                          included))
+                                                          included),
+                                             parser=Bcfg2.Server.XMLParser)
                     cli = xdata.xpath(xpath)
                     if len(cli) > 0:
                         return {'filename': os.path.join(self.basedir,
@@ -282,7 +283,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
 
     def get_groups(self):
         '''return groups xml tree'''
-        groups_tree = lxml.etree.parse(os.path.join(self.data, "groups.xml"))
+        groups_tree = lxml.etree.parse(os.path.join(self.data, "groups.xml"),
+                                       parser=Bcfg2.Server.XMLParser)
         root = groups_tree.getroot()
         return root
 
@@ -792,7 +794,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
         def include_group(group):
             return not only_client or group in clientmeta.groups
 
-        groups_tree = lxml.etree.parse(os.path.join(self.data, "groups.xml"))
+        groups_tree = lxml.etree.parse(os.path.join(self.data, "groups.xml"),
+                                       parser=Bcfg2.Server.XMLParser)
         try:
             groups_tree.xinclude()
         except lxml.etree.XIncludeError:
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
index 4dbd57d16..d132b0ff4 100644
--- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
+++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
@@ -7,7 +7,7 @@ import glob
 import socket
 import logging
 import lxml.etree
-
+import Bcfg2.Server
 import Bcfg2.Server.Plugin
 
 LOGGER = logging.getLogger('Bcfg2.Plugins.NagiosGen')
@@ -84,7 +84,8 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin,
             LOGGER.warn("Parsing deprecated NagiosGen/parents.xml. "
                         "Update to the new-style config with "
                         "nagiosgen-convert.py.")
-            parents = lxml.etree.parse(pfile)
+            parents = lxml.etree.parse(pfile,
+                                       parser=Bcfg2.Server.XMLParser)
             for el in parents.xpath("//Depend[@name='%s']" % metadata.hostname):
                 if 'parent' in xtra:
                     xtra['parent'] += "," + el.get("on")
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index 7796b9e34..a6924b5d0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -107,3 +107,6 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
 
     def __str__(self):
         return "PackagesSources: %s" % str(self.entries)
+
+    def __len__(self):
+        return len(self.entries)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 53344e200..effec1c0e 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -105,10 +105,24 @@ class YumCollection(Collection):
         if has_pulp and self.has_pulp_sources:
             _setup_pulp(self.setup)
 
+        self._helper = None
+
     @property
     def helper(self):
-        return self.setup.cfp.get("packages:yum", "helper",
-                                  default="/usr/sbin/bcfg2-yum-helper")
+        try:
+            return self.config.get("yum", "helper")
+        except:
+            pass
+
+        if not self._helper:
+            # first see if bcfg2-yum-helper is in PATH
+            try:
+                Popen(['bcfg2-yum-helper'],
+                      stdin=PIPE, stdout=PIPE, stderr=PIPE).wait()
+                self._helper = 'bcfg2-yum-helper'
+            except OSError:
+                self._helper = "/usr/sbin/bcfg2-yum-helper"
+        return self._helper
 
     @property
     def use_yum(self):
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index d789a6d39..72913a60a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -45,6 +45,10 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
 
     @property
     def disableResolver(self):
+        if self.disableMetaData:
+            # disabling metadata without disabling the resolver Breaks
+            # Things
+            return True
         try:
             return not self.core.setup.cfp.getboolean("packages", "resolver")
         except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index af908eee8..22cacde55 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -2,6 +2,8 @@ import time
 import lxml.etree
 import operator
 import re
+import os
+import Bcfg2.Server
 
 try:
     import json
@@ -93,7 +95,8 @@ class ProbeData(object):
     def xdata(self):
         if self._xdata is None:
             try:
-                self._xdata = lxml.etree.XML(self.data)
+                self._xdata = lxml.etree.XML(self.data,
+                                             parser=Bcfg2.Server.XMLParser)
             except lxml.etree.XMLSyntaxError:
                 pass
         return self._xdata
@@ -220,7 +223,8 @@ class Probes(Bcfg2.Server.Plugin.Plugin,
 
     def load_data(self):
         try:
-            data = lxml.etree.parse(self.data + '/probed.xml').getroot()
+            data = lxml.etree.parse(os.path.join(self.data, 'probed.xml'),
+                                    parser=Bcfg2.Server.XMLParser).getroot()
         except:
             self.logger.error("Failed to read file probed.xml")
             return
diff --git a/src/lib/Bcfg2/Server/Plugins/SGenshi.py b/src/lib/Bcfg2/Server/Plugins/SGenshi.py
index 0ba08125e..12c125c62 100644
--- a/src/lib/Bcfg2/Server/Plugins/SGenshi.py
+++ b/src/lib/Bcfg2/Server/Plugins/SGenshi.py
@@ -7,7 +7,7 @@ import logging
 import copy
 import sys
 import os.path
-
+import Bcfg2.Server
 import Bcfg2.Server.Plugin
 import Bcfg2.Server.Plugins.TGenshi
 
@@ -28,7 +28,8 @@ class SGenshiTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile,
         try:
             stream = self.template.generate(metadata=metadata).filter( \
                 Bcfg2.Server.Plugins.TGenshi.removecomment)
-            data = lxml.etree.XML(stream.render('xml', strip_whitespace=False))
+            data = lxml.etree.XML(stream.render('xml', strip_whitespace=False),
+                                  parser=Bcfg2.Server.XMLParser)
             bundlename = os.path.splitext(os.path.basename(self.name))[0]
             bundle = lxml.etree.Element('Bundle', name=bundlename)
             for item in self.Match(metadata, data):
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
index 0072dc62d..1091fc2c8 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
@@ -42,14 +42,16 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
         if event.filename.endswith('.xml'):
             if action in ['exists', 'created', 'changed']:
                 if event.filename.endswith('key.xml'):
-                    key_spec = dict(list(lxml.etree.parse(epath).find('Key').items()))
+                    key_spec = dict(list(lxml.etree.parse(epath,
+                                                          parser=Bcfg2.Server.XMLParser).find('Key').items()))
                     self.key_specs[ident] = {
                         'bits': key_spec.get('bits', 2048),
                         'type': key_spec.get('type', 'rsa')
                     }
                     self.Entries['Path'][ident] = self.get_key
                 elif event.filename.endswith('cert.xml'):
-                    cert_spec = dict(list(lxml.etree.parse(epath).find('Cert').items()))
+                    cert_spec = dict(list(lxml.etree.parse(epath,
+                                                           parser=Bcfg2.Server.XMLParser).find('Cert').items()))
                     ca = cert_spec.get('ca', 'default')
                     self.cert_specs[ident] = {
                         'ca': ca,
diff --git a/src/lib/Bcfg2/Server/__init__.py b/src/lib/Bcfg2/Server/__init__.py
index 96777b0bf..320371284 100644
--- a/src/lib/Bcfg2/Server/__init__.py
+++ b/src/lib/Bcfg2/Server/__init__.py
@@ -1,4 +1,8 @@
 """This is the set of modules for Bcfg2.Server."""
 
+import lxml.etree
+
 __all__ = ["Admin", "Core", "FileMonitor", "Plugin", "Plugins",
-           "Hostbase", "Reports", "Snapshots"]
+           "Hostbase", "Reports", "Snapshots", "XMLParser"]
+
+XMLParser = lxml.etree.XMLParser(remove_blank_text=True)