habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sources/oauth: fix OAuth1 not working, cleanup

Browse Source
This commit is contained in:
Jens Langhammer
2020-09-26 01:26:06 +02:00
parent d9c2b32cba
commit 7d533889bc
6 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
passbook/sources/oauth/clients/oauth1.py
View File

@ -1,10 +1,7 @@
"""OAuth Clients"""
from typing import Any, Dict, Optional, Tuple
from urllib.parse import parse_qs
"""OAuth 1 Clients"""
from typing import Any, Dict, Optional
from urllib.parse import parse_qsl
from django.db.models.expressions import Value
from django.http import HttpRequest
from django.utils.encoding import force_str
from requests.exceptions import RequestException
from requests.models import Response
from requests_oauthlib import OAuth1
@ -32,13 +29,14 @@ class OAuthClient(BaseOAuthClient):
data = {
"oauth_verifier": verifier,
"oauth_callback": self.callback,
"token": raw_token,
}
token = self.parse_raw_token(raw_token)
try:
response = self.session.request(
response = self.do_request(
"post",
self.source.access_token_url,
data=data,
token=token,
headers=self._default_headers,
)
response.raise_for_status()
@ -46,20 +44,17 @@ class OAuthClient(BaseOAuthClient):
LOGGER.warning("Unable to fetch access token", exc=exc)
return None
else:
return response.json()
return self.parse_raw_token(response.text)
return None
def get_request_token(self) -> str:
"Fetch the OAuth request token. Only required for OAuth 1.0."
callback = self.request.build_absolute_uri(self.callback)
try:
response = self.session.request(
response = self.do_request(
"post",
self.source.request_token_url,
data={
"oauth_callback": callback,
"oauth_consumer_key": self.source.consumer_key,
},
data={"oauth_callback": callback},
headers=self._default_headers,
)
response.raise_for_status()
@ -72,29 +67,34 @@ class OAuthClient(BaseOAuthClient):
"Get request parameters for redirect url."
callback = self.request.build_absolute_uri(self.callback)
raw_token = self.get_request_token()
token, _ = self.parse_raw_token(raw_token)
token = self.parse_raw_token(raw_token)
self.request.session[self.session_key] = raw_token
return {
"oauth_token": token,
"oauth_token": token["oauth_token"],
"oauth_callback": callback,
}
def parse_raw_token(self, raw_token: str) -> Tuple[str, Optional[str]]:
def parse_raw_token(self, raw_token: str) -> Dict[str, Any]:
"Parse token and secret from raw token response."
query_string = parse_qs(raw_token)
token = query_string["oauth_token"][0]
secret = query_string["oauth_token_secret"][0]
return (token, secret)
return dict(parse_qsl(raw_token))
# token = query_string["oauth_token"]
# secret = query_string["oauth_token_secret"]
# return (token, secret)
def do_request(self, method: str, url: str, **kwargs) -> Response:
"Build remote url request. Constructs necessary auth."
user_token = kwargs.pop("token", self.token)
token, secret = self.parse_raw_token(user_token)
resource_owner_key = None
resource_owner_secret = None
if "token" in kwargs:
user_token: Dict[str, Any] = kwargs.pop("token")
resource_owner_key = user_token["oauth_token"]
resource_owner_secret = user_token["oauth_token_secret"]
callback = kwargs.pop("oauth_callback", None)
verifier = kwargs.get("data", {}).pop("oauth_verifier", None)
oauth = OAuth1(
resource_owner_key=token,
resource_owner_secret=secret,
resource_owner_key=resource_owner_key,
resource_owner_secret=resource_owner_secret,
client_key=self.source.consumer_key,
client_secret=self.source.consumer_secret,
verifier=verifier,