diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-02 15:00:03 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-02 15:00:03 -0400 |
| commit | adf037aa31031be164e68b1a4817a7cada936c90 (patch) | |
| tree | e4913b33fbed2bb480a2090b419a7fb3fddc67a7 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py | |
| parent | 414f1c017f5a1e0f0549bcb27175983b04e3312c (diff) | |
| download | bcfg2-adf037aa31031be164e68b1a4817a7cada936c90.tar.gz bcfg2-adf037aa31031be164e68b1a4817a7cada936c90.tar.bz2 bcfg2-adf037aa31031be164e68b1a4817a7cada936c90.zip | |
testsuite: added unit tests for Cfg handlers
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, 3 insertions, 9 deletions
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 |