ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address pull request comments

Browse source 
* Revised error messages
This commit is contained in:
ReAnzu 2018-03-01 07:32:55 -06:00
parent 8b320ff978
commit 87c9c27fba
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/szurubooru/middleware/authenticator.py
View file

@ -14,7 +14,7 @@ def _authenticate(username: str, password: str) -> model.User:
def _authenticate_token(username: str, token: str) -> model.User: def _authenticate_token(username: str, token: str) -> model.User:
"""Try to authenticate user. Throw AuthError for invalid users.""" ''' Try to authenticate user. Throw AuthError for invalid users. '''
user = users.get_user_by_name(username) user = users.get_user_by_name(username)
user_token = user_tokens.get_by_user_and_token(user, token) user_token = user_tokens.get_by_user_and_token(user, token)
if not auth.is_valid_token(user_token): if not auth.is_valid_token(user_token):
@ -39,10 +39,10 @@ def _get_user(ctx: rest.Context) -> Optional[model.User]:
else: else:
raise HttpBadRequest( raise HttpBadRequest(
'ValidationError', 'ValidationError',
'Only basic HTTP authentication is supported.') 'Only basic or token HTTP authentication is supported.')
except ValueError as err: except ValueError as err:
msg = ( msg = (
'Basic authentication header value are not properly formed. ' 'Authorization header values are not properly formed. '
'Supplied header {0}. Got error: {1}') 'Supplied header {0}. Got error: {1}')
raise HttpBadRequest( raise HttpBadRequest(
'ValidationError', 'ValidationError',