Fix HTTP file server

p3lim · p3lim · commit 0f41e36b454a · 2021-10-09T21:58:48.000+02:00
diff --git a/pkg/http/server.go b/pkg/http/server.go
@@ -19,11 +19,12 @@ func NewServer(addr string, path, extra string) *Server {
 }
 
 func (server *Server) Serve() error {
-	http.Handle("/ipxe", http.FileServer(http.Dir(server.Scripts)))
+	mux := http.NewServeMux()
+	mux.Handle("/ipxe/", http.StripPrefix("/ipxe", http.FileServer(http.Dir(server.Scripts))))
 
 	if server.Extra != "" {
-		http.Handle("/extra", http.FileServer(http.Dir(server.Extra)))
+		mux.Handle("/extra/", http.StripPrefix("/extra", http.FileServer(http.Dir(server.Extra))))
 	}
 
-	return http.ListenAndServe(server.Addr, nil)
+	return http.ListenAndServe(server.Addr, mux)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,12 @@ func NewServer(addr string, path, extra string) *Server {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func (server *Server) Serve() error {`
`22`		`- http.Handle("/ipxe", http.FileServer(http.Dir(server.Scripts)))`
	`22`	`+ mux := http.NewServeMux()`
	`23`	`+ mux.Handle("/ipxe/", http.StripPrefix("/ipxe", http.FileServer(http.Dir(server.Scripts))))`
`23`	`24`
`24`	`25`	`if server.Extra != "" {`
`25`		`- http.Handle("/extra", http.FileServer(http.Dir(server.Extra)))`
	`26`	`+ mux.Handle("/extra/", http.StripPrefix("/extra", http.FileServer(http.Dir(server.Extra))))`
`26`	`27`	`}`
`27`	`28`
`28`		`- return http.ListenAndServe(server.Addr, nil)`
	`29`	`+ return http.ListenAndServe(server.Addr, mux)`
`29`	`30`	`}`