From 426df7d75753c2039766f26a0e6bbb91a66af30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Thu, 30 Jun 2011 23:19:03 +0200 Subject: Statistics: Abort if "sensitive" files are pulled Let the Statistics plugin raise a PluginExecutionError if a "sensitive" entry is requested by "bcfg2-admin pull". This is how the DBStats plugin behaves already. --- src/lib/Server/Plugins/Statistics.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/Server/Plugins/Statistics.py b/src/lib/Server/Plugins/Statistics.py index f4f4c7175..7251ab1b5 100644 --- a/src/lib/Server/Plugins/Statistics.py +++ b/src/lib/Server/Plugins/Statistics.py @@ -150,7 +150,9 @@ class Statistics(Bcfg2.Server.Plugin.Plugin, owner = cfentry.get('current_owner', cfentry.get('owner')) group = cfentry.get('current_group', cfentry.get('group')) perms = cfentry.get('current_perms', cfentry.get('perms')) - if 'current_bfile' in cfentry.attrib: + if cfentry.get('sensitive') in ['true', 'True']: + raise Bcfg2.Server.Plugin.PluginExecutionError + elif 'current_bfile' in cfentry.attrib: contents = binascii.a2b_base64(cfentry.get('current_bfile')) elif 'current_bdiff' in cfentry.attrib: diff = binascii.a2b_base64(cfentry.get('current_bdiff')) -- cgit v1.2.3-1-g7c22