MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

router: Fix "/minio" router for web.

Browse Source
This commit is contained in:
Harshavardhana 2016-02-21 22:38:38 -08:00
parent d3966d1dde
commit 5da1972d1f
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
generic-handlers.go
View File

@ -20,7 +20,6 @@ import (
"errors" "errors"
"net/http" "net/http"
"path" "path"
"path/filepath"
"strings" "strings"
"time" "time"
@ -30,7 +29,7 @@ import (
const ( const (
iso8601Format = "20060102T150405Z" iso8601Format = "20060102T150405Z"
privateBucket = "minio" privateBucket = "/minio"
) )
// HandlerFunc - useful to chain different middleware http.Handler // 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) { func (h redirectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Re-direction handled specifically for browsers. // Re-direction handled specifically for browsers.
if strings.Contains(r.Header.Get("User-Agent"), "Mozilla") { 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 { switch r.URL.Path {
case "/", "/rpc", "/login": case "/", "/rpc", "/login":
location := path.Join(h.locationPrefix, r.URL.Path) location := h.locationPrefix + r.URL.Path
// Redirect to new location. // Redirect to new location.
http.Redirect(w, r, location, http.StatusTemporaryRedirect) http.Redirect(w, r, location, http.StatusTemporaryRedirect)
return return
@ -146,7 +143,7 @@ func setPrivateBucketHandler(h http.Handler) http.Handler {
func (h minioPrivateBucketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h minioPrivateBucketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// For all non browser requests, reject access to 'privateBucket'. // 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) writeErrorResponse(w, r, AllAccessDisabled, r.URL.Path)
return return
} }

4
routers.go
View File

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

3
web-handlers.go
View File

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