Merge pull request #22 from ks3sdklib/dev

Dev

Author: wilac-pv

aws/request.go

@@ -2,22 +2,22 @@ package aws
 
 import (
 	"bytes"
+	"github.com/ks3sdklib/aws-sdk-go/aws/awsutil"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"reflect"
 	"strings"
 	"time"
-	"github.com/ks3sdklib/aws-sdk-go/aws/awsutil"
 )
 
 // A Request is the service request to be made.
 type Request struct {
 	*Service
 	Handlers     Handlers
 	Time         time.Time
-	ExpireTime   time.Duration
+	ExpireTime   int64
 	Operation    *Operation
 	HTTPRequest  *http.Request
 	HTTPResponse *http.Response
@@ -65,7 +65,7 @@ func NewRequest(service *Service, operation *Operation, params interface{}, data
 	if p == "" {
 		p = "/"
 	}
-	
+
 	httpReq, _ := http.NewRequest(method, "", nil)
 	httpReq.URL, _ = url.Parse(service.Endpoint + p)
 
@@ -85,6 +85,20 @@ func NewRequest(service *Service, operation *Operation, params interface{}, data
 	return r
 }
 
+func NewRequestV2(service *Service, method string, params interface{}) *Request {
+
+	httpReq, _ := http.NewRequest(method, "", nil)
+	httpReq.URL, _ = url.Parse(service.Endpoint)
+	r := &Request{
+		Service:     service,
+		ExpireTime:  0,
+		HTTPRequest: httpReq,
+		Params:      params,
+		Error:       nil,
+	}
+	return r
+}
+
 // WillRetry returns if the request's can be retried.
 func (r *Request) WillRetry() bool {
 	return r.Error != nil && r.Retryable.Get() && r.RetryCount < r.Service.MaxRetries()
@@ -121,17 +135,6 @@ func (r *Request) SetReaderBody(reader io.ReadSeeker) {
 	r.Body = reader
 }
 
-// Presign returns the request's signed URL. Error will be returned
-// if the signing fails.
-func (r *Request) Presign(expireTime time.Duration) (string, error) {
-	r.ExpireTime = expireTime
-	r.Sign()
-	if r.Error != nil {
-		return "", r.Error
-	}
-	return r.HTTPRequest.URL.String(), nil
-}
-
 // Build will build the request's object so it can be signed and sent
 // to the service. Build will also validate all the request's parameters.
 // Anny additional build Handlers set on this request will be run
@@ -177,7 +180,7 @@ func (r *Request) Sign() error {
 func (r *Request) Send() error {
 	for {
 		r.Sign()
-		
+
 		if r.Error != nil {
 			return r.Error
 		}

internal/signer/v2/v2.go

@@ -62,7 +62,7 @@ type signer struct {
 	Service     *aws.Service
 	Request     *http.Request
 	Time        time.Time
-	ExpireTime  time.Duration
+	ExpireTime  int64
 	ServiceName string
 	Region      string
 	CredValues  credentials.Value
@@ -187,7 +187,7 @@ func (v2 *signer) buildTime() {
 	v2.formattedTime = v2.Time.UTC().Format(timeFormat)
 
 	if v2.isPresign {
-		duration := int64(v2.ExpireTime / time.Second)
+		duration := int64(v2.ExpireTime)
 		v2.Query.Set("Expires", strconv.FormatInt(duration, 10))
 	} else {
 		v2.Request.Header.Set("Date", v2.formattedTime)
@@ -305,7 +305,6 @@ func (v2 *signer) buildStringToSign() {
 	if len(typelist) > 0 {
 		contenttype = v2.Request.Header["Content-Type"][0]
 	}
-
 	signItems := []string{v2.Request.Method, md5, contenttype}
 	if v2.isPresign {
 		signItems = append(signItems, v2.Query["Expires"][0])

internal/signer/v4/v4.go

@@ -36,7 +36,7 @@ var ignoredHeaders = map[string]bool{
 type signer struct {
 	Request     *http.Request
 	Time        time.Time
-	ExpireTime  time.Duration
+	ExpireTime  int64
 	ServiceName string
 	Region      string
 	CredValues  credentials.Value
@@ -192,7 +192,7 @@ func (v4 *signer) buildTime() {
 	v4.formattedShortTime = v4.Time.UTC().Format(shortTimeFormat)
 
 	if v4.isPresign {
-		duration := int64(v4.ExpireTime / time.Second)
+		duration := int64(v4.ExpireTime)
 		v4.Query.Set("X-Amz-Date", v4.formattedTime)
 		v4.Query.Set("X-Amz-Expires", strconv.FormatInt(duration, 10))
 	} else {

internal/signer/v4/v4_test.go

@@ -175,7 +175,7 @@ func TestIgnorePreResignRequestWithValidCreds(t *testing.T) {
 		nil,
 		nil,
 	)
-	r.ExpireTime = time.Minute * 10
+	r.ExpireTime = 10
 
 	Sign(r)
 	sig := r.HTTPRequest.Header.Get("X-Amz-Signature")
@@ -205,31 +205,6 @@ func TestResignRequestExpiredCreds(t *testing.T) {
 	assert.NotEqual(t, querySig, r.HTTPRequest.Header.Get("Authorization"))
 }
 
-func TestPreResignRequestExpiredCreds(t *testing.T) {
-	provider := &credentials.StaticProvider{credentials.Value{"AKID", "SECRET", "SESSION"}}
-	creds := credentials.NewCredentials(provider)
-	r := aws.NewRequest(
-		aws.NewService(&aws.Config{Credentials: creds}),
-		&aws.Operation{
-			Name:       "BatchGetItem",
-			HTTPMethod: "POST",
-			HTTPPath:   "/",
-		},
-		nil,
-		nil,
-	)
-	r.ExpireTime = time.Minute * 10
-
-	Sign(r)
-	querySig := r.HTTPRequest.URL.Query().Get("X-Amz-Signature")
-
-	creds.Expire()
-	r.Time = time.Now().Add(time.Hour * 48)
-
-	Sign(r)
-	assert.NotEqual(t, querySig, r.HTTPRequest.URL.Query().Get("X-Amz-Signature"))
-}
-
 func BenchmarkPresignRequest(b *testing.B) {
 	signer := buildSigner("dynamodb", "us-east-1", time.Now(), 300*time.Second, "{}")
 	for i := 0; i < b.N; i++ {

internal/util/utilfile/utilfile.go

@@ -0,0 +1,24 @@
+package utilfile
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"io"
+	"os"
+)
+
+func GetFileMD5(filePath string) (string, error) {
+	file, err := os.Open(filePath)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	hash := md5.New()
+	if _, err := io.Copy(hash, file); err != nil {
+		return "", err
+	}
+
+	md5Hash := hash.Sum(nil)
+	return hex.EncodeToString(md5Hash), nil
+}