From adf037aa31031be164e68b1a4817a7cada936c90 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 2 Oct 2012 15:00:03 -0400 Subject: testsuite: added unit tests for Cfg handlers --- src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py index f8d08b394..dc4bab9f6 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py @@ -30,18 +30,12 @@ class CfgEncryptedGenerator(CfgGenerator): __init__.__doc__ = CfgGenerator.__init__.__doc__ def handle_event(self, event): - if event.code2str() == 'deleted': - return - try: - crypted = open(self.name).read() - except UnicodeDecodeError: - crypted = open(self.name, mode='rb').read() - except: - LOGGER.error("Failed to read %s" % self.name) + CfgGenerator.handle_event(self, event) + if self.data is None: return # todo: let the user specify a passphrase by name try: - self.data = bruteforce_decrypt(crypted, setup=SETUP, + self.data = bruteforce_decrypt(self.data, setup=SETUP, algorithm=get_algorithm(SETUP)) except EVPError: msg = "Failed to decrypt %s" % self.name -- cgit v1.2.3-1-g7c22