mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-04-06 03:03:36 +00:00
refactor: use unified get_media_dir() to get media path
This commit is contained in:
parent
624f607872
commit
84c4ba7609
@ -7,6 +7,7 @@ from typing import Any
|
||||
|
||||
from nanobot.agent.tools.base import Tool
|
||||
from nanobot.utils.helpers import build_image_content_blocks, detect_image_mime
|
||||
from nanobot.config.paths import get_media_dir
|
||||
|
||||
|
||||
def _resolve_path(
|
||||
@ -21,8 +22,7 @@ def _resolve_path(
|
||||
p = workspace / p
|
||||
resolved = p.resolve()
|
||||
if allowed_dir:
|
||||
from nanobot.config.paths import get_runtime_subdir
|
||||
media_path = get_runtime_subdir("media").resolve()
|
||||
media_path = get_media_dir().resolve()
|
||||
all_dirs = [allowed_dir] + [media_path] + (extra_allowed_dirs or [])
|
||||
if not any(_is_under(resolved, d) for d in all_dirs):
|
||||
raise PermissionError(f"Path {path} is outside allowed directory {allowed_dir}")
|
||||
|
||||
@ -10,6 +10,7 @@ from typing import Any
|
||||
from loguru import logger
|
||||
|
||||
from nanobot.agent.tools.base import Tool
|
||||
from nanobot.config.paths import get_media_dir
|
||||
|
||||
|
||||
class ExecTool(Tool):
|
||||
@ -184,9 +185,7 @@ class ExecTool(Tool):
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
from nanobot.config.paths import get_runtime_subdir
|
||||
media_path = get_runtime_subdir("media").resolve()
|
||||
|
||||
media_path = get_media_dir().resolve()
|
||||
if (p.is_absolute()
|
||||
and cwd_path not in p.parents
|
||||
and p != cwd_path
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user