youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-05 09:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(dify-cli): session level tool white list

Browse Source
This commit is contained in:
Harry
2026-01-26 18:09:14 +08:00
parent a9e1394011
commit 89eb7b17db
9 changed files with 152 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/core/sandbox/bash/TODO.md
View File

@ -1 +0,0 @@
# refactor the package import paths

6
api/core/sandbox/bash/session.py
View File

@ -6,7 +6,8 @@ from io import BytesIO
from types import TracebackType
from core.sandbox.sandbox import Sandbox
from core.session.cli_api import CliApiSession, CliApiSessionManager
from core.session.cli_api import CliApiSession, CliApiSessionManager, CliContext
from core.skill.entities import ToolAccessPolicy
from core.skill.entities.tool_dependencies import ToolDependencies
from core.virtual_environment.__base.helpers import pipeline
@ -37,6 +38,7 @@ class SandboxBashSession:
self._cli_api_session = CliApiSessionManager().create(
tenant_id=self._tenant_id,
user_id=self._user_id,
context=CliContext(tool_access=ToolAccessPolicy.from_dependencies(self._tools)),
)
if self._tools is not None and not self._tools.is_empty():
tools_path = self._setup_node_tools_directory(self._node_id, self._tools, self._cli_api_session)
@ -55,7 +57,7 @@ class SandboxBashSession:
node_id: str,
tools: ToolDependencies,
cli_api_session: CliApiSession,
) -> str | None:
) -> str:
node_tools_path = f"{DifyCli.TOOLS_ROOT}/{node_id}"
vm = self._sandbox.vm

9
api/core/sandbox/initializer/dify_cli_initializer.py
View File

@ -6,7 +6,8 @@ from io import BytesIO
from pathlib import Path
from core.sandbox.sandbox import Sandbox
from core.session.cli_api import CliApiSessionManager
from core.session.cli_api import CliApiSessionManager, CliContext
from core.skill.entities import ToolAccessPolicy
from core.skill.skill_manager import SkillManager
from core.virtual_environment.__base.helpers import pipeline
@ -63,7 +64,11 @@ class DifyCliInitializer(AsyncSandboxInitializer):
logger.info("No tools found in bundle for assets_id=%s", self._assets_id)
return
self._cli_api_session = CliApiSessionManager().create(tenant_id=self._tenant_id, user_id=self._user_id)
self._cli_api_session = CliApiSessionManager().create(
tenant_id=self._tenant_id,
user_id=self._user_id,
context=CliContext(tool_access=ToolAccessPolicy.from_dependencies(bundle.get_tool_dependencies())),
)
pipeline(vm).add(
["mkdir", "-p", DifyCli.GLOBAL_TOOLS_PATH], error_message="Failed to create global tools dir"