AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
Merge commit from fork
Nicholas Tindle2feefb4c2ef4
diff --git a/autogpt_platform/backend/backend/copilot/sharing/models.py b/autogpt_platform/backend/backend/copilot/sharing/models.pyindex b786f1d4d9..5ffff3ae85 100644--- a/autogpt_platform/backend/backend/copilot/sharing/models.py+++ b/autogpt_platform/backend/backend/copilot/sharing/models.py@@ -69,6 +69,7 @@ _SECRET_KEY_RE = re.compile(+ r")(?![a-z0-9])",re.IGNORECASE,)+_CAMEL_CASE_BOUNDARY_RE = re.compile(r"(?<=[a-z0-9])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])")class SharedChatLinkedExecution(BaseModel):@@ -233,7 +234,10 @@ def _redact_secret_keys(value: Any) -> Any:def _is_secret_key(key: str) -> bool:- return _SECRET_KEY_RE.search(key) is not None+ # Normalize camelCase/PascalCase transitions to the same explicit+ # boundaries already used by snake_case and kebab-case payloads.+ normalized_key = _CAMEL_CASE_BOUNDARY_RE.sub("_", key)+ return _SECRET_KEY_RE.search(normalized_key) is not Nonedef _redact_secret_keys_in_json_string(value: str) -> str:diff --git a/autogpt_platform/backend/backend/copilot/sharing/models_test.py b/autogpt_platform/backend/backend/copilot/sharing/models_test.pyindex b8f0f6a158..7e39f9e5c2 100644--- a/autogpt_platform/backend/backend/copilot/sharing/models_test.py+++ b/autogpt_platform/backend/backend/copilot/sharing/models_test.py@@ -139,6 +139,36 @@ class TestRedactSecretKeys:"id_token": "[redacted]",}+ def test_redacts_camel_and_pascal_case_secret_keys(self):+ result = _redact_secret_keys(+ {+ "accessToken": "access",+ "clientSecret": "client",+ "AuthToken": "auth",+ "refreshToken": "refresh",+ "userPassword": "password",+ "APIKey": "key",+ }+ )+ assert result == {+ "accessToken": "[redacted]",+ "clientSecret": "[redacted]",+ "AuthToken": "[redacted]",+ "refreshToken": "[redacted]",+ "userPassword": "[redacted]",+ "APIKey": "[redacted]",+ }++ def test_does_not_redact_camel_case_usage_counts(self):+ result = _redact_secret_keys(+ {"promptTokens": 100, "completionTokens": 50, "totalTokens": 150}+ )+ assert result == {+ "promptTokens": 100,+ "completionTokens": 50,+ "totalTokens": 150,+ }+class TestSanitizeChatMessage:def test_preserves_canonical_tool_display_name(self):@@ -270,3 +300,27 @@ class TestSanitizeChatMessage:payload = _json.loads(sanitized.content)assert payload["api_keys"] == "[redacted]"assert payload["count"] == 2++ def test_tool_content_redacts_nested_camel_case_secrets(self):+ msg = _msg(+ role="tool",+ content=(+ '{"result":{"accessToken":"access","nested":'+ '{"clientSecret":"client","refreshToken":"refresh"}}}'+ ),+ )++ sanitized = sanitize_chat_message(msg)++ import json as _json++ payload = _json.loads(sanitized.content)+ assert payload == {+ "result": {+ "accessToken": "[redacted]",+ "nested": {+ "clientSecret": "[redacted]",+ "refreshToken": "[redacted]",+ },+ }+ }