Merge lp:~andyxu/goamz/goamz into lp:goamz

[AndyXu]

Fix SignV4 method for S3

The SignV4 method which is implemented in the last commit was not called by S3, therefore this library will not work for Amazon S3 if you choose to use SignV4 Algorithm.

The S3 object is already implemented as 'Signer' interface in the last commit, so in stead of using signing function inside S3 package, method 'Sign' is called now(line 82 and 90 in the diff).

Note that the 'x-amz-date' and 'x-amz-content-sha256' header are both necessary for GET and PUT (at least in mainland China) even though the manual says they are optional.

This commit is tested against a S3 instance in mainland China.

[AndyXu (andyxu)]

All interfaces in the library were not touched at all, just fixed the internal logic(see line 82 and 90 in the diff.)

[Dimiter Naydenov (dimitern)]

@andyxu can you re-propose this against github.com/go-amz/amz ?

Unmerged revisions

50. By AndyXu on 2014-10-09

fix the SignV4 method for S3: add x-amz-date and x-amz-content-sha256 in the header

=== modified file 'aws/sign.go'
--- aws/sign.go	2014-08-12 16:50:47 +0000
+++ aws/sign.go	2014-10-09 08:40:10 +0000
@@ -243,6 +243,9 @@
 // Returns a SHA256 checksum of the request body. Represented as a
 // lowercase hexadecimal string.
 func payloadHash(req *http.Request, hasher hasher) (string, error) {
+	if req.Body == nil {
+		return hasher([]byte("")), nil
+	}
 	if b, err := ioutil.ReadAll(req.Body); err != nil {
 		return "", err
 	} else {

=== modified file 's3/s3.go'
--- s3/s3.go	2014-02-12 13:42:33 +0000
+++ s3/s3.go	2014-10-09 08:40:10 +0000
@@ -10,6 +10,7 @@
 
 import (
 	"bytes"
+	"crypto/sha256"
 	"encoding/xml"
 	"fmt"
 	"io"
@@ -25,7 +26,11 @@
 	"time"
 )
 
-const debug = false
+const (
+	debug                   = false
+	ISO8601BasicFormat      = "20060102T150405Z"
+	ISO8601BasicFormatShort = "20060102"
+)
 
 // The S3 type encapsulates operations with an S3 region.
 type S3 struct {
@@ -159,9 +164,14 @@
 // It is the caller's responsibility to call Close on rc when
 // finished reading.
 func (b *Bucket) GetReader(path string) (rc io.ReadCloser, err error) {
+	headers := map[string][]string{
+		"X-Amz-Content-Sha256": {fmt.Sprintf("%x", sha256.Sum256([]byte("")))},
+		"X-Amz-Date":           {time.Now().In(time.UTC).Format(ISO8601BasicFormat)},
+	}
 	req := &request{
-		bucket: b.Name,
-		path:   path,
+		bucket:  b.Name,
+		path:    path,
+		headers: headers,
 	}
 	err = b.S3.prepare(req)
 	if err != nil {
@@ -191,10 +201,18 @@
 // PutReader inserts an object into the S3 bucket by consuming data
 // from r until EOF.
 func (b *Bucket) PutReader(path string, r io.Reader, length int64, contType string, perm ACL) error {
+	payloadBytes, err := ioutil.ReadAll(r)
+	if err != nil {
+		return err
+	}
+	r = ioutil.NopCloser(bytes.NewBuffer(payloadBytes))
+
 	headers := map[string][]string{
-		"Content-Length": {strconv.FormatInt(length, 10)},
-		"Content-Type":   {contType},
-		"x-amz-acl":      {string(perm)},
+		"Content-Length":       {strconv.FormatInt(length, 10)},
+		"Content-Type":         {contType},
+		"X-Amz-Acl":            {string(perm)},
+		"X-Amz-Content-Sha256": {fmt.Sprintf("%x", sha256.Sum256(payloadBytes))},
+		"X-Amz-Date":           {time.Now().In(time.UTC).Format(ISO8601BasicFormat)},
 	}
 	req := &request{
 		method:  "PUT",
@@ -455,7 +473,6 @@
 	}
 	req.headers["Host"] = []string{u.Host}
 	req.headers["Date"] = []string{time.Now().In(time.UTC).Format(time.RFC1123)}
-	sign(s3.Auth, req.method, req.signpath, req.params, req.headers)
 	return nil
 }
 
@@ -486,6 +503,7 @@
 	if req.payload != nil {
 		hreq.Body = ioutil.NopCloser(req.payload)
 	}
+	s3.Sign(&hreq, s3.Auth)
 
 	hresp, err := http.DefaultClient.Do(&hreq)
 	if err != nil {