Give something better than a 500 when OpenID discovery fails.

diff --git a/floof/controllers/account.py b/floof/controllers/account.py
index 71e73a0..2c94736 100644 (file)
--- a/floof/controllers/account.py
+++ b/floof/controllers/account.py
@@ -3,13 +3,15 @@ import logging
 from openid.consumer.consumer import Consumer
 from openid.extensions.sreg import SRegRequest, SRegResponse
 from openid.store.filestore import FileOpenIDStore
 from openid.consumer.consumer import Consumer
 from openid.extensions.sreg import SRegRequest, SRegResponse
 from openid.store.filestore import FileOpenIDStore

+from openid.yadis.discover import DiscoveryFailure

 from sqlalchemy.orm.exc import NoResultFound
 
 from sqlalchemy.orm.exc import NoResultFound
 

-from pylons import request, response, session, tmpl_context as c, url, h
-from pylons.controllers.util import abort, redirect
+from pylons import request, response, session, tmpl_context as c, url
+from pylons.controllers.util import abort, redirect, redirect_to

 from routes import url_for, request_config
 
 from floof.lib.base import BaseController, render
 from routes import url_for, request_config
 
 from floof.lib.base import BaseController, render

+import floof.lib.helpers as h

 from floof.model.users import IdentityURL, User
 
 log = logging.getLogger(__name__)
 from floof.model.users import IdentityURL, User
 
 log = logging.getLogger(__name__)


@@ -19,13 +21,20 @@ class AccountController(BaseController):
     openid_store = FileOpenIDStore('/var/tmp')
 
     def login(self):
     openid_store = FileOpenIDStore('/var/tmp')
 
     def login(self):

+        c.bogus_identity_url = request.params.get('bogus_identity_url', None)

         return render('/account/login.mako')
 
     def login_begin(self):
         """Step one of logging in with OpenID; we redirect to the provider"""
 
         return render('/account/login.mako')
 
     def login_begin(self):
         """Step one of logging in with OpenID; we redirect to the provider"""
 

+        identity_url = request.params['identity_url']

         cons = Consumer(session=session, store=self.openid_store)
         cons = Consumer(session=session, store=self.openid_store)

-        auth_request = cons.begin(request.params['identity_url'])
+        try:
+            auth_request = cons.begin(identity_url)
+        except DiscoveryFailure:
+            redirect_to(controller='account', action='login',
+                        bogus_identity_url=identity_url)
+

         sreg_req = SRegRequest(optional=['nickname', 'email', 'dob', 'gender',
                                          'country', 'language', 'timezone'])
         auth_request.addExtension(sreg_req)
         sreg_req = SRegRequest(optional=['nickname', 'email', 'dob', 'gender',
                                          'country', 'language', 'timezone'])
         auth_request.addExtension(sreg_req)

diff --git a/floof/public/layout.css b/floof/public/layout.css
index e74974e..017379f 100644 (file)
--- a/floof/public/layout.css
+++ b/floof/public/layout.css
@@ -29,6 +29,9 @@ var { font-style: italic; background: #e8e8e8; }
 
 input[type='button'], input[type='submit'], input[type='reset'] { cursor: pointer; }
 
 
 input[type='button'], input[type='submit'], input[type='reset'] { cursor: pointer; }
 

+/* Misc. classes */
+.error { color: #c00000; font-weight: bold; }
+

 /* General form layout */
 dl.form { margin: 1em 0; padding-left: 1em; border-left: 0.5em solid gray; }
 dl.form dt { padding-bottom: 0.25em; font-style: italic; }
 /* General form layout */
 dl.form { margin: 1em 0; padding-left: 1em; border-left: 0.5em solid gray; }
 dl.form dt { padding-bottom: 0.25em; font-style: italic; }


@@ -46,7 +49,7 @@ dl.form dd { margin-bottom: 0.5em; }
 /* Login */
 form#big-login { text-align: center; }
 form#big-login input { font-size: 2em; margin: 0 auto; }
 /* Login */
 form#big-login { text-align: center; }
 form#big-login input { font-size: 2em; margin: 0 auto; }

-form#big-login input#identity-url { width: 20em; padding-left: 16px; }
+form#big-login input#identity-url { width: 20em; }

 
 dl#openid_examples { overflow: hidden /* new float context */; }
 dl#openid_examples > dt { float: left; clear: left; width: 15.5em; margin-right: 0.5em; text-align: right; color: #2457a0; }
 
 dl#openid_examples { overflow: hidden /* new float context */; }
 dl#openid_examples > dt { float: left; clear: left; width: 15.5em; margin-right: 0.5em; text-align: right; color: #2457a0; }

diff --git a/floof/templates/account/login.mako b/floof/templates/account/login.mako
index d00593b..d58f6d4 100644 (file)
--- a/floof/templates/account/login.mako
+++ b/floof/templates/account/login.mako
@@ -4,8 +4,11 @@
 <p>You can log in or register with any <a href="http://openid.net/"><img src="/icons/openid.png" alt=""> OpenID</a>.</p>
 
 <form action="${url(controller='account', action='login_begin')}" method="POST" id="big-login">
 <p>You can log in or register with any <a href="http://openid.net/"><img src="/icons/openid.png" alt=""> OpenID</a>.</p>
 
 <form action="${url(controller='account', action='login_begin')}" method="POST" id="big-login">

+% if c.bogus_identity_url:
+<p class="error">This isn't a valid OpenID, sorry.</p>
+% endif

 <p>
 <p>

-    <input type="text" name="identity_url" id="identity-url">
+    <input type="text" name="identity_url" id="identity-url" value="${c.bogus_identity_url}">

     <input type="submit" value="Log in">
 </p>
 </form>
     <input type="submit" value="Log in">
 </p>
 </form>