diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-17 15:04:23 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-17 15:04:23 -0400 |
commit | 64adcb62667adefc885bfcc5ae0f934300a96db3 (patch) | |
tree | 1669e41db1f4ba1b0390dcbd78bce8a275600c16 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py | |
parent | 817b4e4b49867288648603c711be388fcbf62265 (diff) | |
download | bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.tar.gz bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.tar.bz2 bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.zip |
fixed encrypted genshi/cheetah generators
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py index 9b2db3100..0839e3536 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py @@ -18,12 +18,16 @@ def passphrases(): return dict() def decrypt(crypted): + if not have_crypto: + msg = "Cfg: M2Crypto is not available: %s" % entry.get("name") + logger.error(msg) + raise Bcfg2.Server.Plugin.PluginExecutionError(msg) for passwd in passphrases().values(): try: return ssl_decrypt(crypted, passwd) except EVPError: pass - raise EVPError("Failed to decrypt %s" % self.name) + raise EVPError("Failed to decrypt") class CfgEncryptedGenerator(CfgGenerator): __extensions__ = ["crypt"] @@ -49,9 +53,9 @@ class CfgEncryptedGenerator(CfgGenerator): try: self.data = decrypt(crypted) except EVPError: - err = sys.exc_info()[1] - logger.error(err) - raise Bcfg2.Server.Plugin.PluginExecutionError(err) + msg = "Failed to decrypt %s" % self.name + logger.error(msg) + raise Bcfg2.Server.Plugin.PluginExecutionError(msg) def get_data(self, entry, metadata): if self.data is None: |