Go SDK: Align hooks with SEP (#23)
The SEP spec and C# SDK use hooks (plural, JSON array) but the Go SDK
had hook (singular, single object). This meant the wire formats were
incompatible — Go would send `{"hook": {...}}` while everything else
expects `{"hooks": [...]}`.
Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
2b1d10093e
commit
23d889254b
14 changed files with 110 additions and 92 deletions
|
|
@ -20,10 +20,10 @@ ext := extension.New()
|
||||||
ext.AddInterceptor(&interceptors.Validator{
|
ext.AddInterceptor(&interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "block-dangerous",
|
Name: "block-dangerous",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -37,10 +37,10 @@ func main() {
|
||||||
m := &interceptors.Mutator{
|
m := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "audit-tag",
|
Name: "audit-tag",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -37,10 +37,10 @@ func main() {
|
||||||
v := &interceptors.Validator{
|
v := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "block-dangerous-tool",
|
Name: "block-dangerous-tool",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -143,10 +143,7 @@ func (c *Chain) Execute(ctx context.Context, params *ExecutionParams) (*Executio
|
||||||
if len(nameFilter) > 0 && !nameFilter[e.Interceptor.Name] {
|
if len(nameFilter) > 0 && !nameFilter[e.Interceptor.Name] {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if !matchesPhase(e.Interceptor.Hook.Phase, params.Phase) {
|
if !matchesHooks(e.Interceptor.Hooks, params.Event, params.Phase) {
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !slices.Contains(e.Interceptor.Hook.Events, params.Event) {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
switch e.Interceptor.Type {
|
switch e.Interceptor.Type {
|
||||||
|
|
@ -432,8 +429,16 @@ func (c *Chain) timeoutResult(cr *ExecutionResult, start time.Time) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// matchesPhase checks if an interceptor's configured phase covers the target
|
// matchesHooks checks if any hook entry matches both the target event and phase.
|
||||||
// phase. An interceptor with PhaseBoth matches any target phase.
|
// A hook with PhaseBoth matches any target phase.
|
||||||
func matchesPhase(interceptorPhase, targetPhase interceptors.InterceptionPhase) bool {
|
func matchesHooks(hooks []interceptors.Hook, event string, phase interceptors.InterceptionPhase) bool {
|
||||||
return interceptorPhase == interceptors.PhaseBoth || interceptorPhase == targetPhase
|
for _, h := range hooks {
|
||||||
|
if h.Phase != interceptors.PhaseBoth && h.Phase != phase {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if slices.Contains(h.Events, event) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,12 +67,14 @@ func registerInterceptorMethods(server *mcp.Server, is []interceptors.Intercepto
|
||||||
for _, i := range is {
|
for _, i := range is {
|
||||||
if event != "" {
|
if event != "" {
|
||||||
match := false
|
match := false
|
||||||
for _, e := range i.GetMetadata().Hook.Events {
|
for _, h := range i.GetMetadata().Hooks {
|
||||||
|
for _, e := range h.Events {
|
||||||
if e == event {
|
if e == event {
|
||||||
match = true
|
match = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if !match {
|
if !match {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
@ -142,10 +144,10 @@ func TestChain_FailOpenRecordsExecutionResult(t *testing.T) {
|
||||||
failOpenValidator := &interceptors.Validator{
|
failOpenValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "fo-validator",
|
Name: "fo-validator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{"test/event"},
|
Events: []string{"test/event"},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
FailOpen: true,
|
FailOpen: true,
|
||||||
},
|
},
|
||||||
|
|
@ -156,10 +158,10 @@ func TestChain_FailOpenRecordsExecutionResult(t *testing.T) {
|
||||||
passingValidator := &interceptors.Validator{
|
passingValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "passing-validator",
|
Name: "passing-validator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{"test/event"},
|
Events: []string{"test/event"},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -190,10 +192,10 @@ func TestChain_FailOpenRecordsExecutionResult(t *testing.T) {
|
||||||
failOpenMutator := &interceptors.Mutator{
|
failOpenMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "fo-mutator",
|
Name: "fo-mutator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{"test/event"},
|
Events: []string{"test/event"},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
FailOpen: true,
|
FailOpen: true,
|
||||||
PriorityHint: interceptors.NewPriority(10),
|
PriorityHint: interceptors.NewPriority(10),
|
||||||
|
|
@ -205,10 +207,10 @@ func TestChain_FailOpenRecordsExecutionResult(t *testing.T) {
|
||||||
passingMutator := &interceptors.Mutator{
|
passingMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "passing-mutator",
|
Name: "passing-mutator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{"test/event"},
|
Events: []string{"test/event"},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
PriorityHint: interceptors.NewPriority(20),
|
PriorityHint: interceptors.NewPriority(20),
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,10 @@
|
||||||
// v := &interceptors.Validator{
|
// v := &interceptors.Validator{
|
||||||
// Metadata: interceptors.Metadata{
|
// Metadata: interceptors.Metadata{
|
||||||
// Name: "block-dangerous-tool",
|
// Name: "block-dangerous-tool",
|
||||||
// Hook: interceptors.Hook{
|
// Hooks: []interceptors.Hook{{
|
||||||
// Events: []string{"tools/call"},
|
// Events: []string{"tools/call"},
|
||||||
// Phase: interceptors.PhaseRequest,
|
// Phase: interceptors.PhaseRequest,
|
||||||
// },
|
// }},
|
||||||
// Mode: interceptors.ModeEnforce,
|
// Mode: interceptors.ModeEnforce,
|
||||||
// },
|
// },
|
||||||
// Handler: func(ctx context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
// Handler: func(ctx context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -73,10 +73,10 @@
|
||||||
// m := &interceptors.Mutator{
|
// m := &interceptors.Mutator{
|
||||||
// Metadata: interceptors.Metadata{
|
// Metadata: interceptors.Metadata{
|
||||||
// Name: "redact-pii",
|
// Name: "redact-pii",
|
||||||
// Hook: interceptors.Hook{
|
// Hooks: []interceptors.Hook{{
|
||||||
// Events: []string{"tools/call"},
|
// Events: []string{"tools/call"},
|
||||||
// Phase: interceptors.PhaseResponse,
|
// Phase: interceptors.PhaseResponse,
|
||||||
// },
|
// }},
|
||||||
// Mode: interceptors.ModeEnforce,
|
// Mode: interceptors.ModeEnforce,
|
||||||
// },
|
// },
|
||||||
// Handler: func(ctx context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
// Handler: func(ctx context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ func (e *Extension) handleList(_ context.Context, req *mcp.ServerRequest[*interc
|
||||||
all := e.getInterceptors()
|
all := e.getInterceptors()
|
||||||
infos := make([]interceptors.InterceptorInfo, 0, len(all))
|
infos := make([]interceptors.InterceptorInfo, 0, len(all))
|
||||||
for _, ri := range all {
|
for _, ri := range all {
|
||||||
if event != "" && !slices.Contains(ri.GetMetadata().Hook.Events, event) {
|
if event != "" && !hooksContainEvent(ri.GetMetadata().Hooks, event) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
infos = append(infos, interceptors.InfoFromInterceptor(ri))
|
infos = append(infos, interceptors.InfoFromInterceptor(ri))
|
||||||
|
|
@ -105,3 +105,12 @@ func (e *Extension) handleInvoke(ctx context.Context, req *mcp.ServerRequest[*in
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func hooksContainEvent(hooks []interceptors.Hook, event string) bool {
|
||||||
|
for _, h := range hooks {
|
||||||
|
if slices.Contains(h.Events, event) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,10 @@ func TestListWithEventFilter(t *testing.T) {
|
||||||
promptsValidator := &interceptors.Validator{
|
promptsValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "prompts-v",
|
Name: "prompts-v",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventPromptsGet},
|
Events: []string{interceptors.EventPromptsGet},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -112,10 +112,10 @@ func TestInvokeValidatorRejects(t *testing.T) {
|
||||||
rejectAll := &interceptors.Validator{
|
rejectAll := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "reject-all",
|
Name: "reject-all",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -155,10 +155,10 @@ func TestInvokeMutator(t *testing.T) {
|
||||||
mutator := &interceptors.Mutator{
|
mutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "add-field",
|
Name: "add-field",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
@ -231,10 +231,10 @@ func TestInvokeTimeout(t *testing.T) {
|
||||||
slowValidator := &interceptors.Validator{
|
slowValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "slow-v",
|
Name: "slow-v",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -181,10 +181,12 @@ func (e *Extension) enrichInitResult(result mcp.Result) (mcp.Result, error) {
|
||||||
all := e.getInterceptors()
|
all := e.getInterceptors()
|
||||||
supportedEvents := map[string]bool{}
|
supportedEvents := map[string]bool{}
|
||||||
for _, ri := range all {
|
for _, ri := range all {
|
||||||
for _, ev := range ri.GetMetadata().Hook.Events {
|
for _, h := range ri.GetMetadata().Hooks {
|
||||||
|
for _, ev := range h.Events {
|
||||||
supportedEvents[ev] = true
|
supportedEvents[ev] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
events := make([]string, 0, len(supportedEvents))
|
events := make([]string, 0, len(supportedEvents))
|
||||||
for ev := range supportedEvents {
|
for ev := range supportedEvents {
|
||||||
|
|
|
||||||
|
|
@ -86,10 +86,10 @@ func TestServer_ValidatorWarnDoesNotBlock(t *testing.T) {
|
||||||
warnValidator := &interceptors.Validator{
|
warnValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "warn-only",
|
Name: "warn-only",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -117,10 +117,10 @@ func TestServer_ValidationFailurePreventsM(t *testing.T) {
|
||||||
spy := &interceptors.Mutator{
|
spy := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "spy-mutator",
|
Name: "spy-mutator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
@ -141,10 +141,10 @@ func TestServer_ValidatorTimeoutAbortsChain(t *testing.T) {
|
||||||
slowValidator := &interceptors.Validator{
|
slowValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "slow-validator",
|
Name: "slow-validator",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(ctx context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -172,10 +172,10 @@ func TestServer_MutatorTimeoutAbortsChain(t *testing.T) {
|
||||||
slowMutator := &interceptors.Mutator{
|
slowMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "m2-slow",
|
Name: "m2-slow",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
PriorityHint: interceptors.NewPriority(20),
|
PriorityHint: interceptors.NewPriority(20),
|
||||||
},
|
},
|
||||||
|
|
@ -208,10 +208,10 @@ func TestServer_MutatorFailOpenContinuesChain(t *testing.T) {
|
||||||
failOpenMutator := &interceptors.Mutator{
|
failOpenMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "m2-failopen",
|
Name: "m2-failopen",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
FailOpen: true,
|
FailOpen: true,
|
||||||
PriorityHint: interceptors.NewPriority(20),
|
PriorityHint: interceptors.NewPriority(20),
|
||||||
|
|
@ -248,10 +248,10 @@ func TestServer_ResponseMutatorSeesMutatedParams(t *testing.T) {
|
||||||
reqMutator := &interceptors.Mutator{
|
reqMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "inject-marker",
|
Name: "inject-marker",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
@ -309,10 +309,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
reqV1 := &interceptors.Validator{
|
reqV1 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "req-v1-tool-check",
|
Name: "req-v1-tool-check",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -343,10 +343,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
reqV2 := &interceptors.Validator{
|
reqV2 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "req-v2-args-check",
|
Name: "req-v2-args-check",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -381,10 +381,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
reqV3 := &interceptors.Validator{
|
reqV3 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "req-v3-warn",
|
Name: "req-v3-warn",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -405,10 +405,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
return &interceptors.Mutator{
|
return &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: name,
|
Name: name,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
PriorityHint: interceptors.NewPriority(priority),
|
PriorityHint: interceptors.NewPriority(priority),
|
||||||
},
|
},
|
||||||
|
|
@ -454,10 +454,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
return &interceptors.Mutator{
|
return &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: name,
|
Name: name,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
PriorityHint: interceptors.NewPriority(priority),
|
PriorityHint: interceptors.NewPriority(priority),
|
||||||
},
|
},
|
||||||
|
|
@ -496,10 +496,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
respV1 := &interceptors.Validator{
|
respV1 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "resp-v1-has-content",
|
Name: "resp-v1-has-content",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -530,10 +530,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
respV2 := &interceptors.Validator{
|
respV2 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "resp-v2-sees-mutation",
|
Name: "resp-v2-sees-mutation",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -566,10 +566,10 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
||||||
respV3 := &interceptors.Validator{
|
respV3 := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "resp-v3-info",
|
Name: "resp-v3-info",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -190,10 +190,10 @@ func prefixMutator(name, tag string, phase interceptors.InterceptionPhase, prior
|
||||||
return &interceptors.Mutator{
|
return &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: name,
|
Name: name,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: phase,
|
Phase: phase,
|
||||||
},
|
}},
|
||||||
Mode: mode,
|
Mode: mode,
|
||||||
PriorityHint: interceptors.NewPriority(priority),
|
PriorityHint: interceptors.NewPriority(priority),
|
||||||
},
|
},
|
||||||
|
|
@ -225,10 +225,10 @@ func failMutator(name string, phase interceptors.InterceptionPhase, priority int
|
||||||
return &interceptors.Mutator{
|
return &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: name,
|
Name: name,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: phase,
|
Phase: phase,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
PriorityHint: interceptors.NewPriority(priority),
|
PriorityHint: interceptors.NewPriority(priority),
|
||||||
},
|
},
|
||||||
|
|
@ -243,10 +243,10 @@ func blockToolValidator(toolName string) *interceptors.Validator {
|
||||||
return &interceptors.Validator{
|
return &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "block-" + toolName,
|
Name: "block-" + toolName,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -278,10 +278,10 @@ func allowAllValidator(name string) *interceptors.Validator {
|
||||||
return &interceptors.Validator{
|
return &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: name,
|
Name: name,
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -81,10 +81,10 @@ func TestMiddlewareBlocksOnValidationError(t *testing.T) {
|
||||||
blocker := &interceptors.Validator{
|
blocker := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "block-echo",
|
Name: "block-echo",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -125,10 +125,10 @@ func TestMiddlewarePassesOnSuccess(t *testing.T) {
|
||||||
allow := &interceptors.Validator{
|
allow := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "allow-all",
|
Name: "allow-all",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -152,10 +152,10 @@ func TestMiddlewareMutatesPayload(t *testing.T) {
|
||||||
mutator := &interceptors.Mutator{
|
mutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "add-prefix",
|
Name: "add-prefix",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseResponse,
|
Phase: interceptors.PhaseResponse,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
@ -197,10 +197,10 @@ func TestMiddlewareAuditModeNonBlocking(t *testing.T) {
|
||||||
auditValidator := &interceptors.Validator{
|
auditValidator := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "audit-reject",
|
Name: "audit-reject",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeAudit,
|
Mode: interceptors.ModeAudit,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, _ *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -230,10 +230,10 @@ func TestMiddlewareWithContextProvider(t *testing.T) {
|
||||||
principalCheck := &interceptors.Validator{
|
principalCheck := &interceptors.Validator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "check-principal",
|
Name: "check-principal",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
||||||
|
|
@ -312,10 +312,10 @@ func TestMiddlewareRequestMutatorModifiesArgs(t *testing.T) {
|
||||||
reqMutator := &interceptors.Mutator{
|
reqMutator := &interceptors.Mutator{
|
||||||
Metadata: interceptors.Metadata{
|
Metadata: interceptors.Metadata{
|
||||||
Name: "inject-field",
|
Name: "inject-field",
|
||||||
Hook: interceptors.Hook{
|
Hooks: []interceptors.Hook{{
|
||||||
Events: []string{interceptors.EventToolsCall},
|
Events: []string{interceptors.EventToolsCall},
|
||||||
Phase: interceptors.PhaseRequest,
|
Phase: interceptors.PhaseRequest,
|
||||||
},
|
}},
|
||||||
Mode: interceptors.ModeEnforce,
|
Mode: interceptors.ModeEnforce,
|
||||||
},
|
},
|
||||||
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.MutationResult, error) {
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ type Metadata struct {
|
||||||
Version string `json:"version,omitempty"`
|
Version string `json:"version,omitempty"`
|
||||||
Description string `json:"description,omitempty"`
|
Description string `json:"description,omitempty"`
|
||||||
Type InterceptorType `json:"type"`
|
Type InterceptorType `json:"type"`
|
||||||
Hook Hook `json:"hook"`
|
Hooks []Hook `json:"hooks"`
|
||||||
PriorityHint Priority `json:"priorityHint,omitempty"`
|
PriorityHint Priority `json:"priorityHint,omitempty"`
|
||||||
Compat *Compat `json:"compat,omitempty"`
|
Compat *Compat `json:"compat,omitempty"`
|
||||||
ConfigSchema json.RawMessage `json:"configSchema,omitempty"`
|
ConfigSchema json.RawMessage `json:"configSchema,omitempty"`
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ type InterceptorInfo struct {
|
||||||
Version string `json:"version,omitempty"`
|
Version string `json:"version,omitempty"`
|
||||||
Description string `json:"description,omitempty"`
|
Description string `json:"description,omitempty"`
|
||||||
Type InterceptorType `json:"type"`
|
Type InterceptorType `json:"type"`
|
||||||
Hook Hook `json:"hook"`
|
Hooks []Hook `json:"hooks"`
|
||||||
PriorityHint Priority `json:"priorityHint,omitempty"`
|
PriorityHint Priority `json:"priorityHint,omitempty"`
|
||||||
Compat *Compat `json:"compat,omitempty"`
|
Compat *Compat `json:"compat,omitempty"`
|
||||||
ConfigSchema json.RawMessage `json:"configSchema,omitempty"`
|
ConfigSchema json.RawMessage `json:"configSchema,omitempty"`
|
||||||
|
|
@ -58,7 +58,7 @@ func InfoFromInterceptor(i Interceptor) InterceptorInfo {
|
||||||
Version: m.Version,
|
Version: m.Version,
|
||||||
Description: m.Description,
|
Description: m.Description,
|
||||||
Type: i.GetType(),
|
Type: i.GetType(),
|
||||||
Hook: m.Hook,
|
Hooks: m.Hooks,
|
||||||
PriorityHint: m.PriorityHint,
|
PriorityHint: m.PriorityHint,
|
||||||
Compat: m.Compat,
|
Compat: m.Compat,
|
||||||
ConfigSchema: m.ConfigSchema,
|
ConfigSchema: m.ConfigSchema,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue