mirror of
https://github.com/agentscope-ai/ReMe.git
synced 2026-11-16 09:21:50 +00:00
fix(workspace): validate derived storage ownership
This commit is contained in:
parent
6c60f54123
commit
25f9319c64
2 changed files with 74 additions and 1 deletions
|
|
@ -114,6 +114,23 @@ class ApplicationConfig(BaseModel):
|
|||
def derive_default_workspace(self):
|
||||
"""Normalize every workspace_dir form to an ordered mapping; the first entry is the default."""
|
||||
self.workspaces = dict(self.workspaces) or {DEFAULT_WORKSPACE_ALIAS: self.workspace_dir}
|
||||
if len(self.workspaces) > 1:
|
||||
for alias, workspace in self.workspaces.items():
|
||||
root = Path(workspace).resolve(strict=False)
|
||||
for field_name in (
|
||||
"metadata_dir",
|
||||
"session_dir",
|
||||
"mem_session_dir",
|
||||
"resource_dir",
|
||||
"daily_dir",
|
||||
"digest_dir",
|
||||
):
|
||||
subdir = getattr(self, field_name)
|
||||
if subdir and not (root / subdir).resolve(strict=False).is_relative_to(root):
|
||||
raise ValueError(
|
||||
f"{field_name} for workspace {alias!r} must stay inside the workspace "
|
||||
"in multi-workspace configurations",
|
||||
)
|
||||
return self
|
||||
|
||||
@field_validator("components", mode="before")
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ import yaml
|
|||
from reme.application import Application
|
||||
from reme.components import ApplicationContext
|
||||
from reme.config import resolve_app_config
|
||||
from reme.schema import ApplicationConfig
|
||||
from reme.enumeration import ComponentEnum
|
||||
from reme.schema import ApplicationConfig, FileNode
|
||||
|
||||
|
||||
def test_string_workspace_normalizes_to_default_alias(tmp_path):
|
||||
|
|
@ -202,3 +203,58 @@ def test_default_workspace_matches_directory_creation_source(tmp_path):
|
|||
assert app.config.workspace_dir == app.config.workspaces["main"]
|
||||
assert app.context.workspace.workspace_path == tmp_path / "main"
|
||||
assert (tmp_path / "main" / "daily").is_dir()
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"field_name",
|
||||
["metadata_dir", "session_dir", "mem_session_dir", "resource_dir", "daily_dir", "digest_dir"],
|
||||
)
|
||||
def test_multi_workspace_rejects_derived_directory_outside_root(tmp_path, field_name):
|
||||
with pytest.raises(ValidationError, match="workspace"):
|
||||
ApplicationConfig(
|
||||
workspace_dir={"alpha": str(tmp_path / "alpha"), "beta": str(tmp_path / "beta")},
|
||||
**{field_name: str(tmp_path / "shared")},
|
||||
)
|
||||
|
||||
|
||||
def test_multi_workspace_rejects_derived_directory_escape(tmp_path):
|
||||
with pytest.raises(ValidationError, match="must stay inside the workspace"):
|
||||
ApplicationConfig(
|
||||
workspace_dir={"alpha": str(tmp_path / "alpha"), "beta": str(tmp_path / "beta")},
|
||||
metadata_dir="../shared",
|
||||
)
|
||||
|
||||
|
||||
def test_single_workspace_keeps_absolute_derived_directory(tmp_path):
|
||||
external = tmp_path / "external-metadata"
|
||||
config = ApplicationConfig(workspace_dir=str(tmp_path / "single"), metadata_dir=str(external))
|
||||
context = ApplicationContext(**config.model_dump())
|
||||
|
||||
assert context.workspace.metadata_path == external
|
||||
|
||||
|
||||
def _graph_app(tmp_path):
|
||||
return Application(
|
||||
workspace_dir={"alpha": str(tmp_path / "alpha"), "beta": str(tmp_path / "beta")},
|
||||
enable_logo=False,
|
||||
log_to_console=False,
|
||||
log_to_file=False,
|
||||
service={"backend": "cli"},
|
||||
components={"file_graph": {"default": {"backend": "local"}}},
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_workspace_graph_contents_stay_isolated_across_restart(tmp_path):
|
||||
app = _graph_app(tmp_path)
|
||||
async with app:
|
||||
for alias, path in (("alpha", "daily/alpha-private.md"), ("beta", "daily/beta-note.md")):
|
||||
graph = app.context.workspaces[alias].get_component(ComponentEnum.FILE_GRAPH, "default")
|
||||
await graph.upsert_nodes([FileNode(path=path, st_mtime=1.0)])
|
||||
|
||||
reopened = _graph_app(tmp_path)
|
||||
async with reopened:
|
||||
alpha = reopened.context.workspaces["alpha"].get_component(ComponentEnum.FILE_GRAPH, "default")
|
||||
beta = reopened.context.workspaces["beta"].get_component(ComponentEnum.FILE_GRAPH, "default")
|
||||
assert [node.path for node in await alpha.get_nodes()] == ["daily/alpha-private.md"]
|
||||
assert [node.path for node in await beta.get_nodes()] == ["daily/beta-note.md"]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue