Fix Subpath parsing (#1900)

restapi/configure_console.go

@@ -27,6 +27,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -53,6 +54,10 @@ var additionalServerFlags = struct {
 	CertsDir string `long:"certs-dir" description:"path to certs directory" env:"CONSOLE_CERTS_DIR"`
 }{}
 
+const (
+	SubPath = "CONSOLE_SUBPATH"
+)
+
 var subPath = "/"
 var subPathOnce sync.Once
 
@@ -363,18 +368,29 @@ func configureServer(s *http.Server, _, _ string) {
 
 func getSubPath() string {
 	subPathOnce.Do(func() {
-		if v := env.Get("CONSOLE_SUBPATH", ""); v != "" {
-			// Replace all unnecessary `\` to `/`
-			// also add pro-actively at the end.
-			subPath = filepath.Clean(filepath.ToSlash(v)) + SlashSeparator
-			if !strings.HasPrefix(subPath, SlashSeparator) {
-				subPath = SlashSeparator + subPath
-			}
-		}
+
+		subPath = parseSubPath(env.Get(SubPath, ""))
 	})
 	return subPath
 }
 
+func parseSubPath(v string) string {
+	v = strings.TrimSpace(v)
+	if v == "" {
+		return SlashSeparator
+	}
+	// Replace all unnecessary `\` to `/`
+	// also add pro-actively at the end.
+	subPath = path.Clean(filepath.ToSlash(v))
+	if !strings.HasPrefix(subPath, SlashSeparator) {
+		subPath = SlashSeparator + subPath
+	}
+	if !strings.HasSuffix(subPath, SlashSeparator) {
+		subPath = subPath + SlashSeparator
+	}
+	return subPath
+}
+
 func replaceBaseInIndex(indexPageBytes []byte, basePath string) []byte {
 	if basePath != "" {
 		validBasePath := regexp.MustCompile(`^[0-9a-zA-Z\/-]+$`)

restapi/configure_console_test.go

@@ -0,0 +1,125 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2022 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package restapi
+
+import (
+	"os"
+	"sync"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_parseSubPath(t *testing.T) {
+	type args struct {
+		v string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Empty",
+			args: args{
+				v: "",
+			},
+			want: "/",
+		},
+		{
+			name: "Slash",
+			args: args{
+				v: "/",
+			},
+			want: "/",
+		},
+		{
+			name: "Double Slash",
+			args: args{
+				v: "//",
+			},
+			want: "/",
+		},
+		{
+			name: "No slashes",
+			args: args{
+				v: "route",
+			},
+			want: "/route/",
+		},
+		{
+			name: "No trailing slashes",
+			args: args{
+				v: "/route",
+			},
+			want: "/route/",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, parseSubPath(tt.args.v), "parseSubPath(%v)", tt.args.v)
+		})
+	}
+}
+
+func Test_getSubPath(t *testing.T) {
+	type args struct {
+		envValue string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Empty",
+			args: args{
+				envValue: "",
+			},
+			want: "/",
+		},
+		{
+			name: "Slash",
+			args: args{
+				envValue: "/",
+			},
+			want: "/",
+		},
+		{
+			name: "Valid Value",
+			args: args{
+				envValue: "/subpath/",
+			},
+			want: "/subpath/",
+		},
+		{
+			name: "No starting slash",
+			args: args{
+				envValue: "subpath/",
+			},
+			want: "/subpath/",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			os.Setenv(SubPath, tt.args.envValue)
+			defer os.Unsetenv(SubPath)
+			subPathOnce = sync.Once{}
+			assert.Equalf(t, tt.want, getSubPath(), "getSubPath()")
+		})
+	}
+}