Add custom ssl_context to aiohttp helper

homeassistant/components/isy994/__init__.py

@@ -152,7 +152,7 @@ async def async_setup_entry(
         https = False
         port = host.port or 80
         session = aiohttp_client.async_create_clientsession(
-            hass, verify_ssl=False, cookie_jar=CookieJar(unsafe=True)
+            hass, ssl_context=False, cookie_jar=CookieJar(unsafe=True)
         )
     elif host.scheme == "https":
         https = True

homeassistant/components/isy994/config_flow.py

@@ -72,7 +72,7 @@ async def validate_input(
         https = False
         port = host.port or HTTP_PORT
         session = aiohttp_client.async_create_clientsession(
-            hass, verify_ssl=False, cookie_jar=CookieJar(unsafe=True)
+            hass, ssl_context=False, cookie_jar=CookieJar(unsafe=True)
         )
     elif host.scheme == SCHEME_HTTPS:
         https = True

homeassistant/components/unifi/controller.py

@@ -451,7 +451,7 @@ async def get_unifi_controller(
             sslcontext = ssl.create_default_context(cafile=verify_ssl)
     else:
         session = aiohttp_client.async_create_clientsession(
-            hass, verify_ssl=verify_ssl, cookie_jar=CookieJar(unsafe=True)
+            hass, ssl_context=verify_ssl, cookie_jar=CookieJar(unsafe=True)
         )
 
     controller = aiounifi.Controller(

homeassistant/helpers/aiohttp_client.py

@@ -4,6 +4,7 @@
 import asyncio
 from collections.abc import Awaitable, Callable
 from contextlib import suppress
+import logging
 from ssl import SSLContext
 import sys
 from types import MappingProxyType
@@ -27,6 +28,7 @@
 if TYPE_CHECKING:
     from aiohttp.typedefs import JSONDecoder
 
+_LOGGER = logging.getLogger(__name__)
 
 DATA_CONNECTOR = "aiohttp_connector"
 DATA_CONNECTOR_NOTVERIFY = "aiohttp_connector_notverify"
@@ -77,7 +79,8 @@ def async_get_clientsession(
 @bind_hass
 def async_create_clientsession(
     hass: HomeAssistant,
-    verify_ssl: bool = True,
+    verify_ssl: bool | None = None,
+    ssl_context: bool | SSLContext = True,
     auto_cleanup: bool = True,
     **kwargs: Any,
 ) -> aiohttp.ClientSession:
@@ -90,13 +93,19 @@ def async_create_clientsession(
 
     This method must be run in the event loop.
     """
+    if verify_ssl is not None:
+        ssl_context = verify_ssl
+        _LOGGER.error(
+            "The 'verify_ssl' argument of 'async_create_clientsession' is deprecated and replaced by the 'ssl_context' parameter"
+        )
+
     auto_cleanup_method = None
     if auto_cleanup:
         auto_cleanup_method = _async_register_clientsession_shutdown
 
     clientsession = _async_create_clientsession(
         hass,
-        verify_ssl,
+        ssl_context,
         auto_cleanup_method=auto_cleanup_method,
         **kwargs,
     )
@@ -107,14 +116,14 @@ def async_create_clientsession(
 @callback
 def _async_create_clientsession(
     hass: HomeAssistant,
-    verify_ssl: bool = True,
+    ssl_context: bool | SSLContext = True,
     auto_cleanup_method: Callable[[HomeAssistant, aiohttp.ClientSession], None]
     | None = None,
     **kwargs: Any,
 ) -> aiohttp.ClientSession:
     """Create a new ClientSession with kwargs, i.e. for cookies."""
     clientsession = aiohttp.ClientSession(
-        connector=_async_get_connector(hass, verify_ssl),
+        connector=_async_get_connector(hass, ssl_context),
         json_serialize=json_dumps,
         response_class=HassClientResponse,
         **kwargs,
@@ -239,24 +248,25 @@ def _async_close_websession(event: Event) -> None:
 
 @callback
 def _async_get_connector(
-    hass: HomeAssistant, verify_ssl: bool = True
+    hass: HomeAssistant, ssl_context: bool | SSLContext = True
 ) -> aiohttp.BaseConnector:
     """Return the connector pool for aiohttp.
 
     This method must be run in the event loop.
     """
-    key = DATA_CONNECTOR if verify_ssl else DATA_CONNECTOR_NOTVERIFY
+    key = None
+    if isinstance(ssl_context, bool):
+        key = DATA_CONNECTOR if ssl_context else DATA_CONNECTOR_NOTVERIFY
 
-    if key in hass.data:
-        return cast(aiohttp.BaseConnector, hass.data[key])
+        if key in hass.data:
+            return cast(aiohttp.BaseConnector, hass.data[key])
 
-    if verify_ssl:
-        ssl_context: bool | SSLContext = ssl_util.client_context()
-    else:
-        ssl_context = False
+    if ssl_context is True:
+        ssl_context = ssl_util.client_context()
 
     connector = aiohttp.TCPConnector(enable_cleanup_closed=True, ssl=ssl_context)
-    hass.data[key] = connector
+    if key is not None:
+        hass.data[key] = connector
 
     async def _async_close_connector(event: Event) -> None:
         """Close connector pool."""