Fixed When the MINIO_BROWSER_REDIRECT_URL parameter contains path, the console cannot be accessed normally.

Author: polaris-phecda

restapi/configure_console.go

@@ -320,9 +320,9 @@ func FileServerMiddleware(next http.Handler) http.Handler {
 		w.Header().Set("Server", globalAppName) // do not add version information
 		basePath := GetSubPath()
 		switch {
-		case strings.HasPrefix(r.URL.Path, basePath+"/ws"):
+		case strings.HasPrefix(r.URL.Path, basePath+"ws"):
 			serveWS(w, r)
-		case strings.HasPrefix(r.URL.Path, basePath+"/api"):
+		case strings.HasPrefix(r.URL.Path, basePath+"api"):
 			next.ServeHTTP(w, r)
 		default:
 			buildFs, err := fs.Sub(portal_ui.GetStaticAssets(), "build")
@@ -360,7 +360,7 @@ func handleSPA(w http.ResponseWriter, r *http.Request) {
 	if v := r.URL.Query().Get("cp"); v == "y" {
 		if base := r.URL.Query().Get("cpb"); base != "" {
 			// make sure the subpath has a trailing slash
-			if !strings.HasSuffix(base, basePath) {
+			if !strings.HasSuffix(base, "/") {
 				base = fmt.Sprintf("%s/", base)
 			}
 			basePath = base
@@ -441,7 +441,7 @@ func handleSPA(w http.ResponseWriter, r *http.Request) {
 // wrapHandlerSinglePageApplication handles a http.FileServer returning a 404 and overrides it with index.html
 func wrapHandlerSinglePageApplication(h http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == GetSubPath()+"/" {
+		if match, _ := regexp.MatchString(fmt.Sprintf("^%s/?$", GetSubPath()), r.URL.Path); match {
 			handleSPA(w, r)
 			return
 		}
@@ -501,7 +501,7 @@ func replaceBaseInIndex(indexPageBytes []byte, basePath string) []byte {
 			return indexPageBytes
 		}
 		indexPageStr := string(indexPageBytes)
-		newBase := fmt.Sprintf("<base href=\"%s/\"/>", basePath)
+		newBase := fmt.Sprintf("<base href=\"%s\"/>", basePath)
 		indexPageStr = strings.Replace(indexPageStr, "<base href=\"/\"/>", newBase, 1)
 		indexPageBytes = []byte(indexPageStr)
 

restapi/ws_handle.go

@@ -43,7 +43,7 @@ var upgrader = websocket.Upgrader{
 
 const (
 	// websocket base path
-	wsBasePath = "/ws"
+	wsBasePath = "ws"
 )
 
 // ConsoleWebsocketAdmin interface of a Websocket Client