2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

explicit reidrect_uri for github, too

Browse source
This commit is contained in:
Laura Klünder 2016-09-29 20:40:47 +02:00
parent 86be4c92b5
commit 1a2119475a
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/editor/hosters/base.py
View file

@ -119,7 +119,7 @@ class Hoster(ABC):
pass pass
@abstractmethod @abstractmethod
def do_request_access_token(self, code, state): def do_request_access_token(self, *args, **kwargs):
""" """
Task method for requesting the access token asynchroniously. Task method for requesting the access token asynchroniously.
Return a tuple with a new state and the access_token, or an optional error string if the state is 'logged_out'. Return a tuple with a new state and the access_token, or an optional error string if the state is 'logged_out'.

11
src/c3nav/editor/hosters/github.py
View file

@ -20,8 +20,12 @@ class GithubHoster(Hoster):
oauth_csrf_token = get_random_string(42, string.ascii_letters+string.digits) oauth_csrf_token = get_random_string(42, string.ascii_letters+string.digits)
self._get_session_data(request)['oauth_csrf_token'] = oauth_csrf_token self._get_session_data(request)['oauth_csrf_token'] = oauth_csrf_token
callback_uri = self._get_callback_uri(request).replace('://localhost:8000', 's://33c3.c3nav.de')
self._get_session_data(request)['callback_uri'] = callback_uri
return 'https://github.com/login/oauth/authorize?%s' % urlencode(( return 'https://github.com/login/oauth/authorize?%s' % urlencode((
('client_id', self._app_id), ('client_id', self._app_id),
('redirect_uri', callback_uri),
('scope', 'public_repo'), ('scope', 'public_repo'),
('state', oauth_csrf_token), ('state', oauth_csrf_token),
)) ))
@ -37,13 +41,16 @@ class GithubHoster(Hoster):
raise SuspiciousOperation('OAuth CSRF token mismatch') raise SuspiciousOperation('OAuth CSRF token mismatch')
session_data.pop('oauth_csrf_token') session_data.pop('oauth_csrf_token')
self.request_access_token(request, code, state) callback_uri = session_data.pop('callback_uri')
def do_request_access_token(self, code, state): self.request_access_token(request, code, state, callback_uri)
def do_request_access_token(self, code, state, callback_uri):
response = requests.post('https://github.com/login/oauth/access_token', data={ response = requests.post('https://github.com/login/oauth/access_token', data={
'client_id': self._app_id, 'client_id': self._app_id,
'client_secret': self._app_secret, 'client_secret': self._app_secret,
'code': code, 'code': code,
'redirect_uri': callback_uri,
'state': state 'state': state
}, headers={'Accept': 'application/json'}).json() }, headers={'Accept': 'application/json'}).json()