mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-11-20 03:10:34 +00:00
* fix(subagents): revalidate durable batch owners before execution * fix(subagents): log batch owner lookup failures safely --------- Co-authored-by: Totoro-qaq <279883115+Totoro-qaq@users.noreply.github.com>
48 lines
2.3 KiB
Python
48 lines
2.3 KiB
Python
"""Resolve durable item owners through the Gateway's current account store."""
|
|
|
|
import logging
|
|
|
|
from app.gateway.auth_disabled import AUTH_DISABLED_USER_ID, get_auth_disabled_user, is_auth_disabled
|
|
from deerflow.authz.provider import Principal
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
async def resolve_batch_principal(batch, *, load_user) -> Principal:
|
|
owner = batch["user_id"]
|
|
spec = batch["execution_spec"]
|
|
internal = spec.get("is_internal") is True
|
|
if owner == AUTH_DISABLED_USER_ID and is_auth_disabled():
|
|
user = get_auth_disabled_user()
|
|
else:
|
|
try:
|
|
if load_user is None:
|
|
raise RuntimeError("Account repository unavailable")
|
|
user = await load_user(owner)
|
|
except Exception as exc:
|
|
# Database exception text can contain SQL parameters or credentials.
|
|
logger.warning("Batch owner lookup failed (batch_id=%s, error_type=%s)", batch.get("id"), type(exc).__name__)
|
|
raise PermissionError("Batch owner could not be verified") from None
|
|
if user is None:
|
|
# Gateway stamps no role on an unmapped, trusted internal identity.
|
|
# A missing formerly mapped account must not take this fallback.
|
|
if internal and spec.get("user_role") is None:
|
|
return Principal(user_id=owner, is_internal=True, channel_user_id=spec.get("channel_user_id"))
|
|
raise PermissionError("Batch owner is no longer available")
|
|
if str(user.id) != owner or getattr(user, "disabled", False) or user.needs_setup:
|
|
raise PermissionError("Batch owner is no longer active")
|
|
if user.system_role != spec.get("user_role"):
|
|
# Custom roles are not ordered. Refuse changed grants rather than
|
|
# retaining a revoked role or widening old work after a promotion.
|
|
raise PermissionError("Batch owner role changed; submit a new batch with current permissions")
|
|
return Principal(
|
|
user_id=owner,
|
|
role=user.system_role,
|
|
oauth_provider=user.oauth_provider,
|
|
oauth_id=getattr(user, "oauth_id", None),
|
|
channel_user_id=spec.get("channel_user_id"),
|
|
is_internal=internal,
|
|
# Gateway admission does not mint ABAC attributes. Stored attributes
|
|
# and OAuth claims are not a renewable source of authority.
|
|
)
|