Skip to content

fix(http): preserve repeated request configuration headers #3625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
as992949791 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −4
Open

fix(http): preserve repeated request configuration headers #3625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pkg/http/middleware/request_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func WithRequestConfig(next http.Handler) http.Handler {
}

// Toolsets
if toolsets := headers.ParseCommaSeparated(r.Header.Get(headers.MCPToolsetsHeader)); len(toolsets) > 0 {
if toolsets := headers.ParseCommaSeparated(strings.Join(r.Header.Values(headers.MCPToolsetsHeader), ",")); len(toolsets) > 0 {
ctx = ghcontext.WithToolsets(ctx, toolsets)
}

// Tools
if tools := headers.ParseCommaSeparated(r.Header.Get(headers.MCPToolsHeader)); len(tools) > 0 {
if tools := headers.ParseCommaSeparated(strings.Join(r.Header.Values(headers.MCPToolsHeader), ",")); len(tools) > 0 {
ctx = ghcontext.WithTools(ctx, tools)
}

Expand All @@ -41,7 +41,7 @@ func WithRequestConfig(next http.Handler) http.Handler {
}

// Excluded tools
if excludeTools := headers.ParseCommaSeparated(r.Header.Get(headers.MCPExcludeToolsHeader)); len(excludeTools) > 0 {
if excludeTools := headers.ParseCommaSeparated(strings.Join(r.Header.Values(headers.MCPExcludeToolsHeader), ",")); len(excludeTools) > 0 {
ctx = ghcontext.WithExcludeTools(ctx, excludeTools)
}

Expand All @@ -54,7 +54,7 @@ func WithRequestConfig(next http.Handler) http.Handler {
_, hasHeaderFeatures := r.Header[http.CanonicalHeaderKey(headers.MCPFeaturesHeader)]
_, hasQueryFeatures := query[queryParamFeatures]
if hasHeaderFeatures {
ctx = ghcontext.WithHeaderFeatures(ctx, headers.ParseCommaSeparated(r.Header.Get(headers.MCPFeaturesHeader)))
ctx = ghcontext.WithHeaderFeatures(ctx, headers.ParseCommaSeparated(strings.Join(r.Header.Values(headers.MCPFeaturesHeader), ",")))
} else if hasQueryFeatures {
ctx = ghcontext.WithHeaderFeatures(ctx, headers.ParseCommaSeparated(query.Get(queryParamFeatures)))
}
Expand Down
25 changes: 25 additions & 0 deletions pkg/http/middleware/request_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package middleware

import (
"context"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -10,6 +11,30 @@ import (
"github.com/stretchr/testify/assert"
)

func TestWithRequestConfigRepeatedListHeaders(t *testing.T) {
tests := []struct {
name string
header string
get func(context.Context) []string
}{
{"toolsets", headers.MCPToolsetsHeader, ghcontext.GetToolsets},
{"tools", headers.MCPToolsHeader, ghcontext.GetTools},
{"excluded tools", headers.MCPExcludeToolsHeader, ghcontext.GetExcludeTools},
{"features", headers.MCPFeaturesHeader, ghcontext.GetHeaderFeatures},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
req := httptest.NewRequest(http.MethodGet, "/?features=query_flag", nil)
req.Header.Add(tc.header, "first, second")
req.Header.Add(tc.header, " third, , fourth ")
handler := WithRequestConfig(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) {
assert.Equal(t, []string{"first", "second", "third", "fourth"}, tc.get(r.Context()))
}))
handler.ServeHTTP(httptest.NewRecorder(), req)
})
}
}

func TestWithRequestConfigFeatureSelection(t *testing.T) {
tests := []struct {
name string
Expand Down