[ws-proxy] fix ACME challenge handler

gitpod-io · Apr 19, 2022 · ede6cac · ede6cac
1 parent f9c93c4
commit ede6cac
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/components/ws-proxy/pkg/proxy/workspacerouter.go b/components/ws-proxy/pkg/proxy/workspacerouter.go
@@ -49,6 +49,9 @@ func HostBasedRouter(header, wsHostSuffix string, wsHostSuffixRegex string) Work
 			allClusterWsHostSuffixRegex = wsHostSuffix
 		}
 
+		// make sure acme router is the first handler setup to make sure it has a chance to catch acme challenge
+		setupAcmeRouter(r)
+
 		var (
 			getHostHeader = func(req *http.Request) string {
 				host := req.Header.Get(header)
@@ -64,8 +67,6 @@ func HostBasedRouter(header, wsHostSuffix string, wsHostSuffixRegex string) Work
 			ideRouter       = r.MatcherFunc(matchWorkspaceHostHeader(allClusterWsHostSuffixRegex, getHostHeader, false)).Subrouter()
 		)
 
-		setupAcmeRouter(r)
-
 		r.NotFoundHandler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			hostname := getHostHeader(req)
 			log.Debugf("no match for path %s, host: %s", req.URL.Path, hostname)