Merge lp:~therve/landscape-client/attachment-ssl-key into lp:~landscape/landscape-client/trunk

[Thomas Herve]

Fairly straightforward fix, too bad I didn't think about it first.

[Björn Tillenius (bjornt)]

Looks good, +1!

review: Approve

[lp:~therve/landscape-client/attachment-ssl-key]

529. By Thomas Herve on 2012-03-20

Fix test failure

[Geoff Teale (tealeg)]

+1 Great.

Thanks for fixing the tests.

review: Approve

=== modified file 'landscape/manager/scriptexecution.py'
--- landscape/manager/scriptexecution.py	2012-03-12 20:23:24 +0000
+++ landscape/manager/scriptexecution.py	2012-03-20 09:34:18 +0000
@@ -217,8 +217,10 @@
                 data = attachment_id
                 yield succeed(None)
             else:
-                data = yield fetch_async("%s%d" % (root_path, attachment_id),
-                                         headers=headers)
+                data = yield fetch_async(
+                    "%s%d" % (root_path, attachment_id),
+                    cainfo=self.registry.config.ssl_public_key,
+                    headers=headers)
             full_filename = os.path.join(attachment_dir, filename)
             attachment = file(full_filename, "wb")
             os.chmod(full_filename, 0600)

=== modified file 'landscape/manager/tests/test_scriptexecution.py'
--- landscape/manager/tests/test_scriptexecution.py	2012-03-14 12:48:53 +0000
+++ landscape/manager/tests/test_scriptexecution.py	2012-03-20 09:34:18 +0000
@@ -216,7 +216,41 @@
         headers = {"User-Agent": "landscape-client/%s" % VERSION,
                    "Content-Type": "application/octet-stream",
                    "X-Computer-ID": "secure_id"}
-        mock_fetch("https://localhost/attachment/14", headers=headers)
+        mock_fetch("https://localhost/attachment/14", headers=headers,
+                   cainfo=None)
+        self.mocker.result(succeed("some other data"))
+        self.mocker.replay()
+
+        result = self.plugin.run_script(
+            u"/bin/sh",
+            u"ls $LANDSCAPE_ATTACHMENTS && cat $LANDSCAPE_ATTACHMENTS/file1",
+            attachments={u"file1": 14})
+
+        def check(result):
+            self.assertEqual(result, "file1\nsome other data")
+
+        result.addCallback(check)
+        return result
+
+    def test_run_with_attachment_ids_and_ssl(self):
+        """
+        When fetching attachments, L{ScriptExecution} passes the optional ssl
+        certificate file if the configuration specifies it.
+        """
+        self.manager.config.url = "https://localhost/message-system"
+        self.manager.config.ssl_public_key = "/some/key"
+        persist = Persist(
+            filename=os.path.join(self.config.data_path, "broker.bpickle"))
+        registration_persist = persist.root_at("registration")
+        registration_persist.set("secure-id", "secure_id")
+        persist.save()
+        mock_fetch = self.mocker.replace("landscape.lib.fetch.fetch_async",
+                                         passthrough=False)
+        headers = {"User-Agent": "landscape-client/%s" % VERSION,
+                   "Content-Type": "application/octet-stream",
+                   "X-Computer-ID": "secure_id"}
+        mock_fetch("https://localhost/attachment/14", headers=headers,
+                   cainfo="/some/key")
         self.mocker.result(succeed("some other data"))
         self.mocker.replay()
 
@@ -899,7 +933,8 @@
         headers = {"User-Agent": "landscape-client/%s" % VERSION,
                    "Content-Type": "application/octet-stream",
                    "X-Computer-ID": "secure_id"}
-        mock_fetch("https://localhost/attachment/14", headers=headers)
+        mock_fetch("https://localhost/attachment/14", headers=headers,
+                   cainfo=None)
         self.mocker.result(fail(HTTPCodeError(404, "Not found")))
         self.mocker.replay()