Skip to content

Agent Zero AI framework

Fix nested secret substitution in parallel tool calls

sparkaa8e1c042a9a
diff --git a/extensions/python/tool_execute_before/_10_unmask_secrets.py b/extensions/python/tool_execute_before/_10_unmask_secrets.py
index 3ec649d55..41f8eebe1 100644
--- a/extensions/python/tool_execute_before/_10_unmask_secrets.py
+++ b/extensions/python/tool_execute_before/_10_unmask_secrets.py
@@ -1,7 +1,28 @@
+from collections.abc import Callable
+from typing import Any
+
from helpers.extension import Extension
from helpers.secrets import get_secrets_manager
+def replace_placeholders_recursive(
+ value: Any,
+ replace: Callable[[str], str],
+) -> Any:
+ if isinstance(value, str):
+ return replace(value)
+ if isinstance(value, dict):
+ return {
+ key: replace_placeholders_recursive(item, replace)
+ for key, item in value.items()
+ }
+ if isinstance(value, list):
+ return [replace_placeholders_recursive(item, replace) for item in value]
+ if isinstance(value, tuple):
+ return tuple(replace_placeholders_recursive(item, replace) for item in value)
+ return value
+
+
class UnmaskToolSecrets(Extension):
async def execute(self, **kwargs):
@@ -17,5 +38,6 @@ class UnmaskToolSecrets(Extension):
# Unmask placeholders in args for actual tool execution
for k, v in tool_args.items():
- if isinstance(v, str):
- tool_args[k] = secrets_mgr.replace_placeholders(v)
+ tool_args[k] = replace_placeholders_recursive(
+ v, secrets_mgr.replace_placeholders
+ )
diff --git a/tests/test_unmask_tool_secrets.py b/tests/test_unmask_tool_secrets.py
new file mode 100644
index 000000000..b8f127c42
--- /dev/null
+++ b/tests/test_unmask_tool_secrets.py
@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import importlib.util
+import sys
+from pathlib import Path
+
+import pytest
+
+PROJECT_ROOT = Path(__file__).resolve().parents[1]
+if str(PROJECT_ROOT) not in sys.path:
+ sys.path.insert(0, str(PROJECT_ROOT))
+
+MODULE_PATH = (
+ PROJECT_ROOT
+ / "extensions"
+ / "python"
+ / "tool_execute_before"
+ / "_10_unmask_secrets.py"
+)
+SPEC = importlib.util.spec_from_file_location("test_unmask_tool_secrets", MODULE_PATH)
+assert SPEC and SPEC.loader
+unmask_tool_secrets = importlib.util.module_from_spec(SPEC)
+SPEC.loader.exec_module(unmask_tool_secrets)
+
+
+class _FakeSecretsManager:
+ def replace_placeholders(self, text: str) -> str:
+ return text.replace("§§secret(TOKEN)", "resolved-secret")
+
+
+class _FakeAgent:
+ context = object()
+
+
+async def test_unmask_tool_secrets_replaces_nested_parallel_arguments(monkeypatch):
+ monkeypatch.setattr(
+ unmask_tool_secrets,
+ "get_secrets_manager",
+ lambda _context: _FakeSecretsManager(),
+ )
+ tool_args = {
+ "tool_calls": [
+ {
+ "tool_name": "code_execution_tool",
+ "tool_args": {
+ "code": "curl -H 'Authorization: Bearer §§secret(TOKEN)'",
+ "options": ("§§secret(TOKEN)", 3),
+ },
+ }
+ ],
+ "metadata": {"token": "§§secret(TOKEN)"},
+ }
+
+ extension = unmask_tool_secrets.UnmaskToolSecrets(_FakeAgent())
+ await extension.execute(tool_args=tool_args)
+
+ nested_args = tool_args["tool_calls"][0]["tool_args"]
+ assert nested_args["code"] == (
+ "curl -H 'Authorization: Bearer resolved-secret'"
+ )
+ assert nested_args["options"] == ("resolved-secret", 3)
+ assert tool_args["metadata"] == {"token": "resolved-secret"}