Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions supervisor/api/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@ async def websocket(self, request: web.Request):
raise HTTPBadGateway()
_LOGGER.info("Home Assistant WebSocket API request initialize")

# Check if transport is still valid before WebSocket upgrade
if request.transport is None:
_LOGGER.warning("WebSocket connection lost before upgrade")
raise web.HTTPBadRequest(reason="Connection closed")

# init server
server = web.WebSocketResponse(heartbeat=30)
await server.prepare(request)
Expand Down
28 changes: 27 additions & 1 deletion tests/api/test_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from typing import Any, cast
from unittest.mock import AsyncMock, patch

from aiohttp import ClientWebSocketResponse, WSCloseCode
from aiohttp import ClientWebSocketResponse, WSCloseCode, web
from aiohttp.http_websocket import WSMessage, WSMsgType
from aiohttp.test_utils import TestClient
import pytest
Expand Down Expand Up @@ -223,6 +223,32 @@ async def test_proxy_auth_abort_log(
)


async def test_websocket_transport_none(
coresys,
caplog: pytest.LogCaptureFixture,
):
"""Test WebSocket connection with transport None is handled gracefully."""
# Get the API proxy instance from coresys
api_proxy = APIProxy.__new__(APIProxy)
api_proxy.coresys = coresys

# Create a mock request with transport set to None to simulate connection loss
mock_request = AsyncMock(spec=web.Request)
mock_request.transport = None

caplog.clear()
with caplog.at_level(logging.WARNING):
# This should raise HTTPBadRequest, not AssertionError
with pytest.raises(web.HTTPBadRequest) as exc_info:
await api_proxy.websocket(mock_request)

# Verify the error reason
assert exc_info.value.reason == "Connection closed"

# Verify the warning was logged
assert "WebSocket connection lost before upgrade" in caplog.text


@pytest.mark.parametrize("path", ["", "mock_path"])
async def test_api_proxy_get_request(
api_client: TestClient,
Expand Down
Loading