haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 23:02:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1981 from haiwen/oauth-fix

Browse Source 
[oauth] Fix oauth state issue in multiple processes
This commit is contained in:
xiez
2018-01-17 14:55:05 +08:00
committed by GitHub
parent 60b02a1f30 2c7aeb1296
commit ea9c1801d2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
seahub/oauth/views.py
View File

@@ -42,9 +42,6 @@ if ENABLE_OAUTH:
} }
ATTRIBUTE_MAP.update(getattr(settings, 'OAUTH_ATTRIBUTE_MAP', {})) ATTRIBUTE_MAP.update(getattr(settings, 'OAUTH_ATTRIBUTE_MAP', {}))
session = OAuth2Session(client_id=CLIENT_ID,
scope=SCOPE, redirect_uri=REDIRECT_URL)
def oauth_check(func): def oauth_check(func):
""" Decorator for check if OAuth valid. """ Decorator for check if OAuth valid.
""" """
@@ -86,6 +83,9 @@ def oauth_login(request):
Redirect the user/resource owner to the OAuth provider (i.e. Github) Redirect the user/resource owner to the OAuth provider (i.e. Github)
using an URL with a few key OAuth parameters. using an URL with a few key OAuth parameters.
""" """
session = OAuth2Session(client_id=CLIENT_ID,
scope=SCOPE, redirect_uri=REDIRECT_URL)
try: try:
authorization_url, state = session.authorization_url( authorization_url, state = session.authorization_url(
AUTHORIZATION_URL) AUTHORIZATION_URL)
@@ -95,6 +95,7 @@ def oauth_login(request):
'error_msg': _('Error, please contact administrator.'), 'error_msg': _('Error, please contact administrator.'),
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
request.session['oauth_state'] = state
return HttpResponseRedirect(authorization_url) return HttpResponseRedirect(authorization_url)
# Step 2: User authorization, this happens on the provider. # Step 2: User authorization, this happens on the provider.
@@ -106,6 +107,10 @@ def oauth_callback(request):
callback URL. With this redirection comes an authorization code included callback URL. With this redirection comes an authorization code included
in the redirect URL. We will use that to obtain an access token. in the redirect URL. We will use that to obtain an access token.
""" """
session = OAuth2Session(client_id=CLIENT_ID, scope=SCOPE,
state=request.session.get('oauth_state', None),
redirect_uri=REDIRECT_URL)
try: try:
session.fetch_token(TOKEN_URL, client_secret=CLIENT_SECRET, session.fetch_token(TOKEN_URL, client_secret=CLIENT_SECRET,
authorization_response=request.get_full_path()) authorization_response=request.get_full_path())