github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 23:39:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor state value passing to OAuth2 error responses.

Browse Source
This commit is contained in:
Max Goodman
2012-03-14 11:45:51 -07:00
committed by Logan Hanks
parent 9001852a40
commit 56a1d9054b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
r2/r2/controllers/oauth2.py
View File

@@ -69,9 +69,11 @@ class OAuth2FrontendController(RedditController):
if not redirect_uri or not client or redirect_uri != client.redirect_uri:
abort(ForbiddenError(errors.OAUTH2_INVALID_REDIRECT_URI))
def _error_response(self, resp, redirect_uri):
def _error_response(self, state, redirect_uri):
"""Return an error redirect, but only if client_id and redirect_uri are valid."""
resp = {"state": state}
if (errors.OAUTH2_INVALID_CLIENT, "client_id") in c.errors:
resp["error"] = "unauthorized_client"
elif (errors.OAUTH2_ACCESS_DENIED, "authorize") in c.errors:
@@ -117,15 +119,11 @@ class OAuth2FrontendController(RedditController):
self._check_redirect_uri(client, redirect_uri)
resp = {}
if state:
resp["state"] = state
if not c.errors:
c.deny_frames = True
return OAuth2AuthorizationPage(client, redirect_uri, scope_info[scope], state).render()
else:
return self._error_response(resp, redirect_uri)
return self._error_response(state, redirect_uri)
@validate(VUser(),
VModhash(fatal=False),
@@ -139,16 +137,12 @@ class OAuth2FrontendController(RedditController):
self._check_redirect_uri(client, redirect_uri)
resp = {}
if state:
resp["state"] = state
if not c.errors:
code = OAuth2AuthorizationCode._new(client._id, redirect_uri, c.user._id, scope)
resp["code"] = code._id
resp = {"code": code._id, "state": state}
return self.redirect(redirect_uri+"?"+urlencode(resp), code=302)
else:
return self._error_response(resp, redirect_uri)
return self._error_response(state, redirect_uri)
class OAuth2AccessController(MinimalController):
def pre(self):