From 482051f595c23819d35f5e7cc38b1675e90a2c89 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 19 Jun 2012 13:43:59 -0400 Subject: fixed decryption of Properties files --- src/lib/Bcfg2/Server/Plugins/Properties.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Properties.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py index 0271e89ba..33c9e1909 100644 --- a/src/lib/Bcfg2/Server/Plugins/Properties.py +++ b/src/lib/Bcfg2/Server/Plugins/Properties.py @@ -83,19 +83,20 @@ class PropertyFile(Bcfg2.Server.Plugin.StructFile): raise Bcfg2.Server.PluginExecutionError(msg) def _decrypt(self, element): - passphrases = passphrases() + if not element.text.strip(): + return + passes = passphrases() try: - passphrase = passphrases[element.get("encrypted")] + passphrase = passes[element.get("encrypted")] try: - return ssl_decrypt(crypted, self.passphrase) + return ssl_decrypt(element.text, passphrase) except EVPError: # error is raised below pass except KeyError: - for passwd in passphrases.values(): + for passwd in passes.values(): try: - rv = ssl_decrypt(crypted, passwd) - return rv + return ssl_decrypt(element.text, passwd) except EVPError: pass raise EVPError("Failed to decrypt") -- cgit v1.2.3-1-g7c22