chinhwajie/BitSrunLoginGo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修正请求签名算法

Browse Source
This commit is contained in:
Mmx233
2022-12-08 18:37:47 +08:00
parent 8ef9b2fc9e
commit 1f5ba65137
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dns/aliyun/aliyun.go
View File

@@ -25,6 +25,7 @@ type DnsProvider struct {
func New(ttl uint, conf map[string]interface{}, Http *http.Client) (*DnsProvider, error) { func New(ttl uint, conf map[string]interface{}, Http *http.Client) (*DnsProvider, error) {
var p = DnsProvider{ var p = DnsProvider{
TTL: ttl,
Http: tool.NewHttpTool(Http), Http: tool.NewHttpTool(Http),
} }
return &p, dnsUtil.DecodeConfig(conf, &p) return &p, dnsUtil.DecodeConfig(conf, &p)
@@ -38,11 +39,13 @@ func (a DnsProvider) SendRequest(Type, Action string, data map[string]interface{
data["Format"] = "json" data["Format"] = "json"
data["Version"] = "2015-01-09" data["Version"] = "2015-01-09"
data["SignatureMethod"] = "HMAC-SHA1" data["SignatureMethod"] = "HMAC-SHA1"
data["SignatureVersion"] = "1.0"
data["SignatureNonce"] = fmt.Sprint(tool.Rand.Num(10000000, 90000000)) data["SignatureNonce"] = fmt.Sprint(tool.Rand.Num(10000000, 90000000))
data["Timestamp"] = time.Now().UTC().Format("2006-01-02T15:04:05Z") data["Timestamp"] = time.Now().UTC().Format("2006-01-02T15:04:05Z")
data["Action"] = Action data["Action"] = Action
data["AccessKeyId"] = a.AccessKeyId
signStr := Type + "&" + url.QueryEscape("/") signStr := Type + "&" + url.QueryEscape("/") + "&"
var keys = make([]string, len(data)) var keys = make([]string, len(data))
var i int var i int
for k := range data { for k := range data {
@@ -50,8 +53,14 @@ func (a DnsProvider) SendRequest(Type, Action string, data map[string]interface{
i++ i++
} }
sort.Strings(keys) sort.Strings(keys)
for _, k := range keys { for i, k := range keys {
signStr += "&" + k + "=" + url.QueryEscape(fmt.Sprint(data[k])) str := k + "=" + url.QueryEscape(fmt.Sprint(data[k]))
if i == 0 {
str = url.QueryEscape(str)
} else {
str = url.QueryEscape("&" + str)
}
signStr += str
} }
mac := hmac.New(sha1.New, []byte(a.AccessKeySecret+"&")) mac := hmac.New(sha1.New, []byte(a.AccessKeySecret+"&"))
@@ -59,7 +68,7 @@ func (a DnsProvider) SendRequest(Type, Action string, data map[string]interface{
if e != nil { if e != nil {
return nil, e return nil, e
} }
data["Signature"] = base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%x", mac.Sum(nil)))) data["Signature"] = base64.StdEncoding.EncodeToString(mac.Sum(nil))
if Type == "GET" || Type == "DELETE" { if Type == "GET" || Type == "DELETE" {
reqOpt.Query = data reqOpt.Query = data