MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-23 12:43:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

gateway-s3: vendor-update minio-go (#4220)

Browse Source
This commit is contained in:
Krishna Srinivas 2017-05-02 18:46:39 -07:00 committed by Harshavardhana
parent 4aa65910e5
commit e5b2e25caf
17 changed files with 284 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/gateway-s3-anonymous.go
View File

@ -16,18 +16,25 @@
package cmd package cmd
import "io" import (
"io"
minio "github.com/minio/minio-go"
)
// AnonGetObject - Get object anonymously // AnonGetObject - Get object anonymously
func (l *s3Gateway) AnonGetObject(bucket string, key string, startOffset int64, length int64, writer io.Writer) error { func (l *s3Gateway) AnonGetObject(bucket string, key string, startOffset int64, length int64, writer io.Writer) error {
object, err := l.anonClient.GetObject(bucket, key) r := minio.NewGetReqHeaders()
if err := r.SetRange(startOffset, startOffset+length-1); err != nil {
return s3ToObjectError(traceError(err), bucket, key)
}
object, _, err := l.anonClient.GetObject(bucket, key, r)
if err != nil { if err != nil {
return s3ToObjectError(traceError(err), bucket, key) return s3ToObjectError(traceError(err), bucket, key)
} }
defer object.Close() defer object.Close()
object.Seek(startOffset, io.SeekStart)
if _, err := io.CopyN(writer, object, length); err != nil { if _, err := io.CopyN(writer, object, length); err != nil {
return s3ToObjectError(traceError(err), bucket, key) return s3ToObjectError(traceError(err), bucket, key)
} }
@ -37,7 +44,8 @@ func (l *s3Gateway) AnonGetObject(bucket string, key string, startOffset int64,
// AnonGetObjectInfo - Get object info anonymously // AnonGetObjectInfo - Get object info anonymously
func (l *s3Gateway) AnonGetObjectInfo(bucket string, object string) (ObjectInfo, error) { func (l *s3Gateway) AnonGetObjectInfo(bucket string, object string) (ObjectInfo, error) {
oi, err := l.anonClient.StatObject(bucket, object) r := minio.NewHeadReqHeaders()
oi, err := l.anonClient.StatObject(bucket, object, r)
if err != nil { if err != nil {
return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object) return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object)
} }

54
cmd/gateway-s3.go
View File

@ -17,8 +17,6 @@
package cmd package cmd
import ( import (
"crypto/sha256"
"hash"
"io" "io"
"net/http" "net/http"
"path" "path"
@ -264,17 +262,17 @@ func fromMinioClientListBucketResult(bucket string, result minio.ListBucketResul
// startOffset indicates the starting read location of the object. // startOffset indicates the starting read location of the object.
// length indicates the total length of the object. // length indicates the total length of the object.
func (l *s3Gateway) GetObject(bucket string, key string, startOffset int64, length int64, writer io.Writer) error { func (l *s3Gateway) GetObject(bucket string, key string, startOffset int64, length int64, writer io.Writer) error {
object, err := l.Client.GetObject(bucket, key) r := minio.NewGetReqHeaders()
if err := r.SetRange(startOffset, startOffset+length-1); err != nil {
return s3ToObjectError(traceError(err), bucket, key)
}
object, _, err := l.Client.GetObject(bucket, key, r)
if err != nil { if err != nil {
return s3ToObjectError(traceError(err), bucket, key) return s3ToObjectError(traceError(err), bucket, key)
} }
defer object.Close() defer object.Close()
if _, err := object.Seek(startOffset, io.SeekStart); err != nil {
return s3ToObjectError(traceError(err), bucket, key)
}
if _, err := io.CopyN(writer, object, length); err != nil { if _, err := io.CopyN(writer, object, length); err != nil {
return s3ToObjectError(traceError(err), bucket, key) return s3ToObjectError(traceError(err), bucket, key)
} }
@ -301,7 +299,8 @@ func fromMinioClientObjectInfo(bucket string, oi minio.ObjectInfo) ObjectInfo {
// GetObjectInfo reads object info and replies back ObjectInfo // GetObjectInfo reads object info and replies back ObjectInfo
func (l *s3Gateway) GetObjectInfo(bucket string, object string) (objInfo ObjectInfo, err error) { func (l *s3Gateway) GetObjectInfo(bucket string, object string) (objInfo ObjectInfo, err error) {
oi, err := l.Client.StatObject(bucket, object) r := minio.NewHeadReqHeaders()
oi, err := l.Client.StatObject(bucket, object, r)
if err != nil { if err != nil {
return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object) return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object)
} }
@ -311,36 +310,31 @@ func (l *s3Gateway) GetObjectInfo(bucket string, object string) (objInfo ObjectI
// PutObject creates a new object with the incoming data, // PutObject creates a new object with the incoming data,
func (l *s3Gateway) PutObject(bucket string, object string, size int64, data io.Reader, metadata map[string]string, sha256sum string) (ObjectInfo, error) { func (l *s3Gateway) PutObject(bucket string, object string, size int64, data io.Reader, metadata map[string]string, sha256sum string) (ObjectInfo, error) {
var sha256Writer hash.Hash var sha256sumBytes []byte
sha256sumBytes := []byte{} var err error
if sha256sum != "" {
teeReader := data sha256sumBytes, err = hex.DecodeString(sha256sum)
if sha256sum == "" { if err != nil {
} else if b, err := hex.DecodeString(sha256sum); err != nil { return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object)
return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object) }
} else {
sha256sumBytes = b
sha256Writer = sha256.New()
teeReader = io.TeeReader(data, sha256Writer)
} }
delete(metadata, "md5Sum") var md5sumBytes []byte
md5sum := metadata["md5Sum"]
if md5sum != "" {
md5sumBytes, err = hex.DecodeString(md5sum)
if err != nil {
return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object)
}
delete(metadata, "md5Sum")
}
oi, err := l.Client.PutObject(bucket, object, size, teeReader, nil, sha256sumBytes, toMinioClientMetadata(metadata)) oi, err := l.Client.PutObject(bucket, object, size, data, md5sumBytes, sha256sumBytes, toMinioClientMetadata(metadata))
if err != nil { if err != nil {
return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object) return ObjectInfo{}, s3ToObjectError(traceError(err), bucket, object)
} }
if sha256sum != "" {
newSHA256sum := hex.EncodeToString(sha256Writer.Sum(nil))
if newSHA256sum != sha256sum {
l.Client.RemoveObject(bucket, object)
return ObjectInfo{}, traceError(SHA256Mismatch{})
}
}
return fromMinioClientObjectInfo(bucket, oi), nil return fromMinioClientObjectInfo(bucket, oi), nil
} }

7
vendor/github.com/minio/minio-go/api-error-response.go generated vendored
View File

@ -134,6 +134,13 @@ func httpRespToErrorResponse(resp *http.Response, bucketName, objectName string)
Message: "Bucket not empty.", Message: "Bucket not empty.",
BucketName: bucketName, BucketName: bucketName,
} }
case http.StatusPreconditionFailed:
errResp = ErrorResponse{
Code: "PreconditionFailed",
Message: s3ErrorResponseMap["PreconditionFailed"],
BucketName: bucketName,
Key: objectName,
}
default: default:
errResp = ErrorResponse{ errResp = ErrorResponse{
Code: resp.Status, Code: resp.Status,

7
vendor/github.com/minio/minio-go/api-get-object-file.go generated vendored
View File

@ -78,8 +78,13 @@ func (c Client) FGetObject(bucketName, objectName, filePath string) error {
return err return err
} }
// Initialize get object request headers to set the
// appropriate range offsets to read from.
reqHeaders := NewGetReqHeaders()
reqHeaders.SetRange(st.Size(), 0)
// Seek to current position for incoming reader. // Seek to current position for incoming reader.
objectReader, objectStat, err := c.getObject(bucketName, objectName, st.Size(), 0) objectReader, objectStat, err := c.getObject(bucketName, objectName, reqHeaders)
if err != nil { if err != nil {
return err return err
} }

68
vendor/github.com/minio/minio-go/api-get-object.go generated vendored
View File

@ -1,5 +1,5 @@
/* /*
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc. * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016, 2017 Minio, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -67,6 +67,7 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
var httpReader io.ReadCloser var httpReader io.ReadCloser
var objectInfo ObjectInfo var objectInfo ObjectInfo
var err error var err error
// Create request channel. // Create request channel.
reqCh := make(chan getRequest) reqCh := make(chan getRequest)
// Create response channel. // Create response channel.
@ -79,6 +80,9 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
defer close(reqCh) defer close(reqCh)
defer close(resCh) defer close(resCh)
// Used to verify if etag of object has changed since last read.
var etag string
// Loop through the incoming control messages and read data. // Loop through the incoming control messages and read data.
for { for {
select { select {
@ -97,16 +101,19 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
if req.isFirstReq { if req.isFirstReq {
// First request is a Read/ReadAt. // First request is a Read/ReadAt.
if req.isReadOp { if req.isReadOp {
reqHeaders := NewGetReqHeaders()
// Differentiate between wanting the whole object and just a range. // Differentiate between wanting the whole object and just a range.
if req.isReadAt { if req.isReadAt {
// If this is a ReadAt request only get the specified range. // If this is a ReadAt request only get the specified range.
// Range is set with respect to the offset and length of the buffer requested. // Range is set with respect to the offset and length of the buffer requested.
// Do not set objectInfo from the first readAt request because it will not get // Do not set objectInfo from the first readAt request because it will not get
// the whole object. // the whole object.
httpReader, _, err = c.getObject(bucketName, objectName, req.Offset, int64(len(req.Buffer))) reqHeaders.SetRange(req.Offset, req.Offset+int64(len(req.Buffer))-1)
httpReader, objectInfo, err = c.getObject(bucketName, objectName, reqHeaders)
} else { } else {
reqHeaders.SetRange(req.Offset, 0)
// First request is a Read request. // First request is a Read request.
httpReader, objectInfo, err = c.getObject(bucketName, objectName, req.Offset, 0) httpReader, objectInfo, err = c.getObject(bucketName, objectName, reqHeaders)
} }
if err != nil { if err != nil {
resCh <- getResponse{ resCh <- getResponse{
@ -114,6 +121,7 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
} }
return return
} }
etag = objectInfo.ETag
// Read at least firstReq.Buffer bytes, if not we have // Read at least firstReq.Buffer bytes, if not we have
// reached our EOF. // reached our EOF.
size, err := io.ReadFull(httpReader, req.Buffer) size, err := io.ReadFull(httpReader, req.Buffer)
@ -140,13 +148,18 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
// Exit the go-routine. // Exit the go-routine.
return return
} }
etag = objectInfo.ETag
// Send back the first response. // Send back the first response.
resCh <- getResponse{ resCh <- getResponse{
objectInfo: objectInfo, objectInfo: objectInfo,
} }
} }
} else if req.settingObjectInfo { // Request is just to get objectInfo. } else if req.settingObjectInfo { // Request is just to get objectInfo.
objectInfo, err := c.StatObject(bucketName, objectName) reqHeaders := NewGetReqHeaders()
if etag != "" {
reqHeaders.SetMatchETag(etag)
}
objectInfo, err := c.statObject(bucketName, objectName, reqHeaders)
if err != nil { if err != nil {
resCh <- getResponse{ resCh <- getResponse{
Error: err, Error: err,
@ -166,6 +179,10 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
// new ones when they haven't been already. // new ones when they haven't been already.
// All readAt requests are new requests. // All readAt requests are new requests.
if req.DidOffsetChange || !req.beenRead { if req.DidOffsetChange || !req.beenRead {
reqHeaders := NewGetReqHeaders()
if etag != "" {
reqHeaders.SetMatchETag(etag)
}
if httpReader != nil { if httpReader != nil {
// Close previously opened http reader. // Close previously opened http reader.
httpReader.Close() httpReader.Close()
@ -173,9 +190,12 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
// If this request is a readAt only get the specified range. // If this request is a readAt only get the specified range.
if req.isReadAt { if req.isReadAt {
// Range is set with respect to the offset and length of the buffer requested. // Range is set with respect to the offset and length of the buffer requested.
httpReader, _, err = c.getObject(bucketName, objectName, req.Offset, int64(len(req.Buffer))) reqHeaders.SetRange(req.Offset, req.Offset+int64(len(req.Buffer))-1)
httpReader, _, err = c.getObject(bucketName, objectName, reqHeaders)
} else { } else {
httpReader, objectInfo, err = c.getObject(bucketName, objectName, req.Offset, 0) // Range is set with respect to the offset.
reqHeaders.SetRange(req.Offset, 0)
httpReader, objectInfo, err = c.getObject(bucketName, objectName, reqHeaders)
} }
if err != nil { if err != nil {
resCh <- getResponse{ resCh <- getResponse{
@ -230,8 +250,8 @@ type getResponse struct {
objectInfo ObjectInfo // Used for the first request. objectInfo ObjectInfo // Used for the first request.
} }
// Object represents an open object. It implements Read, ReadAt, // Object represents an open object. It implements
// Seeker, Close for a HTTP stream. // Reader, ReaderAt, Seeker, Closer for a HTTP stream.
type Object struct { type Object struct {
// Mutex. // Mutex.
mutex *sync.Mutex mutex *sync.Mutex
@ -269,6 +289,12 @@ type Object struct {
func (o *Object) doGetRequest(request getRequest) (getResponse, error) { func (o *Object) doGetRequest(request getRequest) (getResponse, error) {
o.reqCh <- request o.reqCh <- request
response := <-o.resCh response := <-o.resCh
// Return any error to the top level.
if response.Error != nil {
return response, response.Error
}
// This was the first request. // This was the first request.
if !o.isStarted { if !o.isStarted {
// The object has been operated on. // The object has been operated on.
@ -284,11 +310,6 @@ func (o *Object) doGetRequest(request getRequest) (getResponse, error) {
if !o.beenRead { if !o.beenRead {
o.beenRead = response.didRead o.beenRead = response.didRead
} }
// Return any error to the top level.
if response.Error != nil {
return response, response.Error
}
// Data are ready on the wire, no need to reinitiate connection in lower level // Data are ready on the wire, no need to reinitiate connection in lower level
o.seekData = false o.seekData = false
@ -594,7 +615,7 @@ func newObject(reqCh chan<- getRequest, resCh <-chan getResponse, doneCh chan<-
// //
// For more information about the HTTP Range header. // For more information about the HTTP Range header.
// go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35. // go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.
func (c Client) getObject(bucketName, objectName string, offset, length int64) (io.ReadCloser, ObjectInfo, error) { func (c Client) getObject(bucketName, objectName string, reqHeaders RequestHeaders) (io.ReadCloser, ObjectInfo, error) {
// Validate input arguments. // Validate input arguments.
if err := isValidBucketName(bucketName); err != nil { if err := isValidBucketName(bucketName); err != nil {
return nil, ObjectInfo{}, err return nil, ObjectInfo{}, err
@ -603,22 +624,18 @@ func (c Client) getObject(bucketName, objectName string, offset, length int64) (
return nil, ObjectInfo{}, err return nil, ObjectInfo{}, err
} }
// Set all the necessary reqHeaders.
customHeader := make(http.Header) customHeader := make(http.Header)
// Set ranges if length and offset are valid. for key, value := range reqHeaders.Header {
// See https://tools.ietf.org/html/rfc7233#section-3.1 for reference. customHeader[key] = value
if length > 0 && offset >= 0 {
customHeader.Set("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+length-1))
} else if offset > 0 && length == 0 {
customHeader.Set("Range", fmt.Sprintf("bytes=%d-", offset))
} else if length < 0 && offset == 0 {
customHeader.Set("Range", fmt.Sprintf("bytes=%d", length))
} }
// Execute GET on objectName. // Execute GET on objectName.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
objectName: objectName, objectName: objectName,
customHeader: customHeader, customHeader: customHeader,
contentSHA256Bytes: emptySHA256,
}) })
if err != nil { if err != nil {
return nil, ObjectInfo{}, err return nil, ObjectInfo{}, err
@ -645,6 +662,7 @@ func (c Client) getObject(bucketName, objectName string, offset, length int64) (
Region: resp.Header.Get("x-amz-bucket-region"), Region: resp.Header.Get("x-amz-bucket-region"),
} }
} }
// Get content-type. // Get content-type.
contentType := strings.TrimSpace(resp.Header.Get("Content-Type")) contentType := strings.TrimSpace(resp.Header.Get("Content-Type"))
if contentType == "" { if contentType == "" {

5
vendor/github.com/minio/minio-go/api-get-policy.go generated vendored
View File

@ -79,8 +79,9 @@ func (c Client) getBucketPolicy(bucketName string) (policy.BucketAccessPolicy, e
// Execute GET on bucket to list objects. // Execute GET on bucket to list objects.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)

24
vendor/github.com/minio/minio-go/api-list.go generated vendored
View File

@ -35,7 +35,7 @@ import (
// //
func (c Client) ListBuckets() ([]BucketInfo, error) { func (c Client) ListBuckets() ([]BucketInfo, error) {
// Execute GET on service. // Execute GET on service.
resp, err := c.executeMethod("GET", requestMetadata{}) resp, err := c.executeMethod("GET", requestMetadata{contentSHA256Bytes: emptySHA256})
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
return nil, err return nil, err
@ -211,8 +211,9 @@ func (c Client) listObjectsV2Query(bucketName, objectPrefix, continuationToken s
// Execute GET on bucket to list objects. // Execute GET on bucket to list objects.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -381,8 +382,9 @@ func (c Client) listObjectsQuery(bucketName, objectPrefix, objectMarker, delimit
// Execute GET on bucket to list objects. // Execute GET on bucket to list objects.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -559,8 +561,9 @@ func (c Client) listMultipartUploadsQuery(bucketName, keyMarker, uploadIDMarker,
// Execute GET on bucketName to list multipart uploads. // Execute GET on bucketName to list multipart uploads.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -676,9 +679,10 @@ func (c Client) listObjectPartsQuery(bucketName, objectName, uploadID string, pa
// Execute GET on objectName to get list of parts. // Execute GET on objectName to get list of parts.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
objectName: objectName, objectName: objectName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {

10
vendor/github.com/minio/minio-go/api-notification.go generated vendored
View File

@ -47,8 +47,9 @@ func (c Client) getBucketNotification(bucketName string) (BucketNotification, er
// Execute GET on bucket to list objects. // Execute GET on bucket to list objects.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
@ -170,8 +171,9 @@ func (c Client) ListenBucketNotification(bucketName, prefix, suffix string, even
// Execute GET on bucket to list objects. // Execute GET on bucket to list objects.
resp, err := c.executeMethod("GET", requestMetadata{ resp, err := c.executeMethod("GET", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
if err != nil { if err != nil {
continue continue

5
vendor/github.com/minio/minio-go/api-put-bucket.go generated vendored
View File

@ -272,8 +272,9 @@ func (c Client) removeBucketPolicy(bucketName string) error {
// Execute DELETE on objectName. // Execute DELETE on objectName.
resp, err := c.executeMethod("DELETE", requestMetadata{ resp, err := c.executeMethod("DELETE", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {

15
vendor/github.com/minio/minio-go/api-remove.go generated vendored
View File

@ -35,7 +35,8 @@ func (c Client) RemoveBucket(bucketName string) error {
} }
// Execute DELETE on bucket. // Execute DELETE on bucket.
resp, err := c.executeMethod("DELETE", requestMetadata{ resp, err := c.executeMethod("DELETE", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -64,8 +65,9 @@ func (c Client) RemoveObject(bucketName, objectName string) error {
} }
// Execute DELETE on objectName. // Execute DELETE on objectName.
resp, err := c.executeMethod("DELETE", requestMetadata{ resp, err := c.executeMethod("DELETE", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
objectName: objectName, objectName: objectName,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -248,9 +250,10 @@ func (c Client) abortMultipartUpload(bucketName, objectName, uploadID string) er
// Execute DELETE on multipart upload. // Execute DELETE on multipart upload.
resp, err := c.executeMethod("DELETE", requestMetadata{ resp, err := c.executeMethod("DELETE", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
objectName: objectName, objectName: objectName,
queryValues: urlValues, queryValues: urlValues,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {

29
vendor/github.com/minio/minio-go/api-stat.go generated vendored
View File

@ -34,7 +34,8 @@ func (c Client) BucketExists(bucketName string) (bool, error) {
// Execute HEAD on bucketName. // Execute HEAD on bucketName.
resp, err := c.executeMethod("HEAD", requestMetadata{ resp, err := c.executeMethod("HEAD", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
contentSHA256Bytes: emptySHA256,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -85,11 +86,31 @@ func (c Client) StatObject(bucketName, objectName string) (ObjectInfo, error) {
if err := isValidObjectName(objectName); err != nil { if err := isValidObjectName(objectName); err != nil {
return ObjectInfo{}, err return ObjectInfo{}, err
} }
reqHeaders := NewHeadReqHeaders()
return c.statObject(bucketName, objectName, reqHeaders)
}
// Lower level API for statObject supporting pre-conditions and range headers.
func (c Client) statObject(bucketName, objectName string, reqHeaders RequestHeaders) (ObjectInfo, error) {
// Input validation.
if err := isValidBucketName(bucketName); err != nil {
return ObjectInfo{}, err
}
if err := isValidObjectName(objectName); err != nil {
return ObjectInfo{}, err
}
customHeader := make(http.Header)
for k, v := range reqHeaders.Header {
customHeader[k] = v
}
// Execute HEAD on objectName. // Execute HEAD on objectName.
resp, err := c.executeMethod("HEAD", requestMetadata{ resp, err := c.executeMethod("HEAD", requestMetadata{
bucketName: bucketName, bucketName: bucketName,
objectName: objectName, objectName: objectName,
contentSHA256Bytes: emptySHA256,
customHeader: customHeader,
}) })
defer closeResponse(resp) defer closeResponse(resp)
if err != nil { if err != nil {
@ -122,6 +143,7 @@ func (c Client) StatObject(bucketName, objectName string) (ObjectInfo, error) {
} }
} }
} }
// Parse Last-Modified has http time format. // Parse Last-Modified has http time format.
date, err := time.Parse(http.TimeFormat, resp.Header.Get("Last-Modified")) date, err := time.Parse(http.TimeFormat, resp.Header.Get("Last-Modified"))
if err != nil { if err != nil {
@ -135,6 +157,7 @@ func (c Client) StatObject(bucketName, objectName string) (ObjectInfo, error) {
Region: resp.Header.Get("x-amz-bucket-region"), Region: resp.Header.Get("x-amz-bucket-region"),
} }
} }
// Fetch content type if any present. // Fetch content type if any present.
contentType := strings.TrimSpace(resp.Header.Get("Content-Type")) contentType := strings.TrimSpace(resp.Header.Get("Content-Type"))
if contentType == "" { if contentType == "" {

20
vendor/github.com/minio/minio-go/api.go generated vendored
View File

@ -654,27 +654,23 @@ func (c Client) newRequest(method string, metadata requestMetadata) (req *http.R
return req, nil return req, nil
} // Sign the request for all authenticated requests. } // Sign the request for all authenticated requests.
if c.signature.isV2() { switch {
case c.signature.isV2():
// Add signature version '2' authorization header. // Add signature version '2' authorization header.
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey) req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
} else if c.signature.isV4() || c.signature.isStreamingV4() && case c.signature.isStreamingV4() && method == "PUT":
method != "PUT" { req = s3signer.StreamingSignV4(req, c.accessKeyID,
c.secretAccessKey, location, metadata.contentLength, time.Now().UTC())
default:
// Set sha256 sum for signature calculation only with signature version '4'. // Set sha256 sum for signature calculation only with signature version '4'.
shaHeader := unsignedPayload shaHeader := unsignedPayload
if !c.secure { if len(metadata.contentSHA256Bytes) > 0 {
if metadata.contentSHA256Bytes == nil { shaHeader = hex.EncodeToString(metadata.contentSHA256Bytes)
shaHeader = hex.EncodeToString(sum256([]byte{}))
} else {
shaHeader = hex.EncodeToString(metadata.contentSHA256Bytes)
}
} }
req.Header.Set("X-Amz-Content-Sha256", shaHeader) req.Header.Set("X-Amz-Content-Sha256", shaHeader)
// Add signature version '4' authorization header. // Add signature version '4' authorization header.
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, location) req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, location)
} else if c.signature.isStreamingV4() {
req = s3signer.StreamingSignV4(req, c.accessKeyID,
c.secretAccessKey, location, metadata.contentLength, time.Now().UTC())
} }
// Return request. // Return request.

13
vendor/github.com/minio/minio-go/core.go generated vendored
View File

@ -98,3 +98,16 @@ func (c Core) GetBucketPolicy(bucket string) (policy.BucketAccessPolicy, error)
func (c Core) PutBucketPolicy(bucket string, bucketPolicy policy.BucketAccessPolicy) error { func (c Core) PutBucketPolicy(bucket string, bucketPolicy policy.BucketAccessPolicy) error {
return c.putBucketPolicy(bucket, bucketPolicy) return c.putBucketPolicy(bucket, bucketPolicy)
} }
// GetObject is a lower level API implemented to support reading
// partial objects and also downloading objects with special conditions
// matching etag, modtime etc.
func (c Core) GetObject(bucketName, objectName string, reqHeaders RequestHeaders) (io.ReadCloser, ObjectInfo, error) {
return c.getObject(bucketName, objectName, reqHeaders)
}
// StatObject is a lower level API implemented to support special
// conditions matching etag, modtime on a request.
func (c Core) StatObject(bucketName, objectName string, reqHeaders RequestHeaders) (ObjectInfo, error) {
return c.statObject(bucketName, objectName, reqHeaders)
}

BIN
vendor/github.com/minio/minio-go/my-testfile generated vendored Normal file
View File

Binary file not shown.

105
vendor/github.com/minio/minio-go/request-headers.go generated vendored Normal file
View File

@ -0,0 +1,105 @@
/*
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2016 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 minio
import (
"fmt"
"net/http"
"time"
)
// RequestHeaders - implement methods for setting special
// request headers for GET, HEAD object operations.
// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectGET.html
type RequestHeaders struct {
http.Header
}
// NewGetReqHeaders - initializes a new request headers for GET request.
func NewGetReqHeaders() RequestHeaders {
return RequestHeaders{
Header: make(http.Header),
}
}
// NewHeadReqHeaders - initializes a new request headers for HEAD request.
func NewHeadReqHeaders() RequestHeaders {
return RequestHeaders{
Header: make(http.Header),
}
}
// SetMatchETag - set match etag.
func (c RequestHeaders) SetMatchETag(etag string) error {
if etag == "" {
return ErrInvalidArgument("ETag cannot be empty.")
}
c.Set("If-Match", etag)
return nil
}
// SetMatchETagExcept - set match etag except.
func (c RequestHeaders) SetMatchETagExcept(etag string) error {
if etag == "" {
return ErrInvalidArgument("ETag cannot be empty.")
}
c.Set("If-None-Match", etag)
return nil
}
// SetUnmodified - set unmodified time since.
func (c RequestHeaders) SetUnmodified(modTime time.Time) error {
if modTime.IsZero() {
return ErrInvalidArgument("Modified since cannot be empty.")
}
c.Set("If-Unmodified-Since", modTime.Format(http.TimeFormat))
return nil
}
// SetModified - set modified time since.
func (c RequestHeaders) SetModified(modTime time.Time) error {
if modTime.IsZero() {
return ErrInvalidArgument("Modified since cannot be empty.")
}
c.Set("If-Modified-Since", modTime.Format(http.TimeFormat))
return nil
}
// SetRange - set the start and end offset of the object to be read.
// See https://tools.ietf.org/html/rfc7233#section-3.1 for reference.
func (c RequestHeaders) SetRange(start, end int64) error {
switch {
case start <= 0 && end < 0:
// Read everything until the 'end'. `bytes=-N`
c.Set("Range", fmt.Sprintf("bytes=%d", end))
case start > 0 && end == 0:
// Read everything starting from offset 'start'. `bytes=N-`
c.Set("Range", fmt.Sprintf("bytes=%d-", start))
case start > 0 && end > 0 && end >= start:
// Read everything starting at 'start' till the 'end'. `bytes=N-M`
c.Set("Range", fmt.Sprintf("bytes=%d-%d", start, end))
case start == 0 && end == 0:
// Client attempting to read the whole file.
return nil
}
// All other cases such as
// bytes=-N-
// bytes=N-M where M < N
// These return error and are not supported.
return ErrInvalidArgument(fmt.Sprintf("Invalid range start and end specified bytes=%d-%d",
start, end))
}

2
vendor/github.com/minio/minio-go/signature-type.go generated vendored
View File

@ -27,6 +27,8 @@ const (
SignatureV4Streaming SignatureV4Streaming
) )
var emptySHA256 = sum256(nil)
// isV2 - is signature SignatureV2? // isV2 - is signature SignatureV2?
func (s SignatureType) isV2() bool { func (s SignatureType) isV2() bool {
return s == SignatureV2 return s == SignatureV2

6
vendor/vendor.json vendored
View File

@ -216,10 +216,10 @@
"revisionTime": "2016-02-29T08:42:30-08:00" "revisionTime": "2016-02-29T08:42:30-08:00"
}, },
{ {
"checksumSHA1": "rtVzxCyARW7zRG1jUf3K7o9vyt0=", "checksumSHA1": "E0n14tprPsyG3s4MXxZmLrcaNm4=",
"path": "github.com/minio/minio-go", "path": "github.com/minio/minio-go",
"revision": "5297a818b482fa329b3dc1a3926e3c4c6fb5d459", "revision": "fe31943bd4638093653a6a584dc1c6c6487e06c9",
"revisionTime": "2017-04-26T18:23:05Z" "revisionTime": "2017-05-02T08:16:08Z"
}, },
{ {
"checksumSHA1": "lsxCcRcNUDxhQyO999SOdvKzzfM=", "checksumSHA1": "lsxCcRcNUDxhQyO999SOdvKzzfM=",