From 8f7df990bdb6cab1eeb9a1ccf0d0db00d487da73 Mon Sep 17 00:00:00 2001
From: Saiteja Bandaru <saitejabandaru@users.noreply.github.com>
Date: Tue, 25 Aug 2026 23:16:06 +0200
Subject: [PATCH] Fix DeadlockImminentError in async Connection resolution

When fetching a connection in an async context, `Connection.async_get()` builds the connection and caches its URI. The sync `get_uri()` internally accesses `extra_dejson`, which parses and masks secrets using a synchronous IPC call (`mask_secret`), thereby blocking the async event loop and throwing `DeadlockImminentError`.\n\nThis adds `aextra_dejson` and `aget_uri` coroutines to `Connection` that use the asynchronous `amask_secret` variant, and updates the task execution context to await `aget_uri` when caching.
---
 .../src/airflow/sdk/definitions/connection.py | 76 +++++++++++++++++++
 .../src/airflow/sdk/execution_time/context.py |  2 +-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/task-sdk/src/airflow/sdk/definitions/connection.py b/task-sdk/src/airflow/sdk/definitions/connection.py
index 06a95a3b868b8..6acc0ac5d1679 100644
--- a/task-sdk/src/airflow/sdk/definitions/connection.py
+++ b/task-sdk/src/airflow/sdk/definitions/connection.py
@@ -290,6 +290,82 @@ async def async_get(cls, conn_id: str) -> Any:
         except AirflowRuntimeError as e:
             cls._handle_connection_error(e, conn_id)
 
+    @property
+    async def aextra_dejson(self) -> dict:
+        """Async version: Returns the extra property by deserializing json and masking secrets."""
+        from airflow.sdk.log import amask_secret
+
+        extra = {}
+        if self.extra:
+            try:
+                import json
+                extra = json.loads(self.extra)
+            except Exception:
+                log.exception("Failed to deserialize extra property `extra`, returning empty dictionary")
+            else:
+                await amask_secret(extra)
+        return extra
+
+    async def aget_uri(self) -> str:
+        """Async version: Generate and return connection in URI format."""
+        from urllib.parse import parse_qsl, quote, urlencode
+
+        if self.conn_type:
+            uri = f"{self.conn_type.lower().replace('_', '-')}://"
+        else:
+            uri = "//"
+        host_to_use: str | None
+        if self.host and "://" in self.host:
+            protocol, host = self.host.split("://", 1)
+            # If the protocol in host matches the connection type, don't add it again
+            if protocol == self.conn_type:
+                host_to_use = self.host
+                protocol_to_add = None
+            else:
+                # Different protocol, add it to the URI
+                host_to_use = host
+                protocol_to_add = protocol
+        else:
+            host_to_use = self.host
+            protocol_to_add = None
+
+        if protocol_to_add:
+            uri += f"{protocol_to_add}://"
+
+        authority_block = ""
+        if self.login is not None:
+            authority_block += quote(self.login, safe="")
+        if self.password is not None:
+            authority_block += ":" + quote(self.password, safe="")
+        if authority_block > "":
+            authority_block += "@"
+            uri += authority_block
+
+        host_block = ""
+        if host_to_use:
+            host_block += quote(host_to_use, safe="")
+        if self.port:
+            if host_block == "" and authority_block == "":
+                host_block += f"@:{self.port}"
+            else:
+                host_block += f":{self.port}"
+        if self.schema:
+            host_block += f"/{quote(self.schema, safe='')}"
+        uri += host_block
+
+        if self.extra:
+            try:
+                extra_dejson = await self.aextra_dejson()
+                query: str | None = urlencode(extra_dejson)
+            except TypeError:
+                query = None
+            if query and extra_dejson == dict(parse_qsl(query, keep_blank_values=True)):
+                uri += ("?" if self.schema else "/?") + query
+            else:
+                uri += ("?" if self.schema else "/?") + urlencode({self.EXTRA_KEY: self.extra})
+
+        return uri
+
     @property
     def extra_dejson(self) -> dict:
         """Returns the extra property by deserializing json."""
diff --git a/task-sdk/src/airflow/sdk/execution_time/context.py b/task-sdk/src/airflow/sdk/execution_time/context.py
index 2c2364a49b2f5..73ac669d945a1 100644
--- a/task-sdk/src/airflow/sdk/execution_time/context.py
+++ b/task-sdk/src/airflow/sdk/execution_time/context.py
@@ -297,7 +297,7 @@ async def _async_get_connection(conn_id: str) -> Connection:
                 conn = await sync_to_async(secrets_backend.get_connection)(conn_id)  # type: ignore[assignment]
 
             if conn:
-                SecretCache.save_connection_uri(conn_id, conn.get_uri())
+                SecretCache.save_connection_uri(conn_id, await conn.aget_uri())
                 await _amask_connection_secrets(conn)
                 return conn
         except AirflowSecretsBackendAccessDenied: