update 3.21.12

huaweicloud · Dec 31, 2021 · d61605b · d61605b
1 parent 782df33
commit d61605b
Show file tree

Hide file tree

Showing 24 changed files with 2,617 additions and 2,332 deletions.
diff --git a/README.MD b/README.MD
@@ -1,3 +1,16 @@
+Version 3.21.12
+
+New Features:
+1. Added the `obs.WithTrafficLimitHeader` method to limit the bandwidth of a single connection.
+
+Documentation & Demo:
+1. Added descriptions about single-connection bandwidth throttling.
+2. Added descriptions about extended configurations of SDK APIs.
+
+Resolved Issues:
+1. Optimized some code.
+
+-----------------------------------------------------------------------------------
 Version 3.21.8
 
 New Features:

diff --git a/README_CN.MD b/README_CN.MD
@@ -1,3 +1,17 @@
+Version 3.21.12
+
+新特性：
+1. 新增obs.WithTrafficLimitHeader方法实现单链接限速功能;
+
+资料&demo:
+1. 补充单链接限速描述；
+2. 补充SDK接口扩展配置描述；
+
+修复问题：
+1. 优化部分代码实现
+
+-----------------------------------------------------------------------------------
+
 Version 3.21.8
 
 新特性：

diff --git a/obs/auth.go b/obs/auth.go
@@ -285,44 +285,6 @@ func attachHeaders(headers map[string][]string, isObs bool) string {
 	return strings.Join(stringToSign, "\n")
 }
 
-func getV2StringToSign(method, canonicalizedURL string, headers map[string][]string, isObs bool) string {
-	stringToSign := strings.Join([]string{method, "\n", attachHeaders(headers, isObs), "\n", canonicalizedURL}, "")
-
-	var isSecurityToken bool
-	var securityToken []string
-	if isObs {
-		securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_OBS]
-	} else {
-		securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_AMZ]
-	}
-	var query []string
-	if !isSecurityToken {
-		parmas := strings.Split(canonicalizedURL, "?")
-		if len(parmas) > 1 {
-			query = strings.Split(parmas[1], "&")
-			for _, value := range query {
-				if strings.HasPrefix(value, HEADER_STS_TOKEN_AMZ+"=") || strings.HasPrefix(value, HEADER_STS_TOKEN_OBS+"=") {
-					if value[len(HEADER_STS_TOKEN_AMZ)+1:] != "" {
-						securityToken = []string{value[len(HEADER_STS_TOKEN_AMZ)+1:]}
-						isSecurityToken = true
-					}
-				}
-			}
-		}
-	}
-	logStringToSign := stringToSign
-	if isSecurityToken && len(securityToken) > 0 {
-		logStringToSign = strings.Replace(logStringToSign, securityToken[0], "******", -1)
-	}
-	doLog(LEVEL_DEBUG, "The v2 auth stringToSign:\n%s", logStringToSign)
-	return stringToSign
-}
-
-func v2Auth(ak, sk, method, canonicalizedURL string, headers map[string][]string, isObs bool) map[string]string {
-	stringToSign := getV2StringToSign(method, canonicalizedURL, headers, isObs)
-	return map[string]string{"Signature": Base64Encode(HmacSha1([]byte(sk), []byte(stringToSign)))}
-}
-
 func getScope(region, shortDate string) string {
 	return fmt.Sprintf("%s/%s/%s/%s", shortDate, region, V4_SERVICE_NAME, V4_SERVICE_SUFFIX)
 }
@@ -332,69 +294,6 @@ func getCredential(ak, region, shortDate string) (string, string) {
 	return fmt.Sprintf("%s/%s", ak, scope), scope
 }
 
-func getV4StringToSign(method, canonicalizedURL, queryURL, scope, longDate, payload string, signedHeaders []string, headers map[string][]string) string {
-	canonicalRequest := make([]string, 0, 10+len(signedHeaders)*4)
-	canonicalRequest = append(canonicalRequest, method)
-	canonicalRequest = append(canonicalRequest, "\n")
-	canonicalRequest = append(canonicalRequest, canonicalizedURL)
-	canonicalRequest = append(canonicalRequest, "\n")
-	canonicalRequest = append(canonicalRequest, queryURL)
-	canonicalRequest = append(canonicalRequest, "\n")
-
-	for _, signedHeader := range signedHeaders {
-		values, _ := headers[signedHeader]
-		for _, value := range values {
-			canonicalRequest = append(canonicalRequest, signedHeader)
-			canonicalRequest = append(canonicalRequest, ":")
-			canonicalRequest = append(canonicalRequest, value)
-			canonicalRequest = append(canonicalRequest, "\n")
-		}
-	}
-	canonicalRequest = append(canonicalRequest, "\n")
-	canonicalRequest = append(canonicalRequest, strings.Join(signedHeaders, ";"))
-	canonicalRequest = append(canonicalRequest, "\n")
-	canonicalRequest = append(canonicalRequest, payload)
-
-	_canonicalRequest := strings.Join(canonicalRequest, "")
-
-	var isSecurityToken bool
-	var securityToken []string
-	if securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_OBS]; !isSecurityToken {
-		securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_AMZ]
-	}
-	var query []string
-	if !isSecurityToken {
-		query = strings.Split(queryURL, "&")
-		for _, value := range query {
-			if strings.HasPrefix(value, HEADER_STS_TOKEN_AMZ+"=") || strings.HasPrefix(value, HEADER_STS_TOKEN_OBS+"=") {
-				if value[len(HEADER_STS_TOKEN_AMZ)+1:] != "" {
-					securityToken = []string{value[len(HEADER_STS_TOKEN_AMZ)+1:]}
-					isSecurityToken = true
-				}
-			}
-		}
-	}
-	logCanonicalRequest := _canonicalRequest
-	if isSecurityToken && len(securityToken) > 0 {
-		logCanonicalRequest = strings.Replace(logCanonicalRequest, securityToken[0], "******", -1)
-	}
-	doLog(LEVEL_DEBUG, "The v4 auth canonicalRequest:\n%s", logCanonicalRequest)
-
-	stringToSign := make([]string, 0, 7)
-	stringToSign = append(stringToSign, V4_HASH_PREFIX)
-	stringToSign = append(stringToSign, "\n")
-	stringToSign = append(stringToSign, longDate)
-	stringToSign = append(stringToSign, "\n")
-	stringToSign = append(stringToSign, scope)
-	stringToSign = append(stringToSign, "\n")
-	stringToSign = append(stringToSign, HexSha256([]byte(_canonicalRequest)))
-
-	_stringToSign := strings.Join(stringToSign, "")
-
-	doLog(LEVEL_DEBUG, "The v4 auth stringToSign:\n%s", _stringToSign)
-	return _stringToSign
-}
-
 func getSignedHeaders(headers map[string][]string) ([]string, map[string][]string) {
 	length := len(headers)
 	_headers := make(map[string][]string, length)
@@ -419,59 +318,3 @@ func getSignature(stringToSign, sk, region, shortDate string) string {
 	key = HmacSha256(key, []byte(V4_SERVICE_SUFFIX))
 	return Hex(HmacSha256(key, []byte(stringToSign)))
 }
-
-// V4Auth is a wrapper for v4Auth
-func V4Auth(ak, sk, region, method, canonicalizedURL, queryURL string, headers map[string][]string) map[string]string {
-	return v4Auth(ak, sk, region, method, canonicalizedURL, queryURL, headers)
-}
-
-func v4Auth(ak, sk, region, method, canonicalizedURL, queryURL string, headers map[string][]string) map[string]string {
-	var t time.Time
-	if val, ok := headers[HEADER_DATE_AMZ]; ok {
-		var err error
-		t, err = time.Parse(LONG_DATE_FORMAT, val[0])
-		if err != nil {
-			t = time.Now().UTC()
-		}
-	} else if val, ok := headers[PARAM_DATE_AMZ_CAMEL]; ok {
-		var err error
-		t, err = time.Parse(LONG_DATE_FORMAT, val[0])
-		if err != nil {
-			t = time.Now().UTC()
-		}
-	} else if val, ok := headers[HEADER_DATE_CAMEL]; ok {
-		var err error
-		t, err = time.Parse(RFC1123_FORMAT, val[0])
-		if err != nil {
-			t = time.Now().UTC()
-		}
-	} else if val, ok := headers[strings.ToLower(HEADER_DATE_CAMEL)]; ok {
-		var err error
-		t, err = time.Parse(RFC1123_FORMAT, val[0])
-		if err != nil {
-			t = time.Now().UTC()
-		}
-	} else {
-		t = time.Now().UTC()
-	}
-	shortDate := t.Format(SHORT_DATE_FORMAT)
-	longDate := t.Format(LONG_DATE_FORMAT)
-
-	signedHeaders, _headers := getSignedHeaders(headers)
-
-	credential, scope := getCredential(ak, region, shortDate)
-
-	payload := UNSIGNED_PAYLOAD
-	if val, ok := headers[HEADER_CONTENT_SHA256_AMZ]; ok {
-		payload = val[0]
-	}
-	stringToSign := getV4StringToSign(method, canonicalizedURL, queryURL, scope, longDate, payload, signedHeaders, _headers)
-
-	signature := getSignature(stringToSign, sk, region, shortDate)
-
-	ret := make(map[string]string, 3)
-	ret["Credential"] = credential
-	ret["SignedHeaders"] = strings.Join(signedHeaders, ";")
-	ret["Signature"] = signature
-	return ret
-}
diff --git a/obs/authV2.go b/obs/authV2.go
@@ -0,0 +1,55 @@
+// Copyright 2019 Huawei Technologies Co.,Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+// this file except in compliance with the License.  You may obtain a copy of the
+// License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations under the License.
+
+package obs
+
+import (
+	"strings"
+)
+
+func getV2StringToSign(method, canonicalizedURL string, headers map[string][]string, isObs bool) string {
+	stringToSign := strings.Join([]string{method, "\n", attachHeaders(headers, isObs), "\n", canonicalizedURL}, "")
+
+	var isSecurityToken bool
+	var securityToken []string
+	if isObs {
+		securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_OBS]
+	} else {
+		securityToken, isSecurityToken = headers[HEADER_STS_TOKEN_AMZ]
+	}
+	var query []string
+	if !isSecurityToken {
+		parmas := strings.Split(canonicalizedURL, "?")
+		if len(parmas) > 1 {
+			query = strings.Split(parmas[1], "&")
+			for _, value := range query {
+				if strings.HasPrefix(value, HEADER_STS_TOKEN_AMZ+"=") || strings.HasPrefix(value, HEADER_STS_TOKEN_OBS+"=") {
+					if value[len(HEADER_STS_TOKEN_AMZ)+1:] != "" {
+						securityToken = []string{value[len(HEADER_STS_TOKEN_AMZ)+1:]}
+						isSecurityToken = true
+					}
+				}
+			}
+		}
+	}
+	logStringToSign := stringToSign
+	if isSecurityToken && len(securityToken) > 0 {
+		logStringToSign = strings.Replace(logStringToSign, securityToken[0], "******", -1)
+	}
+	doLog(LEVEL_DEBUG, "The v2 auth stringToSign:\n%s", logStringToSign)
+	return stringToSign
+}
+
+func v2Auth(ak, sk, method, canonicalizedURL string, headers map[string][]string, isObs bool) map[string]string {
+	stringToSign := getV2StringToSign(method, canonicalizedURL, headers, isObs)
+	return map[string]string{"Signature": Base64Encode(HmacSha1([]byte(sk), []byte(stringToSign)))}
+}