Merge lp:~clint-fewbar/pyjuju/fix-ssl-for-charm-store into lp:pyjuju

[Clint Byrum]

Ensure charm store SSL is authenticated

Use VerifyingContextFactory to ensure charm store interaction is authenticated

https://codereview.appspot.com/6443090/

[Kapil Thangavelu (hazmat)]

lgtm, with these minors

https://codereview.appspot.com/6443090/diff/1/juju/charm/repository.py
File juju/charm/repository.py (right):

https://codereview.appspot.com/6443090/diff/1/juju/charm/repository.py#newcode130
juju/charm/repository.py:130: host = url.split('/')[2]
this would be more robust with
urlparse.urlparse(url).hostname

https://codereview.appspot.com/6443090/diff/1/juju/charm/repository.py#newcode152
juju/charm/repository.py:152: host = url.split('/')[2]
same with this one.

https://codereview.appspot.com/6443090/

=== modified file 'juju/charm/repository.py'
--- juju/charm/repository.py	2012-05-03 18:42:09 +0000
+++ juju/charm/repository.py	2012-08-06 20:21:19 +0000
@@ -8,6 +8,7 @@
 from twisted.internet.defer import fail, inlineCallbacks, returnValue, succeed
 from twisted.web.client import downloadPage, getPage
 from twisted.web.error import Error
+from txaws.client.ssl import VerifyingContextFactory
 
 from juju.charm.provider import get_charm_from_path
 from juju.charm.url import CharmURL
@@ -126,7 +127,8 @@
         url = "%s/charm-info?charms=%s" % (
             self.url_base, urllib.quote(charm_id))
         try:
-            all_info = json.loads((yield getPage(url)))
+            host = url.split('/')[2]
+            all_info = json.loads((yield getPage(url, contextFactory=VerifyingContextFactory(host))))
             charm_info = all_info[charm_id]
             for warning in charm_info.get("warnings", []):
                 log.warning("%s: %s", charm_id, warning)
@@ -147,8 +149,9 @@
             delete=False)
         f.close()
         downloading_path = f.name
+        host = url.split('/')[2]
         try:
-            yield downloadPage(url, downloading_path)
+            yield downloadPage(url, downloading_path, contextFactory=VerifyingContextFactory(host))
         except Error:
             raise CharmNotFound(self.url_base, charm_url)
         os.rename(downloading_path, cache_path)

=== modified file 'juju/charm/tests/test_repository.py'
--- juju/charm/tests/test_repository.py	2012-07-01 22:20:22 +0000
+++ juju/charm/tests/test_repository.py	2012-08-06 20:21:19 +0000
@@ -5,6 +5,8 @@
 
 from twisted.internet.defer import fail, inlineCallbacks, succeed
 from twisted.web.error import Error
+from txaws.client.ssl import VerifyingContextFactory
+
 
 from juju.charm.directory import CharmDirectory
 from juju.charm.errors import CharmNotFound, CharmURLError, RepositoryNotFound
@@ -16,7 +18,7 @@
 from juju.lib import under
 
 from juju.charm import tests
-from juju.lib.mocker import ANY
+from juju.lib.mocker import ANY, MATCH
 from juju.lib.testing import TestCase
 
 
@@ -280,15 +282,19 @@
         return json.dumps({url_str: info})
 
     def mock_charm_info(self, url, result):
-        self.getPage(url)
+        def match_context(value):
+            return isinstance(value, VerifyingContextFactory)
+        self.getPage(url, contextFactory=MATCH(match_context))
         self.mocker.result(result)
 
     def mock_download(self, url, error=None):
-        self.downloadPage(url, ANY)
+        def match_context(value):
+            return isinstance(value, VerifyingContextFactory)
+        self.downloadPage(url, ANY, contextFactory=MATCH(match_context))
         if error:
             return self.mocker.result(fail(error))
 
-        def download(_, path):
+        def download(_, path, contextFactory):
             self.assertTrue(path.startswith(self.download_path))
             with open(path, "wb") as f:
                 f.write(self.bundle_data)

=== modified file 'juju/control/tests/test_upgrade_charm.py'
--- juju/control/tests/test_upgrade_charm.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_upgrade_charm.py	2012-08-06 20:21:19 +0000
@@ -12,6 +12,7 @@
 from juju.errors import FileNotFound
 from juju.environment.environment import Environment
 from juju.unit.workflow import UnitWorkflowState
+from juju.lib.mocker import ANY
 
 from .common import MachineControlToolTest
 
@@ -481,7 +482,8 @@
         self.setup_exit(0)
         getPage = self.mocker.replace("twisted.web.client.getPage")
         getPage(
-            CS_STORE_URL + "/charm-info?charms=cs%3Aseries/mysql")
+            CS_STORE_URL + "/charm-info?charms=cs%3Aseries/mysql",
+            contextFactory=ANY)
         self.mocker.result(succeed(json.dumps(
             {"cs:series/mysql": {"revision": 1, "sha256": "whatever"}})))
         self.mocker.replay()
@@ -502,7 +504,8 @@
         self.setup_exit(0)
 
         getPage = self.mocker.replace("twisted.web.client.getPage")
-        getPage(CS_STORE_URL + "/charm-info?charms=cs%3Aseries/mysql")
+        getPage(CS_STORE_URL + "/charm-info?charms=cs%3Aseries/mysql",
+                contextFactory=ANY)
 
         self.mocker.result(succeed(json.dumps(
             {"cs:series/mysql": {"revision": 1, "sha256": "whatever"}})))