From a48f88033d853a418149a569bf7513775ab946f7 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:40:01 +0100
Subject: [PATCH] Fix file uploads in MQTT config flow not processed in
 executor (#130746)

Process file uploads in MQTT config flow in executor
---
 homeassistant/components/mqtt/config_flow.py | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index e94f734069a..3ed88d0d823 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
     CONF_PROTOCOL,
     CONF_USERNAME,
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.hassio import is_hassio
@@ -737,6 +737,16 @@ class MQTTOptionsFlowHandler(OptionsFlow):
         )
 
 
+async def _get_uploaded_file(hass: HomeAssistant, id: str) -> str:
+    """Get file content from uploaded file."""
+
+    def _proces_uploaded_file() -> str:
+        with process_uploaded_file(hass, id) as file_path:
+            return file_path.read_text(encoding=DEFAULT_ENCODING)
+
+    return await hass.async_add_executor_job(_proces_uploaded_file)
+
+
 async def async_get_broker_settings(
     flow: ConfigFlow | OptionsFlow,
     fields: OrderedDict[Any, Any],
@@ -795,8 +805,7 @@ async def async_get_broker_settings(
             return False
         certificate_id: str | None = user_input.get(CONF_CERTIFICATE)
         if certificate_id:
-            with process_uploaded_file(hass, certificate_id) as certificate_file:
-                certificate = certificate_file.read_text(encoding=DEFAULT_ENCODING)
+            certificate = await _get_uploaded_file(hass, certificate_id)
 
         # Return to form for file upload CA cert or client cert and key
         if (
@@ -812,15 +821,9 @@ async def async_get_broker_settings(
             return False
 
         if client_certificate_id:
-            with process_uploaded_file(
-                hass, client_certificate_id
-            ) as client_certificate_file:
-                client_certificate = client_certificate_file.read_text(
-                    encoding=DEFAULT_ENCODING
-                )
+            client_certificate = await _get_uploaded_file(hass, client_certificate_id)
         if client_key_id:
-            with process_uploaded_file(hass, client_key_id) as key_file:
-                client_key = key_file.read_text(encoding=DEFAULT_ENCODING)
+            client_key = await _get_uploaded_file(hass, client_key_id)
 
         certificate_data: dict[str, Any] = {}
         if certificate: