New Info attribute: "sensitive"

The contents/diffs of <Path>s which are marked as "sensitive" are now
omitted from the reports transmitted to the server, so that they won't
end up in the statistics database.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index f1d9ce75f..3841e637d 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -30,7 +30,8 @@ opts = {'owner': Bcfg2.Options.MDATA_OWNER,
         'group': Bcfg2.Options.MDATA_GROUP,
         'important': Bcfg2.Options.MDATA_IMPORTANT,
         'perms': Bcfg2.Options.MDATA_PERMS,
-        'paranoid': Bcfg2.Options.MDATA_PARANOID}
+        'paranoid': Bcfg2.Options.MDATA_PARANOID,
+        'sensitive': Bcfg2.Options.MDATA_SENSITIVE}
 mdata_setup = Bcfg2.Options.OptionParser(opts)
 mdata_setup.parse([])
 del mdata_setup['args']
@@ -46,7 +47,8 @@ info_regex = re.compile( \
     'mtime:(\s)*(?P<mtime>\w+)|' +
     'owner:(\s)*(?P<owner>\S+)|' +
     'paranoid:(\s)*(?P<paranoid>\S+)|' +
-    'perms:(\s)*(?P<perms>\w+)|')
+    'perms:(\s)*(?P<perms>\w+)|' +
+    'sensitive:(\s)*(?P<sensitive>\S+)|')
 
 
 class PluginInitError(Exception):
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py
index 4a33c0cb0..b15275815 100644
--- a/src/lib/Server/Plugins/SSHbase.py
+++ b/src/lib/Server/Plugins/SSHbase.py
@@ -230,10 +230,12 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
         keydata = self.entries[filename].data
         permdata = {'owner': 'root',
                     'group': 'root',
-                    'type': 'file',
-                    'perms': '0600'}
+                    'type': 'file'}
         if entry.get('name')[-4:] == '.pub':
             permdata['perms'] = '0644'
+        else:
+            permdata['perms'] = '0600'
+            permdata['sensitive'] = 'true'
         [entry.attrib.__setitem__(key, permdata[key]) for key in permdata]
         if "ssh_host_key.H_" == filename[:15]:
             entry.attrib['encoding'] = 'base64'