MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 12:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove bucketpolicy handlers and all its references

Browse Source
This commit is contained in:
Harshavardhana
2015-04-22 14:44:59 -07:00
parent ed67a1269d
commit b121c8588f
14 changed files with 4 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/api/api_bucket_handlers.go
View File

@@ -36,23 +36,9 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ
bucket := vars["bucket"]
resources := getBucketResources(req.URL.Query())
if resources.Policy == true {
// TODO
// ----
// This is handled here instead of router, is only because semantically
// resource queries are not treated differently by Gorilla mux
//
// In-fact a request coming in as /bucket/?policy={} and /bucket/object are
// treated similarly. A proper fix would be to remove this comment and
// find a right regex pattern for individual requests
server.getBucketPolicyHandler(w, req)
return
}
if resources.Maxkeys == 0 {
resources.Maxkeys = maxObjectList
}
acceptsContentType := getContentType(req)
objects, resources, err := server.driver.ListObjects(bucket, resources)
switch err.(type) {
@@ -121,12 +107,6 @@ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Reques
bucket := vars["bucket"]
err := server.driver.CreateBucket(bucket)
resources := getBucketResources(req.URL.Query())
if resources.Policy == true {
server.putBucketPolicyHandler(w, req)
return
}
acceptsContentType := getContentType(req)
switch err.(type) {
case nil:
@@ -158,7 +138,6 @@ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Reques
// have permission to access it. Otherwise, the operation might
// return responses such as 404 Not Found and 403 Forbidden.
func (server *minioAPI) headBucketHandler(w http.ResponseWriter, req *http.Request) {
// TODO need to peek into bucketPolicy return appropriate checks here
vars := mux.Vars(req)
bucket := vars["bucket"]
acceptsContentType := getContentType(req)

1
pkg/api/api_definitions.go
View File

@@ -77,6 +77,7 @@ type Owner struct {
// List of not implemented bucket queries
var unimplementedBucketResourceNames = map[string]bool{
"acl": true,
"policy": true,
"cors": true,
"lifecycle": true,
"location": true,

14
pkg/api/api_object_handlers.go
View File

@@ -134,20 +134,6 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
bucket = vars["bucket"]
object = vars["object"]
resources := getBucketResources(req.URL.Query())
if resources.Policy == true && object == "" {
// TODO
// ----
// This is handled here instead of router, is only because semantically
// resource queries are not treated differently by Gorilla mux
//
// In-fact a request coming in as /bucket/?policy={} and /bucket/object are
// treated similarly. A proper fix would be to remove this comment and
// find a right regex pattern for individual requests
server.putBucketPolicyHandler(w, req)
return
}
// get Content-MD5 sent by client
md5 := req.Header.Get("Content-MD5")
err := server.driver.CreateObject(bucket, object, "", md5, req.Body)

121
pkg/api/api_policy_handlers.go
View File

@@ -1,121 +0,0 @@
/*
* Minimalist Object Storage, (C) 2015 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package api
import (
"encoding/json"
"net/http"
"github.com/gorilla/mux"
"github.com/minio-io/minio/pkg/iodine"
"github.com/minio-io/minio/pkg/storage/drivers"
"github.com/minio-io/minio/pkg/utils/log"
)
// PUT Bucket policy
// -----------------
// This implementation of the PUT operation uses the policy subresource
// to add to or replace a policy on a bucket
func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
bucket := vars["bucket"]
acceptsContentType := getContentType(req)
policy, ok := drivers.Parsepolicy(req.Body)
if ok == false {
writeErrorResponse(w, req, InvalidPolicyDocument, acceptsContentType, req.URL.Path)
return
}
err := server.driver.CreateBucketPolicy(bucket, policy)
switch err := err.(type) {
case nil:
{
w.WriteHeader(http.StatusNoContent)
setCommonHeaders(w, getContentTypeString(acceptsContentType))
w.Header().Set("Connection", "keep-alive")
}
case drivers.BucketNameInvalid:
{
writeErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path)
}
case drivers.BucketNotFound:
{
writeErrorResponse(w, req, NoSuchBucket, acceptsContentType, req.URL.Path)
}
case drivers.BackendCorrupted:
{
log.Error.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
case drivers.ImplementationError:
{
log.Error.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
}
}
// GET Bucket policy
// -----------------
// This implementation of the GET operation uses the policy subresource
// to return the policy of a specified bucket.
func (server *minioAPI) getBucketPolicyHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
bucket := vars["bucket"]
acceptsContentType := getContentType(req)
p, err := server.driver.GetBucketPolicy(bucket)
switch err := err.(type) {
case nil:
{
responsePolicy, err := json.Marshal(p)
if err != nil {
// log error
log.Error.Println(iodine.New(err, nil))
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
return
}
setCommonHeaders(w, getContentTypeString(acceptsContentType))
w.Header().Set("Connection", "keep-alive")
w.WriteHeader(http.StatusOK)
w.Write(responsePolicy)
}
case drivers.BucketNameInvalid:
{
writeErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path)
}
case drivers.BucketNotFound:
{
writeErrorResponse(w, req, NoSuchBucket, acceptsContentType, req.URL.Path)
}
case drivers.BucketPolicyNotFound:
{
writeErrorResponse(w, req, NoSuchBucketPolicy, acceptsContentType, req.URL.Path)
}
case drivers.BackendCorrupted:
{
log.Error.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
case drivers.ImplementationError:
{
log.Error.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
}
}

12
pkg/api/errors.go
View File

@@ -61,8 +61,6 @@ const (
RequestTimeTooSkewed
SignatureDoesNotMatch
TooManyBuckets
InvalidPolicyDocument
NoSuchBucketPolicy
)
// Error code to Error structure map
@@ -172,16 +170,6 @@ var errorCodeResponse = map[int]Error{
Description: "You have attempted to create more buckets than allowed.",
HTTPStatusCode: http.StatusBadRequest,
},
InvalidPolicyDocument: {
Code: "InvalidPolicyDocument",
Description: "The content of the form does not meet the conditions specified in the policy document.",
HTTPStatusCode: http.StatusBadRequest,
},
NoSuchBucketPolicy: {
Code: "NoSuchBucketPolicy",
Description: "The specified bucket does not have a bucket policy.",
HTTPStatusCode: http.StatusNotFound,
},
}
// errorCodeError provides errorCode to Error. It returns empty if the code provided is unknown

2
pkg/api/resources.go
View File

@@ -33,8 +33,6 @@ func getBucketResources(values url.Values) (v drivers.BucketResourcesMetadata) {
v.Marker = value[0]
case key == "max-keys":
v.Maxkeys, _ = strconv.Atoi(value[0])
case key == "policy":
v.Policy = true
case key == "delimiter":
v.Delimiter = value[0]
}