github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2025-12-26 05:48:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove global config from auth (#2962)

Browse Source
This commit is contained in:
Graham Neubig 2024-07-17 06:25:45 -04:00 committed by GitHub
parent 88d53e781f
commit 01ce1e35b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opendevin/server/auth/auth.py
View File

@ -1,11 +1,10 @@
import jwt
from jwt.exceptions import InvalidTokenError
from opendevin.core.config import config
from opendevin.core.logger import opendevin_logger as logger
def get_sid_from_token(token: str) -> str:
def get_sid_from_token(token: str, jwt_secret: str) -> str:
"""Retrieves the session id from a JWT token.
Parameters:
@ -16,7 +15,7 @@ def get_sid_from_token(token: str) -> str:
"""
try:
# Decode the JWT using the specified secret and algorithm
payload = jwt.decode(token, config.jwt_secret, algorithms=['HS256'])
payload = jwt.decode(token, jwt_secret, algorithms=['HS256'])
# Ensure the payload contains 'sid'
if 'sid' in payload:
@ -31,10 +30,10 @@ def get_sid_from_token(token: str) -> str:
return ''
def sign_token(payload: dict[str, object]) -> str:
def sign_token(payload: dict[str, object], jwt_secret: str) -> str:
"""Signs a JWT token."""
# payload = {
# "sid": sid,
# # "exp": datetime.now(timezone.utc) + timedelta(minutes=15),
# }
return jwt.encode(payload, config.jwt_secret, algorithm='HS256')
return jwt.encode(payload, jwt_secret, algorithm='HS256')

6
opendevin/server/listen.py
View File

@ -166,7 +166,7 @@ async def attach_session(request: Request, call_next):
if 'Bearer' in auth_token:
auth_token = auth_token.split('Bearer')[1].strip()
request.state.sid = get_sid_from_token(auth_token)
request.state.sid = get_sid_from_token(auth_token, config.jwt_secret)
if request.state.sid == '':
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
@ -245,7 +245,7 @@ async def websocket_endpoint(websocket: WebSocket):
if websocket.query_params.get('token'):
token = websocket.query_params.get('token')
sid = get_sid_from_token(token)
sid = get_sid_from_token(token, config.jwt_secret)
if sid == '':
await websocket.send_json({'error': 'Invalid token', 'error_code': 401})
@ -253,7 +253,7 @@ async def websocket_endpoint(websocket: WebSocket):
return
else:
sid = str(uuid.uuid4())
token = sign_token({'sid': sid})
token = sign_token({'sid': sid}, config.jwt_secret)
session = session_manager.add_or_restart_session(sid, websocket)
await websocket.send_json({'token': token, 'status': 'ok'})