Merge pull request #1145 from harshavardhana/bucket

web: Handle private bucket match from prefix to exact match.
master
Harshavardhana 9 years ago
commit d3966d1dde
  1. 25
      generic-handlers.go
  2. 11
      web-handlers.go

@ -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
}

@ -174,10 +174,13 @@ func (web *webAPI) ListBuckets(r *http.Request, args *ListBucketsArgs, reply *Li
return &json2.Error{Message: e.Error()}
}
for _, bucket := range buckets {
reply.Buckets = append(reply.Buckets, BucketInfo{
Name: bucket.Name,
CreationDate: bucket.CreationDate,
})
// List all buckets which are not private.
if bucket.Name != privateBucket {
reply.Buckets = append(reply.Buckets, BucketInfo{
Name: bucket.Name,
CreationDate: bucket.CreationDate,
})
}
}
reply.UIVersion = uiVersion
return nil

Loading…
Cancel
Save