Merge lp:~stevenk/launchpad/loggerhead-reject-no-sreg into lp:launchpad

[Steve Kowalik]

If the sreg_info is None in the Loggerhead glue, log and raise a 401, rather than OOPSing.

If the sreg_info is None, log and raise a 401, rather than OOPSing.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/launchpad_loggerhead/app.py'
--- lib/launchpad_loggerhead/app.py	2012-08-15 20:57:12 +0000
+++ lib/launchpad_loggerhead/app.py	2013-01-31 01:31:22 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import logging
@@ -138,7 +138,14 @@
         if response.status == SUCCESS:
             self.log.error('open id response: SUCCESS')
             sreg_info = SRegResponse.fromSuccessResponse(response)
-            print sreg_info
+            if not sreg_info:
+                self.log.error('sreg_info is None.')
+                exc = HTTPUnauthorized()
+                exc.explanation = (
+                  "You don't have a Launchpad account. Check that you're "
+                  "logged in as the right user, or log into Launchpad and try "
+                  "again.")
+                raise exc
             environ[self.session_var]['user'] = sreg_info['nickname']
             raise HTTPMovedPermanently(query['back_to'])
         elif response.status == FAILURE: