Made a few encryption things simpler:

* Only one strict/lax setting, in [encryption], rather than separate
  settings in [properties] and [sshkeys]
* No longer necessary to enable encryption on each Properties file

1 files changed, 18 insertions, 19 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index b3c0a6ae5..a51dd8adc 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -205,28 +205,27 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
 
     def Index(self):
         Bcfg2.Server.Plugin.StructFile.Index(self)
-        if self.xdata.get("encryption", "false").lower() != "false":
+        strict = self.xdata.get(
+            "decrypt",
+            SETUP.cfp.get(Bcfg2.Encryption.CFG_SECTION, "decrypt",
+                          default="strict")) == "strict"
+        for el in self.xdata.xpath("//*[@encrypted]"):
             if not HAS_CRYPTO:
                 raise PluginExecutionError("Properties: M2Crypto is not "
                                            "available: %s" % self.name)
-            strict = self.xdata.get(
-                "decrypt",
-                SETUP.cfp.get("properties", "decrypt",
-                              default="strict")) == "strict"
-            for el in self.xdata.xpath("//*[@encrypted]"):
-                try:
-                    el.text = self._decrypt(el).encode('ascii',
-                                                       'xmlcharrefreplace')
-                except UnicodeDecodeError:
-                    LOGGER.info("Properties: Decrypted %s to gibberish, "
-                                "skipping" % el.tag)
-                except Bcfg2.Encryption.EVPError:
-                    msg = "Properties: Failed to decrypt %s element in %s" % \
-                        (el.tag, self.name)
-                    if strict:
-                        raise PluginExecutionError(msg)
-                    else:
-                        LOGGER.warning(msg)
+            try:
+                el.text = self._decrypt(el).encode('ascii',
+                                                   'xmlcharrefreplace')
+            except UnicodeDecodeError:
+                LOGGER.info("Properties: Decrypted %s to gibberish, "
+                            "skipping" % el.tag)
+            except Bcfg2.Encryption.EVPError:
+                msg = "Properties: Failed to decrypt %s element in %s" % \
+                    (el.tag, self.name)
+                if strict:
+                    raise PluginExecutionError(msg)
+                else:
+                    LOGGER.warning(msg)
     Index.__doc__ = Bcfg2.Server.Plugin.StructFile.Index.__doc__
 
     def _decrypt(self, element):