From 0d5f43520c85b2fff16cc25176135e74eda68828 Mon Sep 17 00:00:00 2001
From: Xiyuan Chen <52963600+GareArc@users.noreply.github.com>
Date: Mon, 29 Jun 2026 00:03:50 -0700
Subject: [PATCH] fix(api): wire dedicated timeout into inner RBAC requests
 (#38150)

---
 api/configs/enterprise/__init__.py      | 6 ++++++
 api/services/enterprise/rbac_service.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/api/configs/enterprise/__init__.py b/api/configs/enterprise/__init__.py
index 27318911201..3aeffe4c0f4 100644
--- a/api/configs/enterprise/__init__.py
+++ b/api/configs/enterprise/__init__.py
@@ -34,6 +34,12 @@ class EnterpriseFeatureConfig(BaseSettings):
         default=False,
     )
 
+    ENTERPRISE_RBAC_REQUEST_TIMEOUT: int = Field(
+        ge=1,
+        description="Maximum timeout in seconds for inner RBAC requests.",
+        default=30,
+    )
+
 
 class EnterpriseTelemetryConfig(BaseSettings):
     """
diff --git a/api/services/enterprise/rbac_service.py b/api/services/enterprise/rbac_service.py
index 11d7fa82399..ff790b1690c 100644
--- a/api/services/enterprise/rbac_service.py
+++ b/api/services/enterprise/rbac_service.py
@@ -743,6 +743,7 @@ def _inner_call(
         account_id=account_id,
         json=json,
         params=params,
+        timeout=dify_config.ENTERPRISE_RBAC_REQUEST_TIMEOUT,
     )