fix(context): 补拆包遗漏的 get_current_user_role 导入,修复 host 策略静默失效

拆包时 resources.py 独立 import 头漏了 get_current_user_role:host 模式 + 非显式身份 + 存在 host 用户记录时触发 NameError,被 except 吞掉后工具分类限制与禁用模型等管理员策略静默不应用(默认无 host 记录不触发)。

- resources.py/usage.py 顺带补 TYPE_CHECKING 导入净化字符串类型注解,server/context/ 与 server/runtime/ pyflakes F821 清零
- 新增回归测试:host 模式 + HTTP 请求上下文 + host 记录存在,断言策略真正应用到 terminal;红绿验证通过(回退导入测试即红)

测试:25/25 全绿(24 + 新增 1)
This commit is contained in:
JOJO 2026-09-07 17:40:49 +08:00
parent c49e4873e0
commit 9786eec86e
3 changed files with 77 additions and 3 deletions

View File

@ -7,7 +7,10 @@ from __future__ import annotations
import time
from pathlib import Path
from typing import Optional, Tuple
from typing import Optional, Tuple, TYPE_CHECKING
if TYPE_CHECKING:
import modules.user_manager
from flask import session, has_request_context
@ -25,7 +28,7 @@ from config.model_profiles import get_registered_model_keys
from modules.i18n import tr
from server import state
from server.utils_common import debug_log
from server.auth_helpers import get_current_username, get_current_user_record
from server.auth_helpers import get_current_username, get_current_user_record, get_current_user_role
from utils.host_workspace_debug import write_host_workspace_debug
from server.context.identity import NoWorkspaceError, RuntimeIdentity, _resolve_user_role

View File

@ -1,7 +1,10 @@
"""配额追踪器UsageTracker的获取与广播。"""
from __future__ import annotations
from typing import Optional
from typing import Optional, TYPE_CHECKING
if TYPE_CHECKING:
import modules.user_manager
from modules.usage_tracker import UsageTracker
from server import state

View File

@ -126,5 +126,73 @@ class GetUserResourcesIdentityTest(unittest.TestCase):
self.assertIsNotNone(terminal)
class GetUserResourcesHostPolicyTest(unittest.TestCase):
"""回归host 模式 + 非显式身份 + host 用户记录存在时,管理员策略必须应用。
历史 bug拆包遗漏导入resources.py 调用未导入的 get_current_user_role
record 存在时触发 NameError except 吞掉后工具分类/禁用模型策略静默不应用
"""
def test_host_record_applies_admin_policy(self):
import server.context.resources as resources
host_ws = {"workspace_id": "default", "path": "/tmp/host_ws_policy", "label": "默认"}
record = MagicMock()
record.username = "host"
record.invite_code = None
policy = {
"categories": {},
"forced_category_states": {},
"disabled_models": [],
"ui_blocks": {},
"updated_at": "v1",
}
base = _base_patches()
for p in base:
p.start()
try:
with patch("server.context.resources.TERMINAL_SANDBOX_MODE", "host"), \
patch("server.context.resources.resolve_host_workspace", return_value=(None, host_ws)), \
patch("server.context.resources.get_current_user_record", return_value=record), \
patch("server.context.resources.get_current_user_role", return_value="admin") as get_role, \
patch("modules.admin_policy_manager.get_effective_policy", return_value=policy) as get_policy:
from flask import Flask
app = Flask("host_policy_test")
app.secret_key = "test"
fake_terminal = MagicMock()
fake_terminal._reaper_closing = False
fake_terminal.model_key = "kimi-k2"
# 缓存命中路径会校验 project_path 是否匹配目标工作区路径,
# 不匹配会原地重建 terminal设为 resolve 后的真实路径避免重建
resolved_path = str(Path("/tmp/host_ws_policy").resolve())
fake_terminal.project_path = resolved_path
fake_terminal.context_manager.project_path = resolved_path
ctx = app.test_request_context("/")
ctx.push()
try:
# host 分支入口要求 session["host_mode"] 为真(非显式路径)
from flask import session as flask_session
flask_session["host_mode"] = True
# 预置对话级 terminal 缓存命中,避免 WebTerminal 构造细节
with patch.dict(resources.state.user_terminals, {"host::default::conv_policy": fake_terminal}, clear=False):
terminal, _workspace = get_user_resources(
"host",
workspace_id="default",
update_session=False,
conversation_id="conv_policy",
identity=None, # 非显式HTTP 适配层路径bug 触发路径)
)
finally:
ctx.pop()
# 修复后直接证据role 解析与策略应用都被真正执行
get_role.assert_called_once_with(record)
get_policy.assert_called_once()
fake_terminal.set_admin_policy.assert_called_once()
self.assertIsNotNone(terminal)
finally:
for p in base:
p.stop()
if __name__ == "__main__":
unittest.main()