Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPublicKeyCreator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py

2 files changed, 93 insertions, 32 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
index 2967a23b6..d64bbaabf 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
@@ -29,6 +29,7 @@ class TestCfgPrivateKeyCreator(TestXMLCfgCreator):
     test_obj = CfgPrivateKeyCreator
     should_monitor = False
 
+    @patch("Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator.get_cfg", Mock())
     def get_obj(self, name=None, fam=None):
         return TestXMLCfgCreator.get_obj(self, name=name)
 
@@ -122,28 +123,11 @@ class TestCfgPrivateKeyCreator(TestXMLCfgCreator):
         pkc.XMLMatch.assert_called_with(metadata)
         pkc.get_specificity.assert_called_with(metadata)
         pkc._gen_keypair.assert_called_with(metadata,
- pkc.XMLMatch.return_value)
-        self.assertItemsEqual(mock_open.call_args_list,
-                              [call(privkey + ".pub"), call(privkey)])
-        pkc.pubkey_creator.get_filename.assert_called_with(group="foo")
-        pkc.pubkey_creator.write_data.assert_called_with(
-            "ssh-rsa publickey pubkey.filename\n", group="foo")
-        pkc.write_data.assert_called_with("privatekey", group="foo")
-        mock_rmtree.assert_called_with(datastore)
-
-        reset()
-        self.assertEqual(pkc.create_data(entry, metadata, return_pair=True),
-                         ("ssh-rsa publickey pubkey.filename\n",
-                          "privatekey"))
-        pkc.XMLMatch.assert_called_with(metadata)
-        pkc.get_specificity.assert_called_with(metadata)
-        pkc._gen_keypair.assert_called_with(metadata,
                                             pkc.XMLMatch.return_value)
         self.assertItemsEqual(mock_open.call_args_list,
                               [call(privkey + ".pub"), call(privkey)])
         pkc.pubkey_creator.get_filename.assert_called_with(group="foo")
         pkc.pubkey_creator.write_data.assert_called_with(
-            "ssh-rsa publickey pubkey.filename\n",
-            group="foo")
+            "ssh-rsa publickey pubkey.filename\n", group="foo")
         pkc.write_data.assert_called_with("privatekey", group="foo")
         mock_rmtree.assert_called_with(datastore)
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py
index 04772cf9a..f512a6803 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py
@@ -25,6 +25,7 @@ class TestCfgPublicKeyCreator(TestCfgCreator, TestStructFile):
     test_obj = CfgPublicKeyCreator
     should_monitor = False
 
+    @patch("Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator.get_cfg", Mock())
     def get_obj(self, name=None, fam=None):
         return TestCfgCreator.get_obj(self, name=name)
 
@@ -37,41 +38,117 @@ class TestCfgPublicKeyCreator(TestCfgCreator, TestStructFile):
         mock_HandleEvent.assert_called_with(pkc, evt)
         mock_handle_event.assert_called_with(pkc, evt)
 
-    def test_create_data(self):
+    @patch("os.unlink")
+    @patch("os.path.exists")
+    @patch("tempfile.mkstemp")
+    @patch("os.fdopen", Mock())
+    @patch("%s.open" % builtins)
+    def test_create_data(self, mock_open, mock_mkstemp, mock_exists,
+                         mock_unlink):
         metadata = Mock()
         pkc = self.get_obj()
         pkc.cfg = Mock()
+        pkc.core = Mock()
+        pkc.cmd = Mock()
+        pkc.write_data = Mock()
 
+        pubkey = "public key data"
         privkey_entryset = Mock()
         privkey_creator = Mock()
-        pubkey = Mock()
-        privkey = Mock()
-        privkey_creator.create_data.return_value = (pubkey, privkey)
-        privkey_entryset.best_matching.return_value = privkey_creator
+        privkey_creator.get_specificity = Mock()
+        privkey_creator.get_specificity.return_value = dict()
+        fileloc = pkc.get_filename()
         pkc.cfg.entries = {"/home/foo/.ssh/id_rsa": privkey_entryset}
 
+        def reset():
+            privkey_creator.reset_mock()
+            pkc.cmd.reset_mock()
+            pkc.core.reset_mock()
+            pkc.write_data.reset_mock()
+            mock_exists.reset_mock()
+            mock_unlink.reset_mock()
+            mock_mkstemp.reset_mock()
+            mock_open.reset_mock()
+
         # public key doesn't end in .pub
         entry = lxml.etree.Element("Path", name="/home/bar/.ssh/bogus")
         self.assertRaises(CfgCreationError,
                           pkc.create_data, entry, metadata)
+        self.assertFalse(pkc.write_data.called)
+
+        # cannot bind private key
+        reset()
+        pkc.core.Bind.side_effect = PluginExecutionError
+        entry = lxml.etree.Element("Path", name="/home/foo/.ssh/id_rsa.pub")
+        self.assertRaises(CfgCreationError,
+                          pkc.create_data, entry, metadata)
+        self.assertFalse(pkc.write_data.called)
 
         # private key not in cfg.entries
+        reset()
+        pkc.core.Bind.side_effect = None
+        pkc.core.Bind.return_value = "private key data"
         entry = lxml.etree.Element("Path", name="/home/bar/.ssh/id_rsa.pub")
         self.assertRaises(CfgCreationError,
                           pkc.create_data, entry, metadata)
+        self.assertFalse(pkc.write_data.called)
 
-        # successful operation
+        # no privkey.xml defined
+        reset()
+        privkey_entryset.best_matching.side_effect = PluginExecutionError
+        entry = lxml.etree.Element("Path", name="/home/foo/.ssh/id_rsa.pub")
+        self.assertRaises(CfgCreationError,
+                          pkc.create_data, entry, metadata)
+        self.assertFalse(pkc.write_data.called)
+
+        # successful operation, create new key
+        reset()
+        pkc.cmd.run.return_value = Mock()
+        pkc.cmd.run.return_value.success = True
+        pkc.cmd.run.return_value.stdout = pubkey
+        mock_mkstemp.return_value = (Mock(), str(Mock()))
+        mock_exists.return_value = False
+        privkey_entryset.best_matching.side_effect = None
+        privkey_entryset.best_matching.return_value = privkey_creator
         entry = lxml.etree.Element("Path", name="/home/foo/.ssh/id_rsa.pub")
         self.assertEqual(pkc.create_data(entry, metadata), pubkey)
+        self.assertTrue(pkc.core.Bind.called)
+        (privkey_entry, md) = pkc.core.Bind.call_args[0]
+        self.assertXMLEqual(privkey_entry,
+                            lxml.etree.Element("Path",
+                                               name="/home/foo/.ssh/id_rsa"))
+        self.assertEqual(md, metadata)
+
         privkey_entryset.get_handlers.assert_called_with(metadata, CfgCreator)
-        privkey_entryset.best_matching.assert_called_with(metadata,
-                                                          privkey_entryset.get_handlers.return_value)
-        self.assertXMLEqual(privkey_creator.create_data.call_args[0][0],
+        privkey_entryset.best_matching.assert_called_with(
+            metadata,
+            privkey_entryset.get_handlers.return_value)
+        mock_exists.assert_called_with(fileloc)
+        pkc.cmd.run.assert_called_with(["ssh-keygen", "-y", "-f",
+                                        mock_mkstemp.return_value[1]])
+        self.assertEqual(pkc.write_data.call_args[0][0], pubkey)
+        mock_unlink.assert_called_with(mock_mkstemp.return_value[1])
+        self.assertFalse(mock_open.called)
+
+        # successful operation, no need to create new key
+        reset()
+        mock_exists.return_value = True
+        mock_open.return_value = Mock()
+        mock_open.return_value.read.return_value = pubkey
+        pkc.cmd.run.return_value.stdout = None
+        self.assertEqual(pkc.create_data(entry, metadata), pubkey)
+        self.assertTrue(pkc.core.Bind.called)
+        (privkey_entry, md) = pkc.core.Bind.call_args[0]
+        self.assertXMLEqual(privkey_entry,
                             lxml.etree.Element("Path",
                                                name="/home/foo/.ssh/id_rsa"))
-        self.assertEqual(privkey_creator.create_data.call_args[0][1], metadata)
+        self.assertEqual(md, metadata)
 
-        # no privkey.xml
-        privkey_entryset.best_matching.side_effect = PluginExecutionError
-        self.assertRaises(CfgCreationError,
-                          pkc.create_data, entry, metadata)
+        privkey_entryset.get_handlers.assert_called_with(metadata, CfgCreator)
+        privkey_entryset.best_matching.assert_called_with(
+            metadata,
+            privkey_entryset.get_handlers.return_value)
+        mock_exists.assert_called_with(fileloc)
+        mock_open.assert_called_with(fileloc)
+        self.assertFalse(mock_mkstemp.called)
+        self.assertFalse(pkc.write_data.called)