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

all: cleanup logging to be structured

Browse Source
This commit is contained in:
Jens Langhammer
2020-02-18 21:35:58 +01:00
parent ff25c1c057
commit 4e8238603a
10 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
passbook/sources/oauth/clients.py
View File

@ -18,13 +18,13 @@ LOGGER = get_logger()
class BaseOAuthClient:
"""Base OAuth Client"""
_session = None
_session: Session = None
def __init__(self, source, token=""): # nosec
self.source = source
self.token = token
self._session = Session()
self._session.headers.update({"User-Agent": "web:passbook:%s" % __version__})
self._session.headers.update({"User-Agent": "passbook %s" % __version__})
def get_access_token(self, request, callback=None):
"Fetch access token from callback request."
@ -36,7 +36,7 @@ class BaseOAuthClient:
response = self.request("get", self.source.profile_url, token=raw_token)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch user profile: %s", exc)
LOGGER.warning("Unable to fetch user profile", exc=exc)
return None
else:
return response.json() or response.text
@ -51,7 +51,7 @@ class BaseOAuthClient:
additional = parameters or {}
args.update(additional)
params = urlencode(args)
LOGGER.info("Redirect args: %s", args)
LOGGER.info("redirect args", **args)
return "{0}?{1}".format(self.source.authorization_url, params)
def parse_raw_token(self, raw_token):
@ -91,7 +91,7 @@ class OAuthClient(BaseOAuthClient):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch access token: %s", exc)
LOGGER.warning("Unable to fetch access token", exc=exc)
return None
else:
return response.text
@ -106,7 +106,7 @@ class OAuthClient(BaseOAuthClient):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch request token: %s", exc)
LOGGER.warning("Unable to fetch request token", exc=exc)
return None
else:
return response.text
@ -195,7 +195,7 @@ class OAuth2Client(BaseOAuthClient):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch access token: %s", exc)
LOGGER.warning("Unable to fetch access token", exc=exc)
return None
else:
return response.text

2
passbook/sources/oauth/types/azure_ad.py
View File

@ -24,7 +24,7 @@ class AzureADOAuth2Client(OAuth2Client):
response = self.request("get", self.source.profile_url, headers=headers)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch user profile: %s", exc)
LOGGER.warning("Unable to fetch user profile", exc=exc)
return None
else:
return response.json() or response.text

2
passbook/sources/oauth/types/discord.py
View File

@ -40,7 +40,7 @@ class DiscordOAuth2Client(OAuth2Client):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch user profile: %s", exc)
LOGGER.warning("Unable to fetch user profile", exc=exc)
return None
else:
return response.json() or response.text

2
passbook/sources/oauth/types/reddit.py
View File

@ -49,7 +49,7 @@ class RedditOAuth2Client(OAuth2Client):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch user profile: %s", exc)
LOGGER.warning("Unable to fetch user profile", exc=exc)
return None
else:
return response.json() or response.text

2
passbook/sources/oauth/types/twitter.py
View File

@ -22,7 +22,7 @@ class TwitterOAuthClient(OAuthClient):
)
response.raise_for_status()
except RequestException as exc:
LOGGER.warning("Unable to fetch user profile: %s", exc)
LOGGER.warning("Unable to fetch user profile", exc=exc)
return None
else:
return response.json() or response.text

6
passbook/sources/oauth/views/core.py
View File

@ -124,9 +124,9 @@ class OAuthCallback(OAuthClientMixin, View):
source=self.source, identifier=identifier, request=request
)
if user is None:
LOGGER.debug("Handling new user")
LOGGER.debug("Handling new user", source=self.source)
return self.handle_new_user(self.source, connection, info)
LOGGER.debug("Handling existing user")
LOGGER.debug("Handling existing user", source=self.source)
return self.handle_existing_user(self.source, user, connection, info)
# pylint: disable=unused-argument
@ -179,7 +179,7 @@ class OAuthCallback(OAuthClientMixin, View):
def handle_login_failure(self, source, reason):
"Message user and redirect on error."
LOGGER.warning("Authentication Failure: %s", reason)
LOGGER.warning("Authentication Failure", reason=reason)
messages.error(self.request, _("Authentication Failed."))
return redirect(self.get_error_redirect(source, reason))