APIForbidden should result in 403 status

supervisor/api/utils.py

@@ -129,12 +129,15 @@ def api_return_error(
         JSON_RESULT: RESULT_ERROR,
         JSON_MESSAGE: message or "Unknown error, see supervisor",
     }
-    if isinstance(error, APIError) and error.job_id:
-        result[JSON_JOB_ID] = error.job_id
+    status = 400
+    if isinstance(error, APIError):
+        status = error.status
+        if error.job_id:
+            result[JSON_JOB_ID] = error.job_id
 
     return web.json_response(
         result,
-        status=400,
+        status=status,
         dumps=json_dumps,
     )
 

supervisor/exceptions.py

@@ -308,6 +308,8 @@ class HostLogError(HostError):
 class APIError(HassioError, RuntimeError):
     """API errors."""
 
+    status = 400
+
     def __init__(
         self,
         message: str | None = None,
@@ -322,6 +324,8 @@ def __init__(
 class APIForbidden(APIError):
     """API forbidden error."""
 
+    status = 403
+
 
 class APIAddonNotInstalled(APIError):
     """Not installed addon requested at addons API."""

tests/api/test_discovery.py

@@ -25,7 +25,7 @@ async def test_api_discovery_forbidden(
     with caplog.at_level(logging.ERROR):
         resp = await api_client.post("/discovery", json={"service": "mqtt"})
 
-    assert resp.status == 400
+    assert resp.status == 403
     result = await resp.json()
     assert result["result"] == "error"
     assert (