Merge pull request #78 from ekoeppen/gh-token-url

Prevent redirect errors for GitHub enterprise accounts

commit: 5bbab3d661906c154b8f26a412efa57c4c431cdd
author: Patric Eckhart · 3mo ago · 2026-07-13 12:50 UTC
committer: GitHub · 3mo ago · 2026-07-13 12:50 UTC
merge of: 1b17517 + 08f0ec6 · diff against the first parent
signature: GPG UnverifiedB5690EEEBB952194 The key is unknown
refs: tag: v0.2.81

2 files · +71 -0

M packages/provider/github_copilot.go +1 -0


@@ -175,6 +175,7 @@ func (t copilotRefreshTransport) RoundTrip(req http.Request) (*http.Response,
175	175		if u, err := url.Parse(tok.baseURL); err == nil && u.Host != clone.URL.Host {
176	176		clone.URL.Scheme = u.Scheme
177	177		clone.URL.Host = u.Host
	178	+	clone.Host = u.Host
178	179		}
179	180		}
180	181		return t.inner.RoundTrip(clone)


@@ -175,6 +175,7 @@ func (t copilotRefreshTransport) RoundTrip(req http.Request) (*http.Response,
175	if u, err := url.Parse(tok.baseURL); err == nil && u.Host != clone.URL.Host {	175		if u, err := url.Parse(tok.baseURL); err == nil && u.Host != clone.URL.Host {
176	clone.URL.Scheme = u.Scheme	176		clone.URL.Scheme = u.Scheme
177	clone.URL.Host = u.Host	177		clone.URL.Host = u.Host
		178	+	clone.Host = u.Host
178	}	179		}
179	}	180		}
180	return t.inner.RoundTrip(clone)	181		return t.inner.RoundTrip(clone)

A packages/provider/github_copilot_test.go +70 -0

@@ -0,0 +1,70 @@
	1	+	package provider
	2	+
	3	+	import (
	4	+	"context"
	5	+	"net/http"
	6	+	"net/url"
	7	+	"testing"
	8	+	"time"
	9	+	)
	10	+
	11	+	type mockRoundTripper struct {
	12	+	lastReq *http.Request
	13	+	}
	14	+
	15	+	func (m mockRoundTripper) RoundTrip(req http.Request) (*http.Response, error) {
	16	+	m.lastReq = req
	17	+	return &http.Response{
	18	+	StatusCode: http.StatusOK,
	19	+	Body: http.NoBody,
	20	+	}, nil
	21	+	}
	22	+
	23	+	func TestCopilotHostRewrite(t *testing.T) {
	24	+	// Seed the cache with a mock token that carries a non-default proxy endpoint
	25	+	// Ensure the expiresAt time is far in the future so that it bypasses the exchange check
	26	+	const pat = "ghp_mock_token_for_test"
	27	+	copilotCache.mu.Lock()
	28	+	copilotCache.tokens[pat] = copilotToken{
	29	+	value: "mock-jwt-with;proxy-ep=enterprise.copilot.proxy",
	30	+	expiresAt: time.Now().Add(1 * time.Hour),
	31	+	baseURL: "https://api.enterprise.copilot.proxy",
	32	+	}
	33	+	copilotCache.mu.Unlock()
	34	+
	35	+	mockRT := &mockRoundTripper{}
	36	+	transport := &copilotRefreshTransport{
	37	+	inner: mockRT,
	38	+	pat: pat,
	39	+	}
	40	+
	41	+	reqUrl, err := url.Parse("https://api.individual.githubcopilot.com/chat/completions")
	42	+	if err != nil {
	43	+	t.Fatalf("failed to parse test URL: %v", err)
	44	+	}
	45	+
	46	+	req := &http.Request{
	47	+	Method: "POST",
	48	+	URL: reqUrl,
	49	+	Header: make(http.Header),
	50	+	}
	51	+	req = req.WithContext(context.Background())
	52	+
	53	+	_, err = transport.RoundTrip(req)
	54	+	if err != nil {
	55	+	t.Fatalf("RoundTrip failed: %v", err)
	56	+	}
	57	+
	58	+	if mockRT.lastReq == nil {
	59	+	t.Fatal("RoundTrip did not forward the request")
	60	+	}
	61	+
	62	+	// Verify both URL host and Host header are rewritten correctly to prevent 421 Misdirected Request
	63	+	wantHost := "api.enterprise.copilot.proxy"
	64	+	if mockRT.lastReq.URL.Host != wantHost {
	65	+	t.Errorf("expected URL.Host to be %q, got %q", wantHost, mockRT.lastReq.URL.Host)
	66	+	}
	67	+	if mockRT.lastReq.Host != wantHost {
	68	+	t.Errorf("expected Host header (Request.Host) to be %q, got %q", wantHost, mockRT.lastReq.Host)
	69	+	}
	70	+	}

@@ -0,0 +1,70 @@
	1	+	package provider
	2	+
	3	+	import (
	4	+	"context"
	5	+	"net/http"
	6	+	"net/url"
	7	+	"testing"
	8	+	"time"
	9	+	)
	10	+
	11	+	type mockRoundTripper struct {
	12	+	lastReq *http.Request
	13	+	}
	14	+
	15	+	func (m mockRoundTripper) RoundTrip(req http.Request) (*http.Response, error) {
	16	+	m.lastReq = req
	17	+	return &http.Response{
	18	+	StatusCode: http.StatusOK,
	19	+	Body: http.NoBody,
	20	+	}, nil
	21	+	}
	22	+
	23	+	func TestCopilotHostRewrite(t *testing.T) {
	24	+	// Seed the cache with a mock token that carries a non-default proxy endpoint
	25	+	// Ensure the expiresAt time is far in the future so that it bypasses the exchange check
	26	+	const pat = "ghp_mock_token_for_test"
	27	+	copilotCache.mu.Lock()
	28	+	copilotCache.tokens[pat] = copilotToken{
	29	+	value: "mock-jwt-with;proxy-ep=enterprise.copilot.proxy",
	30	+	expiresAt: time.Now().Add(1 * time.Hour),
	31	+	baseURL: "https://api.enterprise.copilot.proxy",
	32	+	}
	33	+	copilotCache.mu.Unlock()
	34	+
	35	+	mockRT := &mockRoundTripper{}
	36	+	transport := &copilotRefreshTransport{
	37	+	inner: mockRT,
	38	+	pat: pat,
	39	+	}
	40	+
	41	+	reqUrl, err := url.Parse("https://api.individual.githubcopilot.com/chat/completions")
	42	+	if err != nil {
	43	+	t.Fatalf("failed to parse test URL: %v", err)
	44	+	}
	45	+
	46	+	req := &http.Request{
	47	+	Method: "POST",
	48	+	URL: reqUrl,
	49	+	Header: make(http.Header),
	50	+	}
	51	+	req = req.WithContext(context.Background())
	52	+
	53	+	_, err = transport.RoundTrip(req)
	54	+	if err != nil {
	55	+	t.Fatalf("RoundTrip failed: %v", err)
	56	+	}
	57	+
	58	+	if mockRT.lastReq == nil {
	59	+	t.Fatal("RoundTrip did not forward the request")
	60	+	}
	61	+
	62	+	// Verify both URL host and Host header are rewritten correctly to prevent 421 Misdirected Request
	63	+	wantHost := "api.enterprise.copilot.proxy"
	64	+	if mockRT.lastReq.URL.Host != wantHost {
	65	+	t.Errorf("expected URL.Host to be %q, got %q", wantHost, mockRT.lastReq.URL.Host)
	66	+	}
	67	+	if mockRT.lastReq.Host != wantHost {
	68	+	t.Errorf("expected Host header (Request.Host) to be %q, got %q", wantHost, mockRT.lastReq.Host)
	69	+	}
	70	+	}