Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(llm): restore managed member-key fallback in effective LLM key resolution (#14992)

Alonad138b8841986
diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.py
index dd23d440f0..96d4793e64 100644
--- a/enterprise/storage/saas_settings_store.py
+++ b/enterprise/storage/saas_settings_store.py
@@ -127,10 +127,13 @@ class SaasSettingsStore(SettingsStore):
) -> SecretStr | None:
if org_member.has_custom_llm_api_key:
return org_member.llm_api_key
- # When has_custom_llm_api_key is False, only return org-level key
- # Don't fall back to org_member.llm_api_key as it may not be set
- # and accessing it would trigger decryption of an empty/null value
- return org.llm_api_key
+ if org.llm_api_key:
+ return org.llm_api_key
+ # Managed keys are stored on the member row (has_custom=False); fall back to
+ # it, but only decrypt when actually set to avoid the empty-value error (#14898).
+ if org_member._llm_api_key:
+ return org_member.llm_api_key
+ return None
@staticmethod
def _get_persisted_agent_settings(item: Settings) -> dict[str, Any]:
diff --git a/enterprise/tests/unit/test_saas_settings_store.py b/enterprise/tests/unit/test_saas_settings_store.py
index 86073ccda1..148ebaf013 100644
--- a/enterprise/tests/unit/test_saas_settings_store.py
+++ b/enterprise/tests/unit/test_saas_settings_store.py
@@ -1333,8 +1333,30 @@ class TestGetEffectiveLlmApiKey:
# Must return org key when has_custom_llm_api_key is False
assert result == SecretStr('org-api-key')
- def test_returns_org_key_when_member_has_custom_false_and_org_has_no_key(self):
- """When has_custom_llm_api_key is False but org has no key, returns None."""
+ def test_falls_back_to_managed_member_key_when_org_key_unset(self):
+ """has_custom False + no org key: fall back to the managed key on the member row.
+
+ Managed/proxy keys are persisted on org_member.llm_api_key with
+ has_custom_llm_api_key=False. #14898 dropped this fallback entirely, which
+ left managed-key users with no key (and wiped it on settings save).
+ """
+ from pydantic import SecretStr
+ from storage.saas_settings_store import SaasSettingsStore
+
+ org = MagicMock()
+ org.llm_api_key = None
+
+ member = MagicMock()
+ member.has_custom_llm_api_key = False
+ member._llm_api_key = 'encrypted-managed-key' # truthy => set
+ type(member).llm_api_key = PropertyMock(return_value=SecretStr('managed-key'))
+
+ result = SaasSettingsStore._get_effective_llm_api_key(org, member)
+
+ assert result == SecretStr('managed-key')
+
+ def test_returns_none_without_decrypting_when_member_key_unset(self):
+ """has_custom False, no org key, empty member key: None, never decrypt (#14898)."""
from storage.saas_settings_store import SaasSettingsStore
org = MagicMock()
@@ -1342,8 +1364,9 @@ class TestGetEffectiveLlmApiKey:
member = MagicMock()
member.has_custom_llm_api_key = False
+ member._llm_api_key = '' # falsy => not set; must NOT decrypt
type(member).llm_api_key = PropertyMock(
- side_effect=AssertionError('should not be accessed')
+ side_effect=AssertionError('should not decrypt an unset member key')
)
result = SaasSettingsStore._get_effective_llm_api_key(org, member)