entrouvert
/
fargo
17
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

oauth2: improve logs with new link to clients (#22717)

This commit is contained in:
Benjamin Dauvergne 2018-03-22 00:51:01 +01:00
parent 1dddba4baf
commit d813e2b167
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fargo/oauth2/views.py
View File

@ -98,8 +98,8 @@ class OAuth2AuthorizeView(FormView):
def form_valid(self, form):
document = form.cleaned_data['document']
authorization = OAuth2Authorize.objects.create(user_document=document)
logger.info(u'user %s authorized %s to get document "%s" (%s) with code %s',
authorization = OAuth2Authorize.objects.create(client=self.client, user_document=document)
logger.info(u'user %s authorized client "%s" to get document "%s" (%s) with code "%s"',
self.request.user,
self.client,
document,
@ -131,7 +131,7 @@ class GetDocumentTokenView(OAUTH2APIViewMixin):
if (now() - authorize.creation_date).total_seconds() > settings.FARGO_CODE_LIFETIME:
return self.error('invalid_grant', 'code is expired')
logger.info(u'client %s resolved code %s to access token %s',
logger.info(u'client "%s" resolved code "%s" to access token "%s"',
request.user.oauth2_client,
authorize.code,
authorize.access_token)
@ -157,7 +157,8 @@ def get_document(request):
percent_encoded_filename = quote(doc.filename.encode('utf8'), safe='')
response['Content-Disposition'] = 'attachment; filename="%s"; filename*=UTF-8\'\'%s' % (ascii_filename,
percent_encoded_filename)
logger.info(u'document "%s" (%s) retrieved with access token %s',
logger.info(u'client "%s" retrieved document "%s" (%s) with access token "%s"',
oauth_authorize.client,
doc,
doc.pk,
oauth_authorize.access_token)
@ -173,13 +174,15 @@ class PutDocumentAPIView(OAUTH2APIViewMixin):
f = ContentFile(request.body, name=filename)
document = Document.objects.get_by_file(f)
oauth2_document = OAuth2TempFile.objects.create(document=document,
filename=filename)
oauth2_document = OAuth2TempFile.objects.create(
client=request.user.oauth2_client,
document=document,
filename=filename)
uri = reverse('oauth2-put-document-authorize', args=[oauth2_document.pk]) + '/'
response = Response()
response['Location'] = uri
logger.info(u'client %s uploaded document "%s" (%s)',
logger.info(u'client "%s" uploaded document "%s" (%s)',
request.user.oauth2_client,
filename,
oauth2_document.pk)
@ -232,10 +235,11 @@ class OAuth2AuthorizePutView(TemplateView):
user=request.user,
document=self.oauth2_document.document,
filename=self.oauth2_document.filename)
logger.info(u'user %s accepted document "%s" (%s)',
logger.info(u'user %s accepted document "%s" (%s) from client "%s"',
request.user,
self.oauth2_document.filename,
self.oauth2_document.pk)
self.oauth2_document.pk,
self.oauth2_document.client)
return self.redirect()
finally:
self.oauth2_document.delete()