mcp/ppl: mcp_tool criterion should ignore non-tool call requests (#5695)

## Summary

## Related issues

Fix
https://linear.app/pomerium/issue/ENG-2543/mcp-tool-ignore-non-jsonrpc-calls

## User Explanation

<!-- How would you explain this change to the user? If this
change doesn't create any user-facing changes, you can leave
this blank. If filled out, add the `docs` label -->

## Checklist

- [x] reference any related issues
- [x] updated unit tests
- [x] add appropriate label (`enhancement`, `bug`, `breaking`,
`dependencies`, `ci`)
- [x] ready for review
This commit is contained in:
Denis Mishin 2025-07-07 14:22:22 -07:00 committed by GitHub
parent ecc5ecf881
commit a577f53ff4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 5 deletions

View file

@ -23,29 +23,38 @@ func (c mcpToolCriterion) GenerateRule(_ string, data parser.Value) (*ast.Rule,
r1 := c.g.NewRule(c.Name())
r1.Head.Value = NewCriterionTerm(true, ReasonMCPNotAToolCall)
r1.Body = ast.Body{
ast.MustParseExpr(`input.mcp.method != "tools/call"`),
ast.MustParseExpr(`not input.mcp.method`),
}
r2 := &ast.Rule{
Head: generator.NewHead("", NewCriterionTerm(true, ReasonMCPNotAToolCall)),
Body: ast.Body{
ast.MustParseExpr(`input.mcp.method`),
ast.MustParseExpr(`input.mcp.method != "tools/call"`),
},
}
r1.Else = r2
r3 := &ast.Rule{
Head: generator.NewHead("", NewCriterionTerm(true, ReasonMCPToolOK)),
Body: ast.Body{
ast.MustParseExpr(`input.mcp.method == "tools/call"`),
},
}
toolRef := ast.RefTerm(ast.VarTerm("input"), ast.VarTerm("mcp"), ast.VarTerm("tool_call"), ast.VarTerm("name"))
err := matchString(&r2.Body, toolRef, data)
err := matchString(&r3.Body, toolRef, data)
if err != nil {
return nil, nil, err
}
r1.Else = r2
r2.Else = r3
r3 := &ast.Rule{
r4 := &ast.Rule{
Head: generator.NewHead("", NewCriterionTerm(false, ReasonMCPToolUnauthorized)),
Body: ast.Body{
ast.NewExpr(ast.BooleanTerm(true)),
},
}
r2.Else = r3
r3.Else = r4
return r1, nil, nil
}

View file

@ -68,4 +68,15 @@ allow:
require.Equal(t, A{true, A{ReasonMCPNotAToolCall}, M{}}, res["allow"])
require.Equal(t, A{false, A{}}, res["deny"])
})
t.Run("no method name should pass", func(t *testing.T) {
res, err := evaluate(t, `
allow:
and:
- mcp_tool:
is: list_tables
`, []*databroker.Record{}, Input{})
require.NoError(t, err)
require.Equal(t, A{true, A{ReasonMCPNotAToolCall}, M{}}, res["allow"])
require.Equal(t, A{false, A{}}, res["deny"])
})
}