Skip to content

Problem: Websocked auth for fail user was not returning error #675

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 1 commit into from
Aug 21, 2024
Merged

Problem: Websocked auth for fail user was not returning error #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 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 @@ -135,14 +135,16 @@ async def authenticate_websocket_for_vm_or_403(execution: VmExecution, vm_hash:
if is_sender_authorized(authenticated_sender, execution.message):
logger.debug(f"Accepted request to access logs by {authenticated_sender} on {vm_hash}")
return True

logger.debug(f"Denied request to access logs by {authenticated_sender} on {vm_hash}")
await ws.send_json({"status": "failed", "reason": "unauthorized sender"})
raise web.HTTPForbidden(body="Unauthorized sender")
except Exception as error:
# Error occurred (invalid auth packet or other
await ws.send_json({"status": "failed", "reason": str(error)})
raise web.HTTPForbidden(body="Unauthorized sender")

# Auth was valid but not the correct user
logger.debug(f"Denied request to access logs by {authenticated_sender} on {vm_hash}")
await ws.send_json({"status": "failed", "reason": "unauthorized sender"})
raise web.HTTPForbidden(body="Unauthorized sender")


@cors_allow_all
@require_jwk_authentication
Expand Down Expand Up @@ -175,7 +177,6 @@ async def operate_expire(request: web.Request, authenticated_sender: str) -> web
@require_jwk_authentication
async def operate_confidential_initialize(request: web.Request, authenticated_sender: str) -> web.Response:
"""Start the confidential virtual machine if possible."""
# TODO: Add user authentication
vm_hash = get_itemhash_or_400(request.match_info)

pool: VmPool = request.app["vm_pool"]
Expand Down Expand Up @@ -219,7 +220,6 @@ async def operate_confidential_initialize(request: web.Request, authenticated_se
@require_jwk_authentication
async def operate_stop(request: web.Request, authenticated_sender: str) -> web.Response:
"""Stop the virtual machine, smoothly if possible."""
# TODO: Add user authentication
vm_hash = get_itemhash_or_400(request.match_info)

pool: VmPool = request.app["vm_pool"]
Expand Down