Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(enterprise/aibridgeproxyd): stop injecting default port into forwarded Host header (#26656) #26711

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

Merged
f0ssel merged 2 commits into from
Jun 27, 2026
Merged

fix(enterprise/aibridgeproxyd): stop injecting default port into forwarded Host header (#26656) #26711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24704ea
fix(enterprise/aibridgeproxyd): stop injecting default port into forw…
ssncferreira Jun 24, 2026
093a065
chore(enterprise/aibridgeproxyd): fix gofumpt struct field alignment
f0ssel Jun 27, 2026
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
20 changes: 11 additions & 9 deletions enterprise/aibridgeproxyd/aibridgeproxyd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,15 @@ var blockedIPRanges = func() []net.IPNet {
// - decrypting requests using the configured MITM CA certificate
// - forwarding requests to aibridged for processing
type Server struct {
ctx context.Context
logger slog.Logger
proxy *goproxy.ProxyHttpServer
httpServer *http.Server
listener net.Listener
tlsEnabled bool
coderAccessURL *url.URL
ctx context.Context
logger slog.Logger
proxy *goproxy.ProxyHttpServer
httpServer *http.Server
listener net.Listener
tlsEnabled bool
coderAccessURL *url.URL
// coderAccessPort is the resolved port for the Coder access URL.
coderAccessPort string
aibridgeProviderFromHost func(host string) string
// caCert is the PEM-encoded MITM CA certificate loaded during initialization.
// This is served to clients who need to trust the proxy's generated certificates.
Expand Down Expand Up @@ -228,7 +230,6 @@ func New(ctx context.Context, logger slog.Logger, opts Options) (*Server, error)
coderAccessPort = "80"
}
}
coderAccessURL.Host = net.JoinHostPort(coderAccessURL.Hostname(), coderAccessPort)

// MITM cert and key are required to intercept and decrypt HTTPS traffic.
if opts.MITMCertFile == "" || opts.MITMKeyFile == "" {
Expand Down Expand Up @@ -312,6 +313,7 @@ func New(ctx context.Context, logger slog.Logger, opts Options) (*Server, error)
proxy: proxy,
tlsEnabled: opts.TLSCertFile != "",
coderAccessURL: coderAccessURL,
coderAccessPort: coderAccessPort,
aibridgeProviderFromHost: aibridgeProviderFromHost,
caCert: certPEM,
allowedPrivateRanges: allowedPrivateRanges,
Expand Down Expand Up @@ -806,7 +808,7 @@ func (s *Server) isBlockedIP(ip net.IP, hostname string, port string) bool {
// block connections to its own deployment. Hostname-based (not IP-based)
// to handle dynamic IPs (DNS changes, load balancers, k8s rescheduling).
// The port is normalized at startup to handle URLs without explicit ports.
if strings.EqualFold(hostname, s.coderAccessURL.Hostname()) && port == s.coderAccessURL.Port() {
if strings.EqualFold(hostname, s.coderAccessURL.Hostname()) && port == s.coderAccessPort {
return false
}

Expand Down
49 changes: 45 additions & 4 deletions enterprise/aibridgeproxyd/aibridgeproxyd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,7 @@ func TestNew(t *testing.T) {
DomainAllowlist: []string{aibridgeproxyd.HostAnthropic},
})
require.NoError(t, err)
require.Equal(t, "localhost", srv.CoderAccessURL().Hostname())
require.Equal(t, "80", srv.CoderAccessURL().Port())
require.Equal(t, "localhost", srv.CoderAccessURL().Host)
})

t.Run("CoderAccessURLDefaultHTTPSPort", func(t *testing.T) {
Expand All @@ -568,8 +567,7 @@ func TestNew(t *testing.T) {
DomainAllowlist: []string{aibridgeproxyd.HostAnthropic},
})
require.NoError(t, err)
require.Equal(t, "localhost", srv.CoderAccessURL().Hostname())
require.Equal(t, "443", srv.CoderAccessURL().Port())
require.Equal(t, "localhost", srv.CoderAccessURL().Host)
})

t.Run("CoderAccessURLExplicitPort", func(t *testing.T) {
Expand Down Expand Up @@ -980,6 +978,49 @@ func TestNew(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, srv)
})

t.Run("CoderAccessURLHostPreserved", func(t *testing.T) {
t.Parallel()

mitmCertFile, mitmKeyFile := getSharedTestMITMCert(t)
logger := slogtest.Make(t, nil)

srv, err := aibridgeproxyd.New(t.Context(), logger, aibridgeproxyd.Options{
ListenAddr: "127.0.0.1:0",
CoderAccessURL: "https://coder.example.com",
MITMCertFile: mitmCertFile,
MITMKeyFile: mitmKeyFile,
DomainAllowlist: []string{aibridgeproxyd.HostAnthropic},
AIBridgeProviderFromHost: func(string) string { return "test-provider" },
AllowedPrivateCIDRs: []string{"127.0.0.1/32"},
})
require.NoError(t, err)
t.Cleanup(func() { _ = srv.Close() })

require.Equal(t, "coder.example.com", srv.CoderAccessURL().Host,
"Host must not have :443 appended")
})

t.Run("CoderAccessURLExplicitPortPreserved", func(t *testing.T) {
t.Parallel()

mitmCertFile, mitmKeyFile := getSharedTestMITMCert(t)
logger := slogtest.Make(t, nil)

srv, err := aibridgeproxyd.New(t.Context(), logger, aibridgeproxyd.Options{
ListenAddr: "127.0.0.1:0",
CoderAccessURL: "https://coder.example.com:8443",
MITMCertFile: mitmCertFile,
MITMKeyFile: mitmKeyFile,
DomainAllowlist: []string{aibridgeproxyd.HostAnthropic},
AIBridgeProviderFromHost: func(string) string { return "test-provider" },
AllowedPrivateCIDRs: []string{"127.0.0.1/32"},
})
require.NoError(t, err)
t.Cleanup(func() { _ = srv.Close() })

require.Equal(t, "coder.example.com:8443", srv.CoderAccessURL().Host)
})
}

func TestClose(t *testing.T) {
Expand Down
Loading