Merge lp:~salgado/launchpad/fix-unicode-error-on-login into lp:launchpad/db-devel

[Guilherme Salgado]

Fix OpenIDLogin to not OOPS when the query string has non-ascii chars.

Just utf8-encoding the value before passing it to urllib.urlencode()
seems to do the trick.

[Michael Nelson (michael.nelson)]

I'm not sure why the diff hasn't updated yet, but I checked this locally, and it all looks good. Thanks Guilherme.

review: Approve (code)

[Guilherme Salgado (salgado)]

http://paste.ubuntu.com/388337/ has the diff, in case it never shows up here.

[Francis J. Lacoste (flacoste)]

Land it on db-devel.

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-03-02 15:03:43 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-03-04 17:21:54 +0000
@@ -194,7 +194,8 @@
         # they started the login process (i.e. the current URL without the
         # '+login' bit). To do that we encode that URL as a query arg in the
         # return_to URL passed to the OpenID Provider
-        starting_url = urllib.urlencode([('starting_url', self.starting_url)])
+        starting_url = urllib.urlencode(
+            [('starting_url', self.starting_url.encode('utf-8'))])
         trust_root = allvhosts.configs['mainsite'].rooturl
         return_to = urlappend(trust_root, '+openid-callback')
         return_to = "%s?%s" % (return_to, starting_url)

=== modified file 'lib/canonical/launchpad/webapp/tests/test_login.py'
--- lib/canonical/launchpad/webapp/tests/test_login.py	2010-03-02 15:03:43 +0000
+++ lib/canonical/launchpad/webapp/tests/test_login.py	2010-03-04 17:21:54 +0000
@@ -307,6 +307,7 @@
 
 class FakeOpenIDRequest:
     extensions = None
+    return_to = None
 
     def addExtension(self, extension):
         if self.extensions is None:
@@ -318,6 +319,7 @@
         return False
 
     def htmlMarkup(self, trust_root, return_to):
+        self.return_to = return_to
         return None
 
 
@@ -334,6 +336,20 @@
 class TestOpenIDLogin(TestCaseWithFactory):
     layer = DatabaseFunctionalLayer
 
+    def test_return_to_with_non_ascii_chars(self):
+        # Sometimes the +login link will have non-ascii characters in the
+        # query string, and we need to include those in the return_to URL that
+        # we pass to the OpenID provider, so we must utf-encode them.
+        request = LaunchpadTestRequest(
+            form={'non_ascii_field': 'subproc\xc3\xa9s'})
+        # This is a hack to make the request.getURL(1) call issued by the view
+        # not raise an IndexError.
+        request._app_names = ['foo']
+        view = StubbedOpenIDLogin(object(), request)
+        view()
+        self.assertIn(
+            'non_ascii_field%3Dsubproc%C3%A9s', view.openid_request.return_to)
+
     def test_sreg_fields(self):
         # We request the user's email address and Full Name (through the SREG
         # extension) to the OpenID provider so that we can automatically