Merge pull request #1151 from harshavardhana/bucket-fix

router: Fix "/minio" router for web.

generic-handlers.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"net/http"
 	"path"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -30,7 +29,7 @@ import (
 
 const (
 	iso8601Format = "20060102T150405Z"
-	privateBucket = "minio"
+	privateBucket = "/minio"
 )
 
 // HandlerFunc - useful to chain different middleware http.Handler
@@ -101,14 +100,12 @@ func setBrowserRedirectHandler(h http.Handler) http.Handler {
 func (h redirectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Re-direction handled specifically for browsers.
 	if strings.Contains(r.Header.Get("User-Agent"), "Mozilla") {
-		// Following re-direction code handles redirects only for
+		// '/' is redirected to 'locationPrefix/'
-		// these specific incoming URLs.
+		// '/rpc' is redirected to 'locationPrefix/rpc'
-		// '/' is redirected to '/locationPrefix'
+		// '/login' is redirected to 'locationPrefix/login'
-		// '/rpc' is redirected to '/locationPrefix/rpc'
-		// '/login' is redirected to '/locationPrefix/login'
 		switch r.URL.Path {
 		case "/", "/rpc", "/login":
-			location := path.Join(h.locationPrefix, r.URL.Path)
+			location := h.locationPrefix + r.URL.Path
 			// Redirect to new location.
 			http.Redirect(w, r, location, http.StatusTemporaryRedirect)
 			return
@@ -146,7 +143,7 @@ func setPrivateBucketHandler(h http.Handler) http.Handler {
 
 func (h minioPrivateBucketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// For all non browser requests, reject access to 'privateBucket'.
-	if !strings.Contains(r.Header.Get("User-Agent"), "Mozilla") && filepath.Base(r.URL.Path) == privateBucket {
+	if !strings.Contains(r.Header.Get("User-Agent"), "Mozilla") && path.Clean(r.URL.Path) == privateBucket {
 		writeErrorResponse(w, r, AllAccessDisabled, r.URL.Path)
 		return
 	}

routers.go

@@ -19,7 +19,7 @@ package main
 import (
 	"net"
 	"net/http"
-	"path/filepath"
+	"path"
 
 	router "github.com/gorilla/mux"
 	jsonrpc "github.com/gorilla/rpc/v2"
@@ -74,7 +74,7 @@ func registerAPIHandlers(mux *router.Router, a storageAPI, w *webAPI) {
 	minio.Path("/rpc").Handler(rpc)
 
 	// Web handler assets at URI  - /minio/login
-	minio.Path("/login").Handler(http.StripPrefix(filepath.Join(privateBucket, "login"), http.FileServer(assetFS())))
+	minio.Path("/login").Handler(http.StripPrefix(path.Join(privateBucket, "login"), http.FileServer(assetFS())))
 	minio.Path("/{file:.*}").Handler(http.StripPrefix(privateBucket, http.FileServer(assetFS())))
 
 	// API Router

web-handlers.go

@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -175,7 +176,7 @@ func (web *webAPI) ListBuckets(r *http.Request, args *ListBucketsArgs, reply *Li
 	}
 	for _, bucket := range buckets {
 		// List all buckets which are not private.
-		if bucket.Name != privateBucket {
+		if bucket.Name != path.Base(privateBucket) {
 			reply.Buckets = append(reply.Buckets, BucketInfo{
 				Name:         bucket.Name,
 				CreationDate: bucket.CreationDate,