Merge pull request #2 from aliyun/support_sts_access

support sts access

Author: zd-double

client.go

@@ -75,11 +75,15 @@ type aliMNSClient struct {
 }
 
 func NewAliMNSClient(inputUrl, accessKeyId, accessKeySecret string) MNSClient {
+	return NewAliMNSClientWithToken(inputUrl, accessKeyId, accessKeySecret, "")
+}
+
+func NewAliMNSClientWithToken(inputUrl, accessKeyId, accessKeySecret, token string) MNSClient {
 	if inputUrl == "" {
 		panic("ali-mns: message queue url is empty")
 	}
 
-	credential := NewAliMNSCredential(accessKeySecret)
+	credential := NewAliMNSCredential(accessKeySecret, token)
 
 	cli := new(aliMNSClient)
 	cli.credential = credential
@@ -194,6 +198,9 @@ func (p *aliMNSClient) Send(method Method, headers map[string]string, message in
 	headers[CONTENT_MD5] = base64.StdEncoding.EncodeToString([]byte(strMd5))
 	headers[DATE] = time.Now().UTC().Format(http.TimeFormat)
 
+	if p.credential.GetSecurityToken() != "" {
+		headers[SECURITY_TOKEN] = p.credential.GetSecurityToken()
+	}
 	if authHeader, e := p.authorization(method, headers, fmt.Sprintf("/%s", resource)); e != nil {
 		err = ERR_GENERAL_AUTH_HEADER_FAILED.New(errors.Params{"err": e})
 		return nil, err

credential.go

@@ -20,27 +20,45 @@ const (
 	HOST          = "Host"
 	DATE          = "Date"
 	KEEP_ALIVE    = "Keep-Alive"
+	SECURITY_TOKEN = "security-token"
 )
 
 type Credential interface {
 	Signature(method Method, headers map[string]string, resource string) (signature string, err error)
 	SetSecretKey(accessKeySecret string)
+	SetSecurityToken(securityToken string)
+	GetSecretKey() (accessKeySecret string)
+	GetSecurityToken() (securityToken string)
 }
 
 type AliMNSCredential struct {
 	accessKeySecret string
+	securityToken string
 }
 
-func NewAliMNSCredential(accessKeySecret string) *AliMNSCredential {
+func NewAliMNSCredential(accessKeySecret, securityToken string) *AliMNSCredential {
 	aliMNSCredential := new(AliMNSCredential)
 	aliMNSCredential.accessKeySecret = accessKeySecret
+	aliMNSCredential.securityToken = securityToken
 	return aliMNSCredential
 }
 
 func (p *AliMNSCredential) SetSecretKey(accessKeySecret string) {
 	p.accessKeySecret = accessKeySecret
 }
 
+func (p *AliMNSCredential) SetSecurityToken(securityToken string) {
+	p.securityToken = securityToken
+}
+
+func (p *AliMNSCredential) GetSecretKey() (accessKeySecret string) {
+	return p.accessKeySecret
+}
+
+func (p* AliMNSCredential) GetSecurityToken() (securityToken string) {
+	return p.securityToken
+}
+
 func (p *AliMNSCredential) Signature(method Method, headers map[string]string, resource string) (signature string, err error) {
 	signItems := []string{}
 	signItems = append(signItems, string(method))