mirror of
https://github.com/home-assistant/supervisor.git
synced 2026-05-19 22:28:52 +01:00
bc24fb5449
* Refactor API registration to support v1/v2 via shared methods - Add AppVersion StrEnum (V1, V2) to supervisor/api/const.py - Replace self.v2_app with self._v2_app and expose a versions property (dict[AppVersion, web.Application]) computed dynamically so that test fixtures reassigning self.webapp are automatically reflected in V1 - All _register_* methods now accept a required app: web.Application parameter; version-specific routes are gated with "if app is self.versions[AppVersion.V1/V2]:" - load() loops over enabled_versions (V1 always, V2 when feature-flagged) and calls each registration method once per version, no duplication - Static resources are registered before webapp.add_subapp() to avoid registering into a frozen router - add_subapp uses self.webapp directly for readability - Fold _register_v2_apps/_register_v2_backups/_register_v2_store into their respective unified methods; remove the now-defunct _register_v2_* helpers and the _api_apps/_api_backups/_api_store instance vars - _register_proxy and _register_ingress updated to accept app; legacy /homeassistant/* proxy routes gated behind V1 conditional Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add dual v1/v2 parametrization to API tests All 163 tests across 17 API modules that register identically on both v1 and v2 now run against both versions via api_client_with_prefix. - tests/api/conftest.py: advanced_logs_tester switched to api_client_with_prefix so log-endpoint tests are auto-parametrized; accepts optional v2_path_prefix kwarg for paths that differ by version - tests/api/test_{auth,discovery,dns,docker,hardware,host,ingress, jobs,mounts,network,os,resolution,security,services,supervisor}.py: api_client -> api_client_with_prefix with path prefix unpacking - supervisor/api/__init__.py: _register_panel() moved outside the version loop -- frontend static assets are V1-only - tests/api/test_panel.py: kept on plain api_client (V1-only) Tests intentionally kept V1-only: - auth/discovery: use indirect api_client parametrize for addon context - homeassistant: all tests call legacy /homeassistant/* paths (V1-only) - jobs (4 tests): inner @Job-decorated classes register names into a module-level set; re-running the same test raises RuntimeError Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Extend dual v1/v2 parametrization to homeassistant and jobs tests tests/api/conftest.py: - Add core_api_client_with_root fixture parametrized over three paths: v1-core: /core/... (canonical v1 path) v1-legacy: /homeassistant/... (legacy v1 alias, same handlers) v2-core: /v2/core/... (canonical v2 path) tests/api/test_homeassistant.py: - Switch all 17 api_client tests to core_api_client_with_root so each test runs against all three access paths (v1 canonical, v1 legacy alias, v2 canonical), exercising every registered route tests/api/test_jobs.py: - Promote four inner TestClass definitions to module-level helpers (_JobsTreeTestHelper, _JobManualCleanupTestHelper, _JobsSortedTestHelper, _JobWithErrorTestHelper) so that @Job name registration into the global _JOB_NAMES set only happens once at import time rather than on each parametrized test run - Replace closure references to outer-scope coresys with self.coresys - Use api_client_with_prefix for dual-version coverage Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
237 lines
8.9 KiB
Python
237 lines
8.9 KiB
Python
"""Test ingress API."""
|
|
|
|
from collections.abc import AsyncGenerator
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import aiohttp
|
|
from aiohttp import hdrs, web
|
|
from aiohttp.test_utils import TestClient, TestServer
|
|
import pytest
|
|
|
|
from supervisor.addons.addon import App
|
|
from supervisor.coresys import CoreSys
|
|
|
|
|
|
@pytest.fixture(name="real_websession")
|
|
async def fixture_real_websession(
|
|
coresys: CoreSys,
|
|
) -> AsyncGenerator[aiohttp.ClientSession]:
|
|
"""Fixture for real aiohttp ClientSession for ingress proxy tests."""
|
|
session = aiohttp.ClientSession()
|
|
coresys._websession = session # pylint: disable=W0212
|
|
yield session
|
|
await session.close()
|
|
|
|
|
|
async def test_validate_session(
|
|
api_client_with_prefix: tuple[TestClient, str], coresys: CoreSys
|
|
):
|
|
"""Test validating ingress session."""
|
|
api_client, prefix = api_client_with_prefix
|
|
with patch("aiohttp.web_request.BaseRequest.__getitem__", return_value=None):
|
|
resp = await api_client.post(
|
|
f"{prefix}/ingress/validate_session",
|
|
json={"session": "non-existing"},
|
|
)
|
|
assert resp.status == 401
|
|
|
|
with patch(
|
|
"aiohttp.web_request.BaseRequest.__getitem__",
|
|
return_value=coresys.homeassistant,
|
|
):
|
|
resp = await api_client.post(f"{prefix}/ingress/session")
|
|
result = await resp.json()
|
|
|
|
assert "session" in result["data"]
|
|
session = result["data"]["session"]
|
|
assert session in coresys.ingress.sessions
|
|
|
|
valid_time = coresys.ingress.sessions[session]
|
|
|
|
resp = await api_client.post(
|
|
f"{prefix}/ingress/validate_session",
|
|
json={"session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert await resp.json() == {"result": "ok", "data": {}}
|
|
|
|
assert coresys.ingress.sessions[session] > valid_time
|
|
|
|
|
|
async def test_validate_session_with_user_id(
|
|
api_client_with_prefix: tuple[TestClient, str],
|
|
coresys: CoreSys,
|
|
ha_ws_client: AsyncMock,
|
|
):
|
|
"""Test validating ingress session with user ID passed."""
|
|
api_client, prefix = api_client_with_prefix
|
|
with patch("aiohttp.web_request.BaseRequest.__getitem__", return_value=None):
|
|
resp = await api_client.post(
|
|
f"{prefix}/ingress/validate_session",
|
|
json={"session": "non-existing"},
|
|
)
|
|
assert resp.status == 401
|
|
|
|
with patch(
|
|
"aiohttp.web_request.BaseRequest.__getitem__",
|
|
return_value=coresys.homeassistant,
|
|
):
|
|
ha_ws_client.async_send_command.return_value = [
|
|
{"id": "some-id", "name": "Some Name", "username": "sn"}
|
|
]
|
|
|
|
resp = await api_client.post(
|
|
f"{prefix}/ingress/session", json={"user_id": "some-id"}
|
|
)
|
|
result = await resp.json()
|
|
|
|
assert {"type": "config/auth/list"} in [
|
|
call.args[0] for call in ha_ws_client.async_send_command.call_args_list
|
|
]
|
|
|
|
assert "session" in result["data"]
|
|
session = result["data"]["session"]
|
|
assert session in coresys.ingress.sessions
|
|
|
|
valid_time = coresys.ingress.sessions[session]
|
|
|
|
resp = await api_client.post(
|
|
f"{prefix}/ingress/validate_session",
|
|
json={"session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert await resp.json() == {"result": "ok", "data": {}}
|
|
|
|
assert coresys.ingress.sessions[session] > valid_time
|
|
|
|
assert session in coresys.ingress.sessions_data
|
|
assert coresys.ingress.get_session_data(session).user.id == "some-id"
|
|
assert coresys.ingress.get_session_data(session).user.username == "sn"
|
|
assert coresys.ingress.get_session_data(session).user.name == "Some Name"
|
|
|
|
|
|
async def test_ingress_proxy_no_content_type_for_empty_body_responses(
|
|
api_client_with_prefix: tuple[TestClient, str],
|
|
coresys: CoreSys,
|
|
real_websession: aiohttp.ClientSession,
|
|
):
|
|
"""Test that empty body responses don't get Content-Type header."""
|
|
api_client, prefix = api_client_with_prefix
|
|
|
|
# Create a mock app backend server that returns various status codes
|
|
async def mock_app_handler(request: web.Request) -> web.Response:
|
|
"""Mock app handler that returns different status codes based on path."""
|
|
path = request.path
|
|
|
|
if path == "/204":
|
|
# 204 No Content - should not have Content-Type
|
|
return web.Response(status=204)
|
|
elif path == "/304":
|
|
# 304 Not Modified - should not have Content-Type
|
|
return web.Response(status=304)
|
|
elif path == "/100":
|
|
# 100 Continue - should not have Content-Type
|
|
return web.Response(status=100)
|
|
elif path == "/head":
|
|
# HEAD request - should have Content-Type (same as GET would)
|
|
return web.Response(body=b"test", content_type="text/html")
|
|
elif path == "/200":
|
|
# 200 OK with body - should have Content-Type
|
|
return web.Response(body=b"test content", content_type="text/plain")
|
|
elif path == "/200-no-content-type":
|
|
# 200 OK without explicit Content-Type - should get default
|
|
return web.Response(body=b"test content")
|
|
elif path == "/200-json":
|
|
# 200 OK with JSON - should preserve Content-Type
|
|
return web.Response(
|
|
body=b'{"key": "value"}', content_type="application/json"
|
|
)
|
|
else:
|
|
return web.Response(body=b"default", content_type="text/html")
|
|
|
|
# Create test server for mock app
|
|
app = web.Application()
|
|
app.router.add_route("*", "/{tail:.*}", mock_app_handler)
|
|
app_server = TestServer(app)
|
|
await app_server.start_server()
|
|
|
|
try:
|
|
# Create ingress session
|
|
resp = await api_client.post(f"{prefix}/ingress/session")
|
|
result = await resp.json()
|
|
session = result["data"]["session"]
|
|
|
|
# Create a mock app
|
|
mock_app = MagicMock(spec=App)
|
|
mock_app.slug = "test_addon"
|
|
mock_app.ip_address = app_server.host
|
|
mock_app.ingress_port = app_server.port
|
|
mock_app.ingress_stream = False
|
|
|
|
# Generate an ingress token and register the app
|
|
ingress_token = coresys.ingress.create_session()
|
|
with patch.object(coresys.ingress, "get", return_value=mock_app):
|
|
# Test 204 No Content - should NOT have Content-Type
|
|
resp = await api_client.get(
|
|
f"{prefix}/ingress/{ingress_token}/204",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 204
|
|
assert hdrs.CONTENT_TYPE not in resp.headers
|
|
|
|
# Test 304 Not Modified - should NOT have Content-Type
|
|
resp = await api_client.get(
|
|
f"{prefix}/ingress/{ingress_token}/304",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 304
|
|
assert hdrs.CONTENT_TYPE not in resp.headers
|
|
|
|
# Test HEAD request - SHOULD have Content-Type (same as GET)
|
|
# per RFC 9110: HEAD should return same headers as GET
|
|
resp = await api_client.head(
|
|
f"{prefix}/ingress/{ingress_token}/head",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert hdrs.CONTENT_TYPE in resp.headers
|
|
assert "text/html" in resp.headers[hdrs.CONTENT_TYPE]
|
|
# Body should be empty for HEAD
|
|
body = await resp.read()
|
|
assert body == b""
|
|
|
|
# Test 200 OK with body - SHOULD have Content-Type
|
|
resp = await api_client.get(
|
|
f"{prefix}/ingress/{ingress_token}/200",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert hdrs.CONTENT_TYPE in resp.headers
|
|
assert resp.headers[hdrs.CONTENT_TYPE] == "text/plain"
|
|
body = await resp.read()
|
|
assert body == b"test content"
|
|
|
|
# Test 200 OK without explicit Content-Type - SHOULD get default
|
|
resp = await api_client.get(
|
|
f"{prefix}/ingress/{ingress_token}/200-no-content-type",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert hdrs.CONTENT_TYPE in resp.headers
|
|
# Should get application/octet-stream as default from aiohttp ClientResponse
|
|
assert "application/octet-stream" in resp.headers[hdrs.CONTENT_TYPE]
|
|
|
|
# Test 200 OK with JSON - SHOULD preserve Content-Type
|
|
resp = await api_client.get(
|
|
f"{prefix}/ingress/{ingress_token}/200-json",
|
|
cookies={"ingress_session": session},
|
|
)
|
|
assert resp.status == 200
|
|
assert hdrs.CONTENT_TYPE in resp.headers
|
|
assert "application/json" in resp.headers[hdrs.CONTENT_TYPE]
|
|
body = await resp.read()
|
|
assert body == b'{"key": "value"}'
|
|
|
|
finally:
|
|
await app_server.close()
|