summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiß <holger@zedat.fu-berlin.de>2011-06-30 23:19:03 +0200
committerHolger Weiß <holger@zedat.fu-berlin.de>2011-06-30 23:19:03 +0200
commit426df7d75753c2039766f26a0e6bbb91a66af30e (patch)
treea53a1e2d125188e586b012b3190092eb64c2ecba
parentca2b01d30772b29436faad7744e7aba58cc3fe5d (diff)
downloadbcfg2-426df7d75753c2039766f26a0e6bbb91a66af30e.tar.gz
bcfg2-426df7d75753c2039766f26a0e6bbb91a66af30e.tar.bz2
bcfg2-426df7d75753c2039766f26a0e6bbb91a66af30e.zip
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.
-rw-r--r--src/lib/Server/Plugins/Statistics.py4
1 files changed, 3 insertions, 1 deletions
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'))