Merge lp:~canonical-isd-hackers/canonical-identity-provider/consumer-staging-ssl into lp:canonical-identity-provider/release

[Szilveszter Farkas]

A proposed fix for bug 568327 based on http://bazaar.launchpad.net/~canonical-isd-hackers/openid-load-testing/staging/annotate/head%3A/relying_party/consumer-ubuntu.py

[Ricardo Kirkner (ricardokirkner)]

No tests are present for the changes made

review: Needs Fixing

[Szilveszter Farkas (phanatic)]

I'm open to any suggestions about how to test something that's specific to the staging environment.

[Ricardo Kirkner (ricardokirkner)]

Since I added changes to this branch I don't want to give it the last +1.

review: Abstain

[Łukasz Czyżykowski (lukasz-czyzykowski)]

+1 for tests checking that this change is actually working.

review: Approve

=== modified file 'identityprovider/tests/test_views_consumer.py'
--- identityprovider/tests/test_views_consumer.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_views_consumer.py	2010-05-07 19:00:42 +0000
@@ -3,7 +3,17 @@
 
 import unittest
 
-from identityprovider.views.consumer import getBaseURL
+from openid import fetchers
+
+# need to override fetcher before consumer module gets imported
+class MockFetcher(fetchers.Urllib2Fetcher):
+    called = False
+    def fetch(self, url, body=None, headers=None):
+        MockFetcher.called = True
+        return super(MockFetcher, self).fetch(url, body, headers)
+
+fetchers.Urllib2Fetcher = MockFetcher
+from identityprovider.views.consumer import getBaseURL, startOpenID
 
 
 class DummyRequest(object):
@@ -11,6 +21,24 @@
         self.META = META
 
 
+class DummyDjangoRequest(object):
+    META = {
+        'HTTP_HOST': "localhost",
+        'SCRIPT_NAME': "http://localhost/consumer/",
+        'SERVER_PROTOCOL': "http",
+    }
+    POST = {
+        'openid_identifier': "http://localhost/+id/abcd123",
+    }
+    session = {}
+
+
+class FetcherTestCase(unittest.TestCase):
+    def test_check_custom_fetcher_called(self):
+        response = startOpenID(DummyDjangoRequest())
+        self.assertTrue(MockFetcher.called)
+
+
 class GetBaseURLTestCase(unittest.TestCase):
     def setUp(self):
         self.http_consumer_url = "http://localhost/"

=== modified file 'identityprovider/views/consumer.py'
--- identityprovider/views/consumer.py	2010-04-21 15:29:24 +0000
+++ identityprovider/views/consumer.py	2010-05-07 19:00:42 +0000
@@ -16,6 +16,7 @@
 
 from openid.consumer import consumer
 from openid.consumer.discover import DiscoveryFailure
+from openid.fetchers import setDefaultFetcher, Urllib2Fetcher
 from openid.extensions import sreg
 from openid.yadis.constants import YADIS_HEADER_NAME, YADIS_CONTENT_TYPE
 from openid.server.trustroot import RP_RETURN_TO_URL_TYPE
@@ -24,6 +25,8 @@
 
 TEAMS_REQUESTED = ['canonical-partner-dev', 'hwdb-team', 'otherteam']
 
+setDefaultFetcher(Urllib2Fetcher())
+
 
 def getBaseURL(req):
     """
@@ -227,8 +230,8 @@
             consumer.SUCCESS:
             {'url': response.getDisplayIdentifier(),
              'sreg': sreg_response and sreg_response.items(),
-             'teams': teams_response and teams_response.is_member}
-            }
+             'teams': teams_response and teams_response.is_member},
+        }
 
         result = results[response.status]