From 72b09bfee7dd54d28db4f6eada3153a9c58b3966 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 24 Mar 2023 09:37:43 -1000
Subject: [PATCH] Subclass aiohttp requests to use json helper (#90214)

* Subclass aiohttp requests to use json helper

* Subclass aiohttp requests to use json helper

* remove unneeded

* revert for new pr

* override loads is never used so drop it

* override loads is never used so drop it
---
 homeassistant/components/http/__init__.py | 44 +++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index 3106eea05fa..2d306ba5ee5 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -1,6 +1,7 @@
 """Support to serve the Home Assistant API as WSGI application."""
 from __future__ import annotations
 
+import asyncio
 import datetime
 from ipaddress import IPv4Network, IPv6Network, ip_network
 import logging
@@ -10,9 +11,13 @@ from tempfile import NamedTemporaryFile
 from typing import Any, Final, TypedDict, cast
 
 from aiohttp import web
-from aiohttp.typedefs import StrOrURL
+from aiohttp.abc import AbstractStreamWriter
+from aiohttp.http_parser import RawRequestMessage
+from aiohttp.streams import StreamReader
+from aiohttp.typedefs import JSONDecoder, StrOrURL
 from aiohttp.web_exceptions import HTTPMovedPermanently, HTTPRedirection
 from aiohttp.web_log import AccessLogger
+from aiohttp.web_protocol import RequestHandler
 from cryptography import x509
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -31,6 +36,7 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 from homeassistant.setup import async_start_setup, async_when_setup_or_start
 from homeassistant.util import ssl as ssl_util
+from homeassistant.util.json import json_loads
 
 from .auth import async_setup_auth
 from .ban import setup_bans
@@ -240,6 +246,40 @@ class HomeAssistantAccessLogger(AccessLogger):
         super().log(request, response, time)
 
 
+class HomeAssistantRequest(web.Request):
+    """Home Assistant request object."""
+
+    async def json(self, *, loads: JSONDecoder = json_loads) -> Any:
+        """Return body as JSON."""
+        # json_loads is a wrapper around orjson.loads that handles
+        # bytes and str. We can pass the bytes directly to json_loads.
+        return json_loads(await self.read())
+
+
+class HomeAssistantApplication(web.Application):
+    """Home Assistant application."""
+
+    def _make_request(
+        self,
+        message: RawRequestMessage,
+        payload: StreamReader,
+        protocol: RequestHandler,
+        writer: AbstractStreamWriter,
+        task: asyncio.Task[None],
+        _cls: type[web.Request] = HomeAssistantRequest,
+    ) -> web.Request:
+        """Create request instance."""
+        return _cls(
+            message,
+            payload,
+            protocol,
+            writer,
+            task,
+            loop=self._loop,
+            client_max_size=self._client_max_size,
+        )
+
+
 class HomeAssistantHTTP:
     """HTTP server for Home Assistant."""
 
@@ -255,7 +295,7 @@ class HomeAssistantHTTP:
         ssl_profile: str,
     ) -> None:
         """Initialize the HTTP Home Assistant server."""
-        self.app = web.Application(
+        self.app = HomeAssistantApplication(
             middlewares=[],
             client_max_size=MAX_CLIENT_SIZE,
             handler_args={