vendor: resync with dep ensure
This commit is contained in:
+6
-1
@@ -122,12 +122,16 @@ func (qss *QingStorSigner) BuildQuerySignature(request *http.Request, expires in
|
||||
|
||||
// BuildStringToSign build the string to sign.
|
||||
func (qss *QingStorSigner) BuildStringToSign(request *http.Request) (string, error) {
|
||||
date := request.Header.Get("Date")
|
||||
if request.Header.Get("X-QS-Date") != "" {
|
||||
date = ""
|
||||
}
|
||||
stringToSign := fmt.Sprintf(
|
||||
"%s\n%s\n%s\n%s\n",
|
||||
request.Method,
|
||||
request.Header.Get("Content-MD5"),
|
||||
request.Header.Get("Content-Type"),
|
||||
request.Header.Get("Date"),
|
||||
date,
|
||||
)
|
||||
|
||||
stringToSign += qss.buildCanonicalizedHeaders(request)
|
||||
@@ -247,6 +251,7 @@ func (qss *QingStorSigner) paramsToSign(key string) bool {
|
||||
"stats": true,
|
||||
"upload_id": true,
|
||||
"uploads": true,
|
||||
"image": true,
|
||||
"response-expires": true,
|
||||
"response-cache-control": true,
|
||||
"response-content-type": true,
|
||||
|
||||
+42
@@ -46,6 +46,27 @@ func TestQingStorSignerWriteSignature(t *testing.T) {
|
||||
assert.Equal(t, signature, httpRequest.Header.Get("Authorization"))
|
||||
}
|
||||
|
||||
func TestQingStorSignerWriteSignatureWithXQSDate(t *testing.T) {
|
||||
url := "https://qingstor.com/?acl&upload_id=fde133b5f6d932cd9c79bac3c7318da1&part_number=0&other=abc"
|
||||
httpRequest, err := http.NewRequest("GET", url, nil)
|
||||
httpRequest.Header.Set("Date", convert.TimeToString(time.Time{}, convert.RFC822))
|
||||
httpRequest.Header.Set("X-QS-Date", convert.TimeToString(time.Time{}, convert.RFC822))
|
||||
httpRequest.Header.Set("X-QS-Test-2", "Test 2")
|
||||
httpRequest.Header.Set("X-QS-Test-1", "Test 1")
|
||||
assert.Nil(t, err)
|
||||
|
||||
s := QingStorSigner{
|
||||
AccessKeyID: "ENV_ACCESS_KEY_ID",
|
||||
SecretAccessKey: "ENV_SECRET_ACCESS_KEY",
|
||||
}
|
||||
|
||||
err = s.WriteSignature(httpRequest)
|
||||
assert.Nil(t, err)
|
||||
|
||||
signature := "QS ENV_ACCESS_KEY_ID:qkY+tOMdqfDAVv+ZBtlWeEBxlbyIKaQmj5lQlylENzo="
|
||||
assert.Equal(t, signature, httpRequest.Header.Get("Authorization"))
|
||||
}
|
||||
|
||||
func TestQingStorSignerWriteSignatureChinese(t *testing.T) {
|
||||
url := "https://zone.qingstor.com/bucket-name/中文"
|
||||
httpRequest, err := http.NewRequest("GET", url, nil)
|
||||
@@ -83,3 +104,24 @@ func TestQingStorSignerWriteQuerySignature(t *testing.T) {
|
||||
targetURL := "https://qingstor.com/?acl&upload_id=fde133b5f6d932cd9c79bac3c7318da1&part_number=0&access_key_id=ENV_ACCESS_KEY_ID&expires=3600&signature=GRL3p3NOgHR9CQygASvyo344vdnO1hFke6ZvQ5mDVHM="
|
||||
assert.Equal(t, httpRequest.URL.String(), targetURL)
|
||||
}
|
||||
|
||||
func TestQingStorSignerWriteQuerySignatureWithXQSDate(t *testing.T) {
|
||||
url := "https://qingstor.com/?acl&upload_id=fde133b5f6d932cd9c79bac3c7318da1&part_number=0"
|
||||
httpRequest, err := http.NewRequest("GET", url, nil)
|
||||
httpRequest.Header.Set("Date", convert.TimeToString(time.Time{}, convert.RFC822))
|
||||
httpRequest.Header.Set("X-QS-Date", convert.TimeToString(time.Time{}, convert.RFC822))
|
||||
httpRequest.Header.Set("X-QS-Test-2", "Test 2")
|
||||
httpRequest.Header.Set("X-QS-Test-1", "Test 1")
|
||||
assert.Nil(t, err)
|
||||
|
||||
s := QingStorSigner{
|
||||
AccessKeyID: "ENV_ACCESS_KEY_ID",
|
||||
SecretAccessKey: "ENV_SECRET_ACCESS_KEY",
|
||||
}
|
||||
|
||||
err = s.WriteQuerySignature(httpRequest, 3600)
|
||||
assert.Nil(t, err)
|
||||
|
||||
targetURL := "https://qingstor.com/?acl&upload_id=fde133b5f6d932cd9c79bac3c7318da1&part_number=0&access_key_id=ENV_ACCESS_KEY_ID&expires=3600&signature=plFxMFP1EzKVtdF%2BbApT8rhW9AUAIWfmZcOGH3m27t0="
|
||||
assert.Equal(t, httpRequest.URL.String(), targetURL)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user