瀏覽代碼

fix sign url

baiyubin 8 年之前
父節點
當前提交
64804267c9
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      oss/conn.go

+ 3 - 3
oss/conn.go

@@ -243,6 +243,9 @@ func (conn Conn) doRequest(method string, uri *url.URL, canonicalizedResource st
 }
 }
 
 
 func (conn Conn) signURL(method HTTPMethod, bucketName, objectName string, expiration int64, params map[string]interface{}, headers map[string]string) string {
 func (conn Conn) signURL(method HTTPMethod, bucketName, objectName string, expiration int64, params map[string]interface{}, headers map[string]string) string {
+	if conn.config.SecurityToken != "" {
+		params[HTTPParamSecurityToken] = conn.config.SecurityToken
+	}
 	subResource := conn.getSubResource(params)
 	subResource := conn.getSubResource(params)
 	canonicalizedResource := conn.url.getResource(bucketName, objectName, subResource)
 	canonicalizedResource := conn.url.getResource(bucketName, objectName, subResource)
 
 
@@ -273,9 +276,6 @@ func (conn Conn) signURL(method HTTPMethod, bucketName, objectName string, expir
 	params[HTTPParamExpires] = strconv.FormatInt(expiration, 10)
 	params[HTTPParamExpires] = strconv.FormatInt(expiration, 10)
 	params[HTTPParamAccessKeyID] = conn.config.AccessKeyID
 	params[HTTPParamAccessKeyID] = conn.config.AccessKeyID
 	params[HTTPParamSignature] = signedStr
 	params[HTTPParamSignature] = signedStr
-	if conn.config.SecurityToken != "" {
-		params[HTTPParamSecurityToken] = conn.config.SecurityToken
-	}
 
 
 	urlParams := conn.getURLParams(params)
 	urlParams := conn.getURLParams(params)
 	return conn.url.getSignURL(bucketName, objectName, urlParams)
 	return conn.url.getSignURL(bucketName, objectName, urlParams)