chore: support underscores in agent bin filenames (#5496)

deansheather · web-flow · commit 43b61ce33c8a · 2022-12-21T21:06:38.000Z
diff --git a/site/site.go b/site/site.go
@@ -60,7 +60,14 @@ func Handler(siteFS fs.FS, binFS http.FileSystem) http.Handler {
 	}
 
 	mux := http.NewServeMux()
-	mux.Handle("/bin/", http.StripPrefix("/bin", http.FileServer(binFS)))
+	mux.Handle("/bin/", http.StripPrefix("/bin", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		// Convert underscores in the filename to hyphens. We eventually want to
+		// change our hyphen-based filenames to underscores, but we need to
+		// support both for now.
+		r.URL.Path = strings.ReplaceAll(r.URL.Path, "_", "-")
+
+		http.FileServer(binFS).ServeHTTP(rw, r)
+	})))
 	mux.Handle("/", http.FileServer(http.FS(siteFS))) // All other non-html static files.
 
 	return secureHeaders(&handler{
diff --git a/site/site_test.go b/site/site_test.go
@@ -315,7 +315,9 @@ func TestServingBin(t *testing.T) {
 				},
 			},
 			reqs: []req{
+				// We support both hyphens and underscores for compatibility.
 				{url: "/bin/coder-linux-amd64", wantStatus: http.StatusOK, wantBody: []byte("embed")},
+				{url: "/bin/coder_linux_amd64", wantStatus: http.StatusOK, wantBody: []byte("embed")},
 				{url: "/bin/GITKEEP", wantStatus: http.StatusOK, wantBody: []byte("")},
 			},
 		},
