Merge pull request #229 from tencentyun/feature_jojoliang_662e1318

update bucket cors, add x-cos-tagging in putbucket, update Presignurl

Author: agin719

bucket.go

@@ -59,6 +59,8 @@ type BucketPutOptions struct {
 	XCosGrantFullControl      string                     `header:"x-cos-grant-full-control,omitempty" url:"-" xml:"-"`
 	XCosGrantReadACP          string                     `header:"x-cos-grant-read-acp,omitempty" url:"-" xml:"-"`
 	XCosGrantWriteACP         string                     `header:"x-cos-grant-write-acp,omitempty" url:"-" xml:"-"`
+	XCosTagging               string                     `header:"x-cos-tagging,omitempty" url:"-" xml:"-"`
+	XOptionHeader             *http.Header               `header:"-,omitempty" url:"-" xml:"-"`
 	CreateBucketConfiguration *CreateBucketConfiguration `header:"-" url:"-" xml:"-"`
 }
 type CreateBucketConfiguration struct {

bucket_cors.go

@@ -18,8 +18,9 @@ type BucketCORSRule struct {
 
 // BucketGetCORSResult is the result of GetBucketCORS
 type BucketGetCORSResult struct {
-	XMLName xml.Name         `xml:"CORSConfiguration"`
-	Rules   []BucketCORSRule `xml:"CORSRule,omitempty"`
+	XMLName      xml.Name         `xml:"CORSConfiguration"`
+	Rules        []BucketCORSRule `xml:"CORSRule,omitempty"`
+	ResponseVary string           `xml:"ResponseVary,omitempty"`
 }
 
 // GetCORS 实现 Bucket 跨域访问配置读取。
@@ -39,8 +40,9 @@ func (s *BucketService) GetCORS(ctx context.Context) (*BucketGetCORSResult, *Res
 
 // BucketPutCORSOptions is the option of PutBucketCORS
 type BucketPutCORSOptions struct {
-	XMLName xml.Name         `xml:"CORSConfiguration"`
-	Rules   []BucketCORSRule `xml:"CORSRule,omitempty"`
+	XMLName      xml.Name         `xml:"CORSConfiguration"`
+	Rules        []BucketCORSRule `xml:"CORSRule,omitempty"`
+	ResponseVary string           `xml:"ResponseVary,omitempty"`
 }
 
 // PutCORS 实现 Bucket 跨域访问设置，您可以通过传入XML格式的配置文件实现配置，文件大小限制为64 KB。

object.go

@@ -118,6 +118,7 @@ type PresignedURLOptions struct {
 	Query      *url.Values  `xml:"-" url:"-" header:"-"`
 	Header     *http.Header `header:"-,omitempty" url:"-" xml:"-"`
 	SignMerged bool         `xml:"-" url:"-" header:"-"`
+	AuthTime   *AuthTime    `xml:"-" url:"-" header:"-"`
 }
 
 // GetPresignedURL get the object presigned to down or upload file by url
@@ -137,11 +138,20 @@ func (s *ObjectService) GetPresignedURL(ctx context.Context, httpMethod, name, a
 		optQuery:  opt,
 		optHeader: opt,
 	}
-	if popt, ok := opt.(*PresignedURLOptions); ok {
-		if popt != nil && popt.Query != nil {
-			qs := popt.Query.Encode()
-			if qs != "" {
-				sendOpt.uri = fmt.Sprintf("%s?%s", sendOpt.uri, qs)
+	var authTime *AuthTime
+	if opt != nil {
+		if opt, ok := opt.(*presignedURLTestingOptions); ok {
+			authTime = opt.authTime
+		}
+		if popt, ok := opt.(*PresignedURLOptions); ok {
+			if popt.Query != nil {
+				qs := popt.Query.Encode()
+				if qs != "" {
+					sendOpt.uri = fmt.Sprintf("%s?%s", sendOpt.uri, qs)
+				}
+			}
+			if popt.AuthTime != nil {
+				authTime = popt.AuthTime
 			}
 		}
 	}
@@ -150,12 +160,6 @@ func (s *ObjectService) GetPresignedURL(ctx context.Context, httpMethod, name, a
 		return nil, err
 	}
 
-	var authTime *AuthTime
-	if opt != nil {
-		if opt, ok := opt.(*presignedURLTestingOptions); ok {
-			authTime = opt.authTime
-		}
-	}
 	if authTime == nil {
 		authTime = NewAuthTime(expired)
 	}
@@ -206,13 +210,22 @@ func (s *ObjectService) GetPresignedURL2(ctx context.Context, httpMethod, name s
 		optQuery:  opt,
 		optHeader: opt,
 	}
+	var authTime *AuthTime
 	mark := "?"
-	if popt, ok := opt.(*PresignedURLOptions); ok {
-		if popt != nil && popt.Query != nil {
-			qs := popt.Query.Encode()
-			if qs != "" {
-				sendOpt.uri = fmt.Sprintf("%s?%s", sendOpt.uri, qs)
-				mark = "&"
+	if opt != nil {
+		if opt, ok := opt.(*presignedURLTestingOptions); ok {
+			authTime = opt.authTime
+		}
+		if popt, ok := opt.(*PresignedURLOptions); ok {
+			if popt.Query != nil {
+				qs := popt.Query.Encode()
+				if qs != "" {
+					sendOpt.uri = fmt.Sprintf("%s?%s", sendOpt.uri, qs)
+					mark = "&"
+				}
+			}
+			if popt.AuthTime != nil {
+				authTime = popt.AuthTime
 			}
 		}
 	}
@@ -225,12 +238,6 @@ func (s *ObjectService) GetPresignedURL2(ctx context.Context, httpMethod, name s
 		return nil, err
 	}
 
-	var authTime *AuthTime
-	if opt != nil {
-		if opt, ok := opt.(*presignedURLTestingOptions); ok {
-			authTime = opt.authTime
-		}
-	}
 	if authTime == nil {
 		authTime = NewAuthTime(expired)
 	}

object_test.go

@@ -215,6 +215,43 @@ func TestObjectService_GetPresignedURL(t *testing.T) {
 	}
 }
 
+func TestObjectService_GetPresignedURL_AuthTime(t *testing.T) {
+	setup()
+	defer teardown()
+
+	exceptSign := "q-sign-algorithm=sha1&q-ak=QmFzZTY0IGlzIGEgZ*******&q-sign-time=1622702557;1622706157&q-key-time=1622702557;1622706157&q-header-list=&q-url-param-list=&q-signature=0f359fe9d29e7fa0c738ce6c8feaf4ed1e84f287"
+	exceptURL := &url.URL{
+		Scheme:   "http",
+		Host:     client.Host,
+		Path:     "/test.jpg",
+		RawQuery: exceptSign,
+	}
+
+	c := context.Background()
+	name := "test.jpg"
+	ak := "QmFzZTY0IGlzIGEgZ*******"
+	sk := "ZfbOA78asKUYBcXFrJD0a1I*******"
+	startTime := time.Unix(int64(1622702557), 0)
+	endTime := time.Unix(int64(1622706157), 0)
+	opt := &PresignedURLOptions{
+		AuthTime: &AuthTime{
+			SignStartTime: startTime,
+			SignEndTime:   endTime,
+			KeyStartTime:  startTime,
+			KeyEndTime:    endTime,
+		},
+	}
+
+	presignedURL, err := client.Object.GetPresignedURL(c, http.MethodPut, name, ak, sk, time.Hour, opt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if reflect.DeepEqual(exceptURL, presignedURL) {
+		t.Fatalf("Wrong PreSignedURL!")
+	}
+}
+
 func TestObjectService_GetPresignedURL2(t *testing.T) {
 	setup()
 	defer teardown()