fix: final version of the path fix

Author: maartyman

containers/aggregator-server/main.go

@@ -169,9 +169,31 @@ func main() {
 	})
 
 	// Start HTTP server
+	handler := http.Handler(serverMux)
+	if basePath := strings.TrimSuffix(model.ExternalBasePath, "/"); basePath != "" {
+		// Accept requests both with and without the configured external base path.
+		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			path := r.URL.Path
+			if path == basePath || strings.HasPrefix(path, basePath+"/") {
+				rewrittenPath := strings.TrimPrefix(path, basePath)
+				if rewrittenPath == "" {
+					rewrittenPath = "/"
+				}
+				clone := r.Clone(r.Context())
+				urlCopy := *r.URL
+				urlCopy.Path = rewrittenPath
+				urlCopy.RawPath = ""
+				clone.URL = &urlCopy
+				serverMux.ServeHTTP(w, clone)
+				return
+			}
+			serverMux.ServeHTTP(w, r)
+		})
+	}
+
 	srv := &http.Server{
 		Addr:    ":5000",
-		Handler: serverMux,
+		Handler: handler,
 	}
 
 	go func() {

containers/aggregator-server/registration/namespace.go

@@ -315,7 +315,7 @@ func deployAggregatorResources(namespace string, tokenEndpoint string, accessTok
 				"namespace": namespace,
 			},
 			"spec": map[string]interface{}{
-				"entryPoints": []string{"web"},
+				"entryPoints": []string{"web", "websecure"},
 				"routes": []interface{}{
 					map[string]interface{}{
 						"match": "Host(`" + hostMatch + "`) && " + exactPathRule(configBasePaths) + " && Method(`OPTIONS`)",

containers/aggregator/services/create-service.go

@@ -399,7 +399,7 @@ func createIngressRoute(service *model.Service, owner model.User, ctx context.Co
 				"namespace": namespace,
 			},
 			"spec": map[string]interface{}{
-				"entryPoints": []string{"web"},
+				"entryPoints": []string{"web", "websecure"},
 				"routes": []interface{}{
 					map[string]interface{}{
 						"match": "Host(`" + hostMatch + "`) && " + servicePrefixRule(servicePathPrefixes) + " && Method(`OPTIONS`)",

k8s/app/aggregator.yaml

@@ -175,27 +175,27 @@ spec:
     - port: 5000
       targetPort: 5000
 ---
-# =======================
-# 6 Ingress
-# ========================
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: aggregator-server-ingressroute
+# =======================
+# 6 Ingress
+# ========================
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: aggregator-server-ingressroute
   namespace: aggregator-app
 spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`aggregator.local`) && PathPrefix(`/`)
-      kind: Rule
-      middlewares:
-        - name: cors
-          namespace: aggregator-app
-      services:
-        - name: aggregator-server-svc
-          port: 5000
----
+    - match: Host(`aggregator.local`) && PathPrefix(`/`)
+      kind: Rule
+      middlewares:
+        - name: cors
+          namespace: aggregator-app
+      services:
+        - name: aggregator-server-svc
+          port: 5000
+---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
@@ -205,12 +205,12 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`aggregator.local`) && PathPrefix(`/registration`)
-      kind: Rule
-      middlewares:
-        - name: cors
-          namespace: aggregator-app
-      services:
-        - name: aggregator-server-svc
-          port: 5000
----
+    - match: Host(`aggregator.local`) && PathPrefix(`/registration`)
+      kind: Rule
+      middlewares:
+        - name: cors
+          namespace: aggregator-app
+      services:
+        - name: aggregator-server-svc
+          port: 5000
+---