Skip to content

Commit

Permalink
Fix OAuth logging
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jul 10, 2020
1 parent 8a093ca commit a7019d6
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions panel/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
from .io import state
from .util import base64url_encode, base64url_decode

log = logging.getLogger(__file__)

log = logging.getLogger(__name__)


def decode_response_body(response):
Expand Down Expand Up @@ -79,7 +78,7 @@ async def get_authenticated_user(self, redirect_uri, client_id, state,
params['scope'] = self._SCOPE
if 'scope' in config.oauth_extra_params:
params['scope'] = config.oauth_extra_params['scope']
log.info("%s making authorize request" % type(self).__name__)
log.debug("%s making authorize request" % type(self).__name__)
self.authorize_redirect(**params)

async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret):
Expand All @@ -103,7 +102,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
if not client_secret:
raise ValueError('The client secret is undefined.')

log.info("%s making access token request." % type(self).__name__)
log.debug("%s making access token request." % type(self).__name__)

params = {
'code': code,
Expand Down Expand Up @@ -149,11 +148,11 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
if not user:
return

log.info("%s received user information." % type(self).__name__)
log.debug("%s received user information." % type(self).__name__)
return self._on_auth(user, body['access_token'])

async def get(self):
log.info("%s received login request" % type(self).__name__)
log.debug("%s received login request" % type(self).__name__)
if config.oauth_redirect_uri:
redirect_uri = config.oauth_redirect_uri
else:
Expand Down Expand Up @@ -188,7 +187,7 @@ async def get(self):
user = await self.get_authenticated_user(**params)
if user is None:
raise tornado.web.HTTPError(403)
log.info("%s authorized user, redirecting to app." % type(self).__name__)
log.debug("%s authorized user, redirecting to app." % type(self).__name__)
self.redirect('/')
else:
# Redirect for user authentication
Expand Down Expand Up @@ -297,7 +296,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
if not client_secret:
raise ValueError('The client secret is undefined.')

log.info("%s making access token request." % type(self).__name__)
log.debug("%s making access token request." % type(self).__name__)

http = self.get_auth_http_client()

Expand Down Expand Up @@ -333,7 +332,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
data['error'] = response.error
return self._on_error(**data)

log.info("%s granted access_token." % type(self).__name__)
log.debug("%s granted access_token." % type(self).__name__)

headers = dict(self._API_BASE_HEADERS, **{
"Authorization": "Bearer {}".format(body['access_token']),
Expand All @@ -350,7 +349,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
if not user:
return

log.info("%s received user information." % type(self).__name__)
log.debug("%s received user information." % type(self).__name__)

return self._on_auth(user, body['access_token'])

Expand Down Expand Up @@ -388,7 +387,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
if not client_secret:
raise ValueError('The client secret are undefined.')

log.info("%s making access token request." % type(self).__name__)
log.debug("%s making access token request." % type(self).__name__)

http = self.get_auth_http_client()

Expand Down Expand Up @@ -424,7 +423,7 @@ async def _fetch_access_token(self, code, redirect_uri, client_id, client_secret
data['error'] = response.error
return self._on_error(**data)

log.info("%s granted access_token." % type(self).__name__)
log.debug("%s granted access_token." % type(self).__name__)

access_token = decoded_body['access_token']
id_token = decoded_body['id_token']
Expand Down

0 comments on commit a7019d6

Please sign in to comment.