From 3d78a3a1c00035c9d8c49b949b63e8f05f31c7a1 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 18 Jan 2013 11:04:33 -0500
Subject: Properties: fixed lax/strict decryption setting with no crypto libs
 installed

---
 src/lib/Bcfg2/Server/Plugins/Properties.py | 40 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index a51dd8adc..3ebad40e3 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -205,27 +205,25 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
 
     def Index(self):
         Bcfg2.Server.Plugin.StructFile.Index(self)
-        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)
-            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)
+        if HAS_CRYPTO:
+            strict = self.xdata.get(
+                "decrypt",
+                SETUP.cfp.get(Bcfg2.Encryption.CFG_SECTION, "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)
     Index.__doc__ = Bcfg2.Server.Plugin.StructFile.Index.__doc__
 
     def _decrypt(self, element):
-- 
cgit v1.2.3-1-g7c22