|
|
|
@ -19,6 +19,8 @@ package main |
|
|
|
|
import ( |
|
|
|
|
"errors" |
|
|
|
|
"net/http" |
|
|
|
|
"path" |
|
|
|
|
"path/filepath" |
|
|
|
|
"strings" |
|
|
|
|
"time" |
|
|
|
|
|
|
|
|
@ -28,7 +30,7 @@ import ( |
|
|
|
|
|
|
|
|
|
const ( |
|
|
|
|
iso8601Format = "20060102T150405Z" |
|
|
|
|
privateBucket = "/minio" |
|
|
|
|
privateBucket = "minio" |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
// HandlerFunc - useful to chain different middleware http.Handler
|
|
|
|
@ -99,19 +101,14 @@ 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
|
|
|
|
|
// these specific incoming URLs.
|
|
|
|
|
// '/' is redirected to '/locationPrefix'
|
|
|
|
|
// '/rpc' is redirected to '/locationPrefix/rpc'
|
|
|
|
|
// '/login' is redirected to '/locationPrefix/login'
|
|
|
|
|
switch r.URL.Path { |
|
|
|
|
case "/": |
|
|
|
|
// This could be the default route for browser, redirect
|
|
|
|
|
// to 'locationPrefix/'.
|
|
|
|
|
fallthrough |
|
|
|
|
case "/rpc": |
|
|
|
|
// This is '/rpc' API route for browser, redirect to
|
|
|
|
|
// 'locationPrefix/rpc'.
|
|
|
|
|
fallthrough |
|
|
|
|
case "/login": |
|
|
|
|
// This is '/login' route for browser, redirect to
|
|
|
|
|
// 'locationPrefix/login'.
|
|
|
|
|
location := h.locationPrefix + r.URL.Path |
|
|
|
|
case "/", "/rpc", "/login": |
|
|
|
|
location := path.Join(h.locationPrefix, r.URL.Path) |
|
|
|
|
// Redirect to new location.
|
|
|
|
|
http.Redirect(w, r, location, http.StatusTemporaryRedirect) |
|
|
|
|
return |
|
|
|
@ -149,7 +146,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") && strings.HasPrefix(r.URL.Path, privateBucket) { |
|
|
|
|
if !strings.Contains(r.Header.Get("User-Agent"), "Mozilla") && filepath.Base(r.URL.Path) == privateBucket { |
|
|
|
|
writeErrorResponse(w, r, AllAccessDisabled, r.URL.Path) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|