Skip to content

Agent Mesh

console: serve the routes under --base-path, not just at the root

Tomas Tormobe7bcfa2f6c8
diff --git a/cmd/sam-console/main.go b/cmd/sam-console/main.go
index 0a54d26c..94a4248b 100644
--- a/cmd/sam-console/main.go
+++ b/cmd/sam-console/main.go
@@ -36,7 +36,7 @@ func main() {
ControlPlaneURL: *controlPlaneURL,
AdminToken: adminToken,
StaticDir: *staticDir,
- BasePath: *basePath,
+ BasePath: console.NormalizeBasePath(*basePath),
})
if err != nil {
log.Fatalf("Failed to initialize console server: %v", err)
diff --git a/internal/console/server.go b/internal/console/server.go
index 495c27de..c00b8849 100644
--- a/internal/console/server.go
+++ b/internal/console/server.go
@@ -12,6 +12,7 @@ import (
"net/http/httputil"
"net/url"
"os"
+ "path"
"path/filepath"
"time"
@@ -28,6 +29,19 @@ type Config struct {
BasePath string
}
+// NormalizeBasePath makes a base-path flag value safe to concatenate: no trailing
+// slash (else cookie paths become /console//) and a guaranteed leading slash.
+func NormalizeBasePath(p string) string {
+ if p == "" {
+ return ""
+ }
+ p = path.Clean("/" + p)
+ if p == "/" {
+ return ""
+ }
+ return p
+}
+
type Server struct {
cfg Config
mux *http.ServeMux
@@ -101,12 +115,14 @@ func NewServer(cfg Config) (*Server, error) {
},
}
+ routes := http.NewServeMux()
+
// Proxy all API requests to the control plane
- s.mux.Handle("/api/", http.StripPrefix("/api", proxy))
+ routes.Handle("/api/", http.StripPrefix("/api", proxy))
// Serve static files
fs := http.FileServer(http.Dir(s.cfg.StaticDir))
- s.mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+ routes.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
// Basic check if file exists
path := filepath.Join(s.cfg.StaticDir, r.URL.Path)
if _, err := os.Stat(path); os.IsNotExist(err) && r.URL.Path != "/" {
@@ -119,12 +135,19 @@ func NewServer(cfg Config) (*Server, error) {
// OIDC login endpoints
if s.provider != nil {
- s.mux.HandleFunc("/auth/login", s.HandleLogin)
- s.mux.HandleFunc("/auth/callback", s.HandleCallback)
- s.mux.HandleFunc("/auth/session", s.HandleSession)
+ routes.HandleFunc("/auth/login", s.HandleLogin)
+ routes.HandleFunc("/auth/callback", s.HandleCallback)
+ routes.HandleFunc("/auth/session", s.HandleSession)
+ }
+ routes.HandleFunc("/auth/logout", s.HandleLogout)
+ routes.HandleFunc("/info", s.HandleInfo)
+
+ // Serve under BasePath too, so the links this server emits resolve without the proxy
+ // stripping the prefix. Still served at the root for proxies that do strip it.
+ if s.cfg.BasePath != "" {
+ s.mux.Handle(s.cfg.BasePath+"/", http.StripPrefix(s.cfg.BasePath, routes))
}
- s.mux.HandleFunc("/auth/logout", s.HandleLogout)
- s.mux.HandleFunc("/info", s.HandleInfo)
+ s.mux.Handle("/", routes)
return s, nil
}
diff --git a/internal/console/server_test.go b/internal/console/server_test.go
index 8eb5e6cf..c7dd3679 100644
--- a/internal/console/server_test.go
+++ b/internal/console/server_test.go
@@ -243,3 +243,59 @@ func TestDiscoverProviderWithRetry(t *testing.T) {
}
})
}
+
+// TestNewServer_BasePathServesBothPrefixes: with a BasePath the console must answer both the
+// prefixed URLs it hands out (so a proxy can forward /console/* untouched) and the root.
+func TestNewServer_BasePathServesBothPrefixes(t *testing.T) {
+ controlPlane := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.WriteHeader(http.StatusOK) // empty /info: no OIDC, which the console tolerates
+ }))
+ defer controlPlane.Close()
+
+ srv, err := NewServer(Config{
+ ControlPlaneURL: controlPlane.URL,
+ AdminToken: "test-admin-token",
+ StaticDir: t.TempDir(),
+ BasePath: "/console",
+ })
+ if err != nil {
+ t.Fatalf("failed to create server: %v", err)
+ }
+ console := httptest.NewServer(srv.Handler())
+ defer console.Close()
+
+ client := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
+ for path, want := range map[string]int{
+ "/info": http.StatusOK,
+ "/console/info": http.StatusOK,
+ "/console": http.StatusMovedPermanently, // ServeMux redirects to the subtree root
+ } {
+ resp, err := client.Get(console.URL + path)
+ if err != nil {
+ t.Fatalf("GET %s: %v", path, err)
+ }
+ _ = resp.Body.Close()
+ if resp.StatusCode != want {
+ t.Errorf("GET %s: got %d, want %d", path, resp.StatusCode, want)
+ }
+ }
+}
+
+// BasePath is concatenated into cookie paths, redirect URLs and mux patterns, so malformed
+// flag values (trailing slash, missing leading slash) must be normalized where the flag is read.
+func TestNormalizeBasePath(t *testing.T) {
+ for input, want := range map[string]string{
+ "": "",
+ "/": "",
+ "/console": "/console",
+ "/console/": "/console",
+ "console": "/console",
+ "console//": "/console",
+ "//console": "/console",
+ "/console//sub/": "/console/sub",
+ } {
+ if got := NormalizeBasePath(input); got != want {
+ t.Errorf("NormalizeBasePath(%q) = %q, want %q", input, got, want)
+ }
+ }
+}