Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions python/packages/core/agent_framework/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from pydantic import BaseModel, Field

from ._feature_stage import ExperimentalFeature, experimental
from ._middleware import FunctionInvocationContext, FunctionMiddleware, MiddlewareTermination
from ._middleware import FunctionInvocationContext, FunctionMiddleware, MiddlewareFailure, MiddlewareTermination
from ._serialization import SerializationMixin
from ._sessions import AgentSession, ContextProvider
from ._tools import (
Expand Down Expand Up @@ -2880,7 +2880,11 @@ async def _process_in_scope(
binding = self._pending_record(context, violations)
except (TypeError, ValueError, OverflowError):
self._block_unsafe_approval_binding(context, context_label=context_label)
approved = self._matches_pending_approval(context, binding)
raise MiddlewareFailure( # pyright: ignore[reportUnreachable]
"Unsafe policy approval binding did not terminate"
) from None
else:
approved = self._matches_pending_approval(context, binding)

disclosed = ", ".join(item["violation_type"] for item in violations)
if approved:
Expand All @@ -2896,7 +2900,7 @@ async def _process_in_scope(
violations=violations,
binding=binding,
)
elif self.block_on_violation:
elif self.block_on_violation or self.approval_on_violation:
Comment thread
leilei3167 marked this conversation as resolved.
Resolved
self._block_policy_violation(context, context_label=context_label, violations=violations)
Comment thread
leilei3167 marked this conversation as resolved.
Resolved
else:
logger.warning("WARNING: Tool '%s' policy violation(s) [%s] (allowed)", function_name, disclosed)
Expand Down
101 changes: 101 additions & 0 deletions python/packages/core/tests/test_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -2156,6 +2156,107 @@ async def execute() -> None:
assert isinstance(context.result, dict)
assert context.result["violation_type"] == "unsafe_approval_binding"

async def test_legacy_user_identity_violation_with_approval_does_not_execute_tool(self) -> None:
"""Regression for #8761: approval_on_violation must not allow a violating call."""
tracker = LabelTrackingFunctionMiddleware()
policy = PolicyEnforcementFunctionMiddleware(approval_on_violation=True)

async def reads_user_identity() -> str:
return "secret"

source_tool = FunctionTool(
fn=reads_user_identity,
name="reads_user_identity",
description="Legacy USER_IDENTITY source without principals",
additional_properties={"source_integrity": "trusted", "confidentiality": "user_identity"},
)

async def private_sink(value: str) -> str:
return value

destination_tool = FunctionTool(
fn=private_sink,
name="microsoft_docs_fetch",
description="Private destination",
additional_properties={"max_allowed_confidentiality": "private"},
)

source_context = FunctionInvocationContext(function=source_tool, arguments={})

async def produce_identity(_context: FunctionInvocationContext) -> list[Content]:
return [Content.from_text("secret")]

await FunctionMiddlewarePipeline(tracker).execute(source_context, produce_identity)

violation_context = FunctionInvocationContext(
function=destination_tool,
arguments={"value": "x"},
)
executed = False

async def execute(_context: FunctionInvocationContext) -> list[Content]:
nonlocal executed
executed = True
return [Content.from_text("leaked")]

with pytest.raises(MiddlewareTermination):
await FunctionMiddlewarePipeline(tracker, policy).execute(violation_context, execute)

assert executed is False
assert isinstance(violation_context.result, dict)
assert violation_context.result["violation_type"] in {
"max_allowed_confidentiality",
"unsafe_approval_binding",
}

async def test_approval_on_violation_fail_closed_when_binding_record_fails(
self, monkeypatch: pytest.MonkeyPatch
) -> None:
middleware = PolicyEnforcementFunctionMiddleware(approval_on_violation=True)
monkeypatch.setattr(middleware, "_block_unsafe_approval_binding", lambda *args, **kwargs: None)

def fail_pending_record(*_args: object, **_kwargs: object) -> None:
raise ValueError("simulated pending approval binding failure")

monkeypatch.setattr(middleware, "_pending_record", fail_pending_record)

class DestinationArgs(BaseModel):
value: str = "value"

async def destination(value: str = "value") -> str:
return value

function = FunctionTool(
fn=destination,
name="private_sink",
description="Private destination",
args_schema=DestinationArgs,
additional_properties={"max_allowed_confidentiality": "private"},
)
context = FunctionInvocationContext(
function=function,
arguments=function.args_schema(value="value"), # type: ignore[attr-defined] # ty: ignore[unresolved-attribute]
)
context.metadata["context_label"] = ContentLabel(
confidentiality=ConfidentialityLabel.USER_IDENTITY,
)
context.metadata["argument_label"] = ContentLabel()
context.metadata["effective_invocation_label"] = combine_labels(
context.metadata["context_label"],
context.metadata["argument_label"],
)
executed = False

async def execute() -> None:
nonlocal executed
executed = True

with pytest.raises(MiddlewareFailure, match="Unsafe policy approval binding did not terminate"):
await middleware.process(context, execute)

assert executed is False
assert context.result is None

async def test_approval_binds_computed_argument_principals_without_label_tracker(self) -> None:
middleware = PolicyEnforcementFunctionMiddleware(approval_on_violation=True)
function = _identity_destination(_principal_metadata("user-c")[_PRINCIPALS_KEY])
Expand Down
Loading