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

9 files changed, 321 insertions, 29 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestAugeas.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestAugeas.py
new file mode 100644
index 000000000..74ca617af
--- /dev/null
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestAugeas.py
@@ -0,0 +1,250 @@
+# -*- coding: utf-8 -*-
+import os
+import sys
+import copy
+import lxml.etree
+import tempfile
+from mock import Mock, MagicMock, patch
+try:
+    from Bcfg2.Client.Tools.POSIX.Augeas import *
+    HAS_AUGEAS = True
+except ImportError:
+    POSIXAugeas = None
+    HAS_AUGEAS = False
+
+# add all parent testsuite directories to sys.path to allow (most)
+# relative imports in python 2.4
+path = os.path.dirname(__file__)
+while path != "/":
+    if os.path.basename(path).lower().startswith("test"):
+        sys.path.append(path)
+    if os.path.basename(path) == "testsuite":
+        break
+    path = os.path.dirname(path)
+from TestPOSIX.Testbase import TestPOSIXTool
+from common import *
+
+
+test_data = """<Test>
+  <Empty/>
+  <Text>content with spaces</Text>
+  <Attrs foo="foo" bar="bar"/>
+  <Children identical="false">
+    <Foo/>
+    <Bar attr="attr"/>
+  </Children>
+  <Children identical="true">
+    <Thing>one</Thing>
+    <Thing>two</Thing>
+  </Children>
+  <Children multi="true">
+    <Thing>same</Thing>
+    <Thing>same</Thing>
+    <Thing>same</Thing>
+    <Thing>same</Thing>
+  </Children>
+</Test>
+"""
+
+test_xdata = lxml.etree.XML(test_data)
+
+class TestPOSIXAugeas(TestPOSIXTool):
+    test_obj = POSIXAugeas
+
+    applied_commands = dict(
+        insert=lxml.etree.Element(
+            "Insert", label="Thing",
+            path='Test/Children[#attribute/identical = "true"]/Thing'),
+        set=lxml.etree.Element("Set", path="Test/Text/#text",
+                               value="content with spaces"),
+        move=lxml.etree.Element(
+            "Move", source="Test/Foo",
+            destination='Test/Children[#attribute/identical = "false"]/Foo'),
+        remove=lxml.etree.Element("Remove", path="Test/Bar"),
+        clear=lxml.etree.Element("Clear", path="Test/Empty/#text"),
+        setm=lxml.etree.Element(
+            "SetMulti", sub="#text", value="same",
+            base='Test/Children[#attribute/multi = "true"]/Thing'))
+
+    @skipUnless(HAS_AUGEAS, "Python Augeas libraries not found")
+    def setUp(self):
+        TestPOSIXTool.setUp(self)
+        fd, self.tmpfile = tempfile.mkstemp()
+        os.fdopen(fd, 'w').write(test_data)
+
+    def tearDown(self):
+        tmpfile = getattr(self, "tmpfile", None)
+        if tmpfile:
+            os.unlink(tmpfile)
+
+    def test_fully_specified(self):
+        ptool = self.get_obj()
+
+        entry = lxml.etree.Element("Path", name="/test", type="augeas")
+        self.assertFalse(ptool.fully_specified(entry))
+
+        entry.text = "text"
+        self.assertTrue(ptool.fully_specified(entry))
+
+    def test_install(self):
+        # this is tested adequately by the other tests
+        pass
+
+    def test_verify(self):
+        # this is tested adequately by the other tests
+        pass
+
+    @patch("Bcfg2.Client.Tools.POSIX.Augeas.POSIXTool.verify")
+    def _verify(self, commands, mock_verify):
+        ptool = self.get_obj()
+        mock_verify.return_value = True
+
+        entry = lxml.etree.Element("Path", name=self.tmpfile,
+                                   type="augeas", lens="Xml")
+        entry.extend(commands)
+
+        modlist = []
+        self.assertTrue(ptool.verify(entry, modlist))
+        mock_verify.assert_called_with(ptool, entry, modlist)
+        self.assertXMLEqual(lxml.etree.parse(self.tmpfile).getroot(),
+                            test_xdata)
+
+    def test_verify_insert(self):
+        """ Test successfully verifying an Insert command """
+        self._verify([self.applied_commands['insert']])
+
+    def test_verify_set(self):
+        """ Test successfully verifying a Set command """
+        self._verify([self.applied_commands['set']])
+
+    def test_verify_move(self):
+        """ Test successfully verifying a Move command """
+        self._verify([self.applied_commands['move']])
+
+    def test_verify_remove(self):
+        """ Test successfully verifying a Remove command """
+        self._verify([self.applied_commands['remove']])
+
+    def test_verify_clear(self):
+        """ Test successfully verifying a Clear command """
+        self._verify([self.applied_commands['clear']])
+
+    def test_verify_set_multi(self):
+        """ Test successfully verifying a SetMulti command """
+        self._verify([self.applied_commands['setm']])
+
+    def test_verify_all(self):
+        """ Test successfully verifying multiple commands """
+        self._verify(self.applied_commands.values())
+
+    @patch("Bcfg2.Client.Tools.POSIX.Augeas.POSIXTool.install")
+    def _install(self, commands, expected, mock_install):
+        ptool = self.get_obj()
+        mock_install.return_value = True
+
+        entry = lxml.etree.Element("Path", name=self.tmpfile,
+                                   type="augeas", lens="Xml")
+        entry.extend(commands)
+
+        self.assertTrue(ptool.install(entry))
+        mock_install.assert_called_with(ptool, entry)
+        self.assertXMLEqual(lxml.etree.parse(self.tmpfile).getroot(),
+                            expected)
+
+    def test_install_set_existing(self):
+        """ Test setting the value of an existing node """
+        expected = copy.deepcopy(test_xdata)
+        expected.find("Text").text = "Changed content"
+        self._install([lxml.etree.Element("Set", path="Test/Text/#text",
+                                          value="Changed content",
+                                          verified="false")],
+                      expected)
+
+    def test_install_set_new(self):
+        """ Test setting the value of an new node """
+        expected = copy.deepcopy(test_xdata)
+        newtext = lxml.etree.SubElement(expected, "NewText")
+        newtext.text = "new content"
+        self._install([lxml.etree.Element("Set", path="Test/NewText/#text",
+                                          value="new content",
+                                          verified="false")],
+                      expected)
+
+    def test_install_only_verified(self):
+        """ Test that only unverified commands are installed """
+        expected = copy.deepcopy(test_xdata)
+        newtext = lxml.etree.SubElement(expected, "NewText")
+        newtext.text = "new content"
+        self._install(
+            [lxml.etree.Element("Set", path="Test/NewText/#text",
+                                value="new content", verified="false"),
+             lxml.etree.Element("Set", path="Test/Bogus/#text",
+                                value="bogus", verified="true")],
+            expected)
+
+    def test_install_remove(self):
+        """ Test removing a node """
+        expected = copy.deepcopy(test_xdata)
+        expected.remove(expected.find("Attrs"))
+        self._install(
+            [lxml.etree.Element("Remove",
+                                path='Test/*[#attribute/foo = "foo"]',
+                                verified="false")],
+            expected)
+
+    def test_install_move(self):
+        """ Test moving a node """
+        expected = copy.deepcopy(test_xdata)
+        foo = expected.xpath("//Foo")[0]
+        expected.append(foo)
+        self._install(
+            [lxml.etree.Element("Move", source='Test/Children/Foo',
+                                destination='Test/Foo',
+                                verified="false")],
+            expected)
+
+    def test_install_clear(self):
+        """ Test clearing a node """
+        # TODO: clearing a node doesn't seem to work with the XML lens
+        #
+        # % augtool -b
+        # augtool> set /augeas/load/Xml/incl[3] "/tmp/test.xml"
+        # augtool> load
+        # augtool> clear '/files/tmp/test.xml/Test/Text/#text'
+        # augtool> save
+        # error: Failed to execute command
+        # saving failed (run 'print /augeas//error' for details)
+        # augtool> print /augeas//error
+        #
+        # The error isn't useful.
+        pass
+
+    def test_install_set_multi(self):
+        """ Test setting multiple nodes at once """
+        expected = copy.deepcopy(test_xdata)
+        for thing in expected.xpath("Children[@identical='true']/Thing"):
+            thing.text = "same"
+        self._install(
+            [lxml.etree.Element(
+                "SetMulti", value="same",
+                base='Test/Children[#attribute/identical = "true"]',
+                sub="Thing/#text", verified="false")],
+            expected)
+
+    def test_install_insert(self):
+        """ Test inserting a node """
+        expected = copy.deepcopy(test_xdata)
+        children = expected.xpath("Children[@identical='true']")[0]
+        thing = lxml.etree.Element("Thing")
+        thing.text = "three"
+        children.append(thing)
+        self._install(
+            [lxml.etree.Element(
+                "Insert",
+                path='Test/Children[#attribute/identical = "true"]/Thing[2]',
+                label="Thing", where="after", verified="false"),
+             lxml.etree.Element(
+                 "Set",
+                 path='Test/Children[#attribute/identical = "true"]/Thing[3]/#text',
+                 value="three", verified="false")],
+            expected)
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
index 1bf073f81..0c059b5f3 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
@@ -41,10 +41,12 @@ class TestTool(Bcfg2TestCase):
         @patch("%s.%s._analyze_config" % (self.test_obj.__module__,
                                           self.test_obj.__name__))
         def inner(mock_analyze_config, mock_check_execs):
-            t = self.get_obj()
+            self.get_obj()
             mock_analyze_config.assert_called_with()
             mock_check_execs.assert_called_with()
 
+        inner()
+
     def test__analyze_config(self):
         t = self.get_obj()
         t.getSupportedEntries = Mock()
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()
 
diff --git a/testsuite/before_install.sh b/testsuite/before_install.sh
index 5f1a59aaf..2c80036cd 100755
--- a/testsuite/before_install.sh
+++ b/testsuite/before_install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 # before_install script for Travis-CI
 
@@ -8,6 +8,7 @@ sudo apt-get update -qq
 sudo apt-get install -qq swig libxml2-utils
 if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
     if [[ ${PYVER:0:1} == "2" ]]; then
-        sudo apt-get install -qq python-selinux python-pylibacl yum
+        sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev \
+            libssl-dev
     fi
 fi
diff --git a/testsuite/common.py b/testsuite/common.py
index 849c22ef3..5a08f8db5 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -129,8 +129,12 @@ class Bcfg2TestCase(TestCase):
             "\nSecond: %s" % lxml.etree.tostring(el2)
 
         self.assertEqual(el1.tag, el2.tag, msg=fullmsg % "Tags differ")
-        self.assertEqual(el1.text, el2.text,
-                         msg=fullmsg % "Text content differs")
+        if el1.text is not None and el2.text is not None:
+            self.assertEqual(el1.text.strip(), el2.text.strip(),
+                             msg=fullmsg % "Text content differs")
+        else:
+            self.assertEqual(el1.text, el2.text,
+                             msg=fullmsg % "Text content differs")
         self.assertItemsEqual(el1.attrib.items(), el2.attrib.items(),
                               msg=fullmsg % "Attributes differ")
         self.assertEqual(len(el1.getchildren()),
diff --git a/testsuite/ext/exception_messages.py b/testsuite/ext/exception_messages.py
index 877ba42a1..cd3d7112c 100644
--- a/testsuite/ext/exception_messages.py
+++ b/testsuite/ext/exception_messages.py
@@ -1,16 +1,30 @@
-from logilab import astng
-from pylint.interfaces import IASTNGChecker
+try:
+    from logilab import astng as ast
+    from pylint.interfaces import IASTNGChecker as IChecker
+    PYLINT = 0  # pylint 0.something
+except ImportError:
+    import astroid as ast
+    from pylint.interfaces import IAstroidChecker as IChecker
+    PYLINT = 1  # pylint 1.something
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import safe_infer
 
+if PYLINT == 0:
+    # this is not quite correct; later versions of pylint 0.* wanted a
+    # three-tuple for messages as well
+    msg = ('Exception raised without arguments',
+           'Used when an exception is raised without any arguments')
+else:
+    msg = ('Exception raised without arguments',
+           'exception-without-args',
+           'Used when an exception is raised without any arguments')
+msgs = {'R9901': msg}
+
 
 class ExceptionMessageChecker(BaseChecker):
-    __implements__ = IASTNGChecker
+    __implements__ = IChecker
 
     name = 'Exception Messages'
-    msgs = \
-        {'R9901': ('Exception raised without arguments',
-                   'Used when an exception is raised without any arguments')}
     options = (
         ('exceptions-without-args',
          dict(default=('NotImplementedError',),
@@ -23,9 +37,9 @@ class ExceptionMessageChecker(BaseChecker):
     def visit_raise(self, node):
         if node.exc is None:
             return
-        if isinstance(node.exc, astng.Name):
+        if isinstance(node.exc, ast.Name):
             raised = safe_infer(node.exc)
-            if (isinstance(raised, astng.Class) and
+            if (isinstance(raised, ast.Class) and
                 raised.name not in self.config.exceptions_without_args):
                 self.add_message('R9901', node=node.exc)
 
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 8721c8015..50b91a4d2 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 # install script for Travis-CI
 
@@ -11,22 +11,12 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then
 fi
 
 if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
-    pip install --use-mirrors PyYAML pyinotify boto
-    if [[ $PYVER == "2.5" ]]; then
-        # markdown 2.2+ doesn't work on py2.5
-        pip install --use-mirrors simplejson 'markdown<2.2' 'django<1.4.9'
-    else
-        pip install 'django<1.5'
-    fi
+    pip install --use-mirrors PyYAML pyinotify boto pylibacl 'django<1.5'
+    easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits
         # in bcfg2 require South
-        pip install cheetah 'South<0.8' M2Crypto
-    fi
-else
-    # python < 2.6 requires M2Crypto for SSL communication, not just
-    # for encryption support
-    if [[ $PYVER == "2.5" || $PYVER == "2.4" ]]; then
-        pip install --use-mirrors M2crypto
+        pip install cheetah 'South<0.8'
+        pip install m2crypto
     fi
 fi