Merge pull request #8 from ArtisanCloud/develop

feature(security): md5 sort hashmap to sorted message

security/sign/md5Signer.go

@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
+	"fmt"
 	"github.com/ArtisanCloud/PowerLibs/v2/object"
 	"sort"
 )
@@ -63,3 +64,25 @@ func (signer *MD5Signer) KSortDataToMessage(data *object.StringMap) (msg string,
 
 	return msg, err
 }
+
+func (signer *MD5Signer) KSortObjectToMessage(data *object.HashMap) (msg string, err error) {
+
+	// k sort
+	var keys []string
+	mapData := *data
+	for k := range mapData {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// join
+	for _, k := range keys {
+		//fmt.Println("key:", k, "Value:", mapData[k])
+		msg = msg + fmt.Sprintf("%s=%v&", k, mapData[k])
+	}
+
+	// omit last &
+	msg = msg[0 : len(msg)-1]
+
+	return msg, err
+}

security/sign/md5signer_test.go

@@ -2,9 +2,55 @@ package sign
 
 import (
 	"github.com/ArtisanCloud/PowerLibs/v2/object"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
+func Test_MD5_KSortDataToMessage(t *testing.T) {
+
+	arrayData := &object.StringMap{
+		"b": "2",
+		"a": "1",
+		"c": "3",
+	}
+
+	signer, err := NewMD5Signer("AppID+AppSecret")
+	if err != nil {
+		t.Error(err)
+	}
+
+	sortMsg, err := signer.KSortDataToMessage(arrayData)
+	if err != nil {
+		t.Error(err)
+	}
+
+	assert.EqualValues(t, "a=1&b=2&c=3", sortMsg)
+
+}
+
+func Test_MD5_KSortObjectToMessage(t *testing.T) {
+
+	arrayData := &object.HashMap{
+		"b": 2,
+		"a": "1",
+		"c": 3,
+	}
+
+	signer, err := NewMD5Signer("AppID+AppSecret")
+	if err != nil {
+		t.Error(err)
+	}
+
+	sortMsg, err := signer.KSortObjectToMessage(arrayData)
+	//fmt.Dump(sortMsg)
+	if err != nil {
+		t.Error(err)
+	}
+
+	assert.EqualValues(t, "a=1&b=2&c=3", sortMsg)
+
+}
+
 func Test_MD5_VerifySignedMessage(t *testing.T) {
 
 	arrayData := &object.StringMap{