- don't check sign when there isn't sign data in mtwm callback.

This commit is contained in:
gazebo
2019-01-08 17:40:35 +08:00
parent bb9644abe3
commit c0735d9d6c
2 changed files with 20 additions and 15 deletions

View File

@@ -5,6 +5,7 @@ import (
"net/url"
"strings"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
)
@@ -51,19 +52,23 @@ func Err2CallbackResponse(err error, data string) *CallbackResponse {
func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackResponse *CallbackResponse) {
data := utils.URLValues2Map(request.PostForm)
fullURL := strings.TrimRight(a.callbackURL+request.URL.Path, "/")
sign := a.signParams(fullURL+"?", data)
if sign != data[signKey] {
return nil, SignatureIsNotOk
if dataSign, ok := data[signKey]; ok {
fullURL := strings.TrimRight(a.callbackURL+request.URL.Path, "/")
sign := a.signParams(fullURL+"?", data)
if sign != dataSign.(string) {
baseapi.SugarLogger.Debugf("mtwm GetCallbackMsg my sign:%v, data sign:%v", sign, dataSign.(string))
return nil, SignatureIsNotOk
}
cmd := strings.Trim(request.URL.EscapedPath(), "/")
cmd = cmd[strings.LastIndex(cmd, "/")+1:]
msg = &CallbackMsg{
Cmd: cmd,
}
msg.Data = make(url.Values)
for k, v := range data {
msg.Data.Set(k, v.(string))
}
return msg, nil
}
cmd := strings.Trim(request.URL.EscapedPath(), "/")
cmd = cmd[strings.LastIndex(cmd, "/")+1:]
msg = &CallbackMsg{
Cmd: cmd,
}
msg.Data = make(url.Values)
for k, v := range data {
msg.Data.Set(k, v.(string))
}
return msg, nil
return nil, SuccessResponse
}