adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix jwt auth

Browse Source
This commit is contained in:
Timothy Pogue 2022-09-21 18:23:00 -06:00
parent 77ed713232
commit 6a6ae809f4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/rpc/api_server/api_auth.py
View File

@ -59,6 +59,7 @@ async def validate_ws_token(
secret_ws_token = api_config.get('ws_token', None) secret_ws_token = api_config.get('ws_token', None)
secret_jwt_key = api_config.get('jwt_secret_key', 'super-secret') secret_jwt_key = api_config.get('jwt_secret_key', 'super-secret')
# Check if ws_token is/in secret_ws_token
if ws_token and secret_ws_token: if ws_token and secret_ws_token:
is_valid_ws_token = False is_valid_ws_token = False
if isinstance(secret_ws_token, str): if isinstance(secret_ws_token, str):
@ -71,13 +72,16 @@ async def validate_ws_token(
if is_valid_ws_token: if is_valid_ws_token:
return ws_token return ws_token
else:
# Check if ws_token is a JWT
try: try:
user = get_user_from_token(ws_token, secret_jwt_key) user = get_user_from_token(ws_token, secret_jwt_key)
return user return user
# If the token is a jwt, and it's valid return the user # If the token is a jwt, and it's valid return the user
except HTTPException: except HTTPException:
pass pass
# No checks passed, deny the connection
logger.debug("Denying websocket request.") logger.debug("Denying websocket request.")
# If it doesn't match, close the websocket connection # If it doesn't match, close the websocket connection
await ws.close(code=status.WS_1008_POLICY_VIOLATION) await ws.close(code=status.WS_1008_POLICY_VIOLATION)