Skip to content

Problem: Crash when trying to auth via websocket #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Problem: Crash when trying to auth via websocket #630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f86f47c
Problem: Crash when trying to auth via websocket
olethanh Jun 7, 2024
ec33d13
Fix: Endpoint authenticate_api_request is not adequate for Websocket …
hoh Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/aleph/vm/orchestrator/views/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,11 @@ async def status_public_config(request: web.Request):
)


def authenticate_api_request(request: web.Request) -> bool:
def authenticate_api_request(request: web.Request, raises_on_missing_header=True) -> bool:
"""Authenticate an API request to update the VM allocations."""
signature: bytes = request.headers.get("X-Auth-Signature", "").encode()

if not signature:
if not signature and raises_on_missing_header:
raise web.HTTPUnauthorized(text="Authentication token is missing")

# Use a simple authentication method: the hash of the signature should match the value in the settings
Expand Down
4 changes: 2 additions & 2 deletions src/aleph/vm/orchestrator/views/operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ async def stream_logs(request: web.Request) -> web.StreamResponse:

async def authenticate_for_vm_or_403(execution, request, vm_hash, ws):
"""Allow authentication via HEADER or via websocket"""
if authenticate_api_request(request):
logger.debug(f"Accepted request to access logs via the allocatioan api key on {vm_hash}")
if authenticate_api_request(request, raises_on_missing_header=False):
logger.debug(f"Accepted request to access logs via the allocation api key on {vm_hash}")
return True

first_message = await ws.receive_json()
Expand Down