From 6548c501939194cc9927bc9fca3921e3329967f9 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 16 May 2012 16:40:34 -0400 Subject: added Cfg drivers for encrypted genshi/cheetah templates --- .../Server/Plugins/Cfg/CfgEncryptedGenerator.py | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 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 6ba470fd5..9b2db3100 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py @@ -9,6 +9,22 @@ except ImportError: logger = logging.getLogger(__name__) +def passphrases(): + section = "cfg:encryption" + if SETUP.cfp.has_section(section): + return dict([(o, SETUP.cfp.get(section, o)) + for o in SETUP.cfp.options(section)]) + else: + return dict() + +def decrypt(crypted): + for passwd in passphrases().values(): + try: + return ssl_decrypt(crypted, passwd) + except EVPError: + pass + raise EVPError("Failed to decrypt %s" % self.name) + class CfgEncryptedGenerator(CfgGenerator): __extensions__ = ["crypt"] @@ -19,15 +35,6 @@ class CfgEncryptedGenerator(CfgGenerator): logger.error(msg) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) - @property - def passphrases(self): - section = "cfg:encryption" - if SETUP.cfp.has_section(section): - return dict([(o, SETUP.cfp.get(section, o)) - for o in SETUP.cfp.options(section)]) - else: - return dict() - def handle_event(self, event): if event.code2str() == 'deleted': return @@ -39,14 +46,12 @@ class CfgEncryptedGenerator(CfgGenerator): logger.error("Failed to read %s" % self.name) return # todo: let the user specify a passphrase by name - self.data = None - for passwd in self.passphrases.values(): - try: - self.data = ssl_decrypt(crypted, passwd) - return - except EVPError: - pass - logger.error("Failed to decrypt %s" % self.name) + try: + self.data = decrypt(crypted) + except EVPError: + err = sys.exc_info()[1] + logger.error(err) + raise Bcfg2.Server.Plugin.PluginExecutionError(err) def get_data(self, entry, metadata): if self.data is None: -- cgit v1.2.3-1-g7c22