Merge branch 'maint'

Conflicts:
	doc/appendix/guides/fedora.txt
	misc/bcfg2.spec
	schemas/types.xsd
	src/lib/Bcfg2/Encryption.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Client.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
	testsuite/common.py
	testsuite/install.sh

3 files changed, 32 insertions, 1 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
index 81c4837e1..75bd4ec95 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
@@ -8,6 +8,7 @@ import genshi.core
 from Bcfg2.Compat import reduce
 from mock import Mock, MagicMock, patch
 from Bcfg2.Server.Plugin.helpers import *
+from Bcfg2.Server.Plugin.exceptions import PluginInitError
 
 # add all parent testsuite directories to sys.path to allow (most)
 # relative imports in python 2.4
@@ -34,6 +35,7 @@ def tostring(el):
 
 class FakeElementTree(lxml.etree._ElementTree):
     xinclude = Mock()
+    parse = Mock
 
 
 class TestFunctions(Bcfg2TestCase):
@@ -71,7 +73,7 @@ class TestDatabaseBacked(TestPlugin):
         self.assertFalse(db._use_db)
 
         setattr(Bcfg2.Options.setup, attr, True)
-        self.assertFalse(db._use_db)
+        self.assertRaises(PluginInitError, self.get_obj, core)
 
 
 class TestPluginDatabaseModel(Bcfg2TestCase):
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
index 873ebd837..03b9fb0f4 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import lxml.etree
+import Bcfg2.Server.Plugins.Cfg
 from mock import Mock, MagicMock, patch
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator import *
 from Bcfg2.Server.Plugin import PluginExecutionError
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
index 68313e6fb..c9a982bb3 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 import shutil
 import tempfile
@@ -229,10 +230,12 @@ group:      group:with:colons
     def setUp(self):
         Bcfg2TestCase.setUp(self)
         set_setup_default("probes_db")
+        set_setup_default("probes_allowed_groups", [re.compile(".*")])
         self.datastore = None
         Bcfg2.Server.Cache.expire("Probes")
 
     def tearDown(self):
+        Bcfg2.Server.Cache.expire("Probes")
         if self.datastore is not None:
             shutil.rmtree(self.datastore)
             self.datastore = None
@@ -277,6 +280,31 @@ group:      group:with:colons
         Bcfg2.Options.setup.probes_db = True
         self._perform_tests()
 
+    def test_allowed_cgroups(self):
+        """ Test option to only allow probes to set certain groups """
+        probes = self.get_obj()
+
+        test_text = """a couple lines
+of freeform text
+"""
+        test_groups = ["group", "group2", "group-with-dashes"]
+        test_probe_data = lxml.etree.Element("Probe", name="test")
+        test_probe_data.text = test_text
+        for group in test_groups:
+            test_probe_data.text += "group:%s\n" % group
+
+        client = Mock()
+        groups, data = probes.ReceiveDataItem(client, test_probe_data)
+        self.assertItemsEqual(groups, test_groups)
+        self.assertEqual(data, test_text)
+
+        old_allowed_groups = Bcfg2.Options.setup.probes_allowed_groups
+        Bcfg2.Options.setup.probes_allowed_groups = [re.compile(r'^group.?$')]
+        groups, data = probes.ReceiveDataItem(client, test_probe_data)
+        self.assertItemsEqual(groups, ['group', 'group2'])
+        self.assertEqual(data, test_text)
+        Bcfg2.Options.setup.probes_allowed_groups = old_allowed_groups
+
     def _perform_tests(self):
         p = self.get_obj()