From 57822e1be0656b01628cd3eb4acb1d59f66bc76f Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Sun, 22 Jan 2012 22:56:44 +0200 Subject: [PATCH 1/2] Fix crash when the key is not found. --- la_facebook/callbacks/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/la_facebook/callbacks/base.py b/la_facebook/callbacks/base.py index 9494541..84f1be1 100644 --- a/la_facebook/callbacks/base.py +++ b/la_facebook/callbacks/base.py @@ -71,7 +71,7 @@ def redirect_url(self, request, fallback_url=settings.LOGIN_REDIRECT_URL, logger.debug("redirect not in get params") # try the session if available if hasattr(request, "session"): - redirect_to = request.session.get(session_key_value) + redirect_to = request.session.get(session_key_value, "") # Heavier security check -- don't allow redirection to a different host. netloc = urlparse.urlparse(redirect_to)[1] if netloc and netloc != request.host: From 6b5158569dc98dee67710114df483e9be7e66483 Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Sun, 22 Jan 2012 23:03:52 +0200 Subject: [PATCH 2/2] Actually fix the bug. --- la_facebook/callbacks/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/la_facebook/callbacks/base.py b/la_facebook/callbacks/base.py index 84f1be1..349f4fd 100644 --- a/la_facebook/callbacks/base.py +++ b/la_facebook/callbacks/base.py @@ -72,6 +72,7 @@ def redirect_url(self, request, fallback_url=settings.LOGIN_REDIRECT_URL, # try the session if available if hasattr(request, "session"): redirect_to = request.session.get(session_key_value, "") + if redirect_to is None: redirect_to = "" # Heavier security check -- don't allow redirection to a different host. netloc = urlparse.urlparse(redirect_to)[1] if netloc and netloc != request.host: