cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: set timestamp only in auth token implementation

Browse Source
This commit is contained in:
Guy Lewin 2020-02-27 08:01:19 -05:00
parent 52bbfc089c
commit 2cb378bc9b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/control.go
View File

@ -141,7 +141,6 @@ func (ctl *Control) HandleReqWorkConn(inMsg *msg.ReqWorkConn) {
m := &msg.NewWorkConn{ m := &msg.NewWorkConn{
RunId: ctl.runId, RunId: ctl.runId,
Timestamp: time.Now().Unix(),
} }
if err = ctl.authSetter.SetNewWorkConn(m); err != nil { if err = ctl.authSetter.SetNewWorkConn(m); err != nil {
xl.Warn("error during NewWorkConn authentication: %v", err) xl.Warn("error during NewWorkConn authentication: %v", err)
@ -298,9 +297,7 @@ func (ctl *Control) msgHandler() {
case <-hbSend.C: case <-hbSend.C:
// send heartbeat to server // send heartbeat to server
xl.Debug("send heartbeat to server") xl.Debug("send heartbeat to server")
pingMsg := &msg.Ping{ pingMsg := &msg.Ping{}
Timestamp: time.Now().Unix(),
}
if err := ctl.authSetter.SetPing(pingMsg); err != nil { if err := ctl.authSetter.SetPing(pingMsg); err != nil {
xl.Warn("error during ping authentication: %v", err) xl.Warn("error during ping authentication: %v", err)
return return

3
models/auth/token.go
View File

@ -16,6 +16,7 @@ package auth
import ( import (
"fmt" "fmt"
"time"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/models/msg"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/utils/util"
@ -74,6 +75,7 @@ func (auth *TokenAuthSetterVerifier) SetPing(pingMsg *msg.Ping) error {
return nil return nil
} }
pingMsg.Timestamp = time.Now().Unix()
pingMsg.PrivilegeKey = util.GetAuthKey(auth.token, pingMsg.Timestamp) pingMsg.PrivilegeKey = util.GetAuthKey(auth.token, pingMsg.Timestamp)
return nil return nil
} }
@ -83,6 +85,7 @@ func (auth *TokenAuthSetterVerifier) SetNewWorkConn(newWorkConnMsg *msg.NewWorkC
return nil return nil
} }
newWorkConnMsg.Timestamp = time.Now().Unix()
newWorkConnMsg.PrivilegeKey = util.GetAuthKey(auth.token, newWorkConnMsg.Timestamp) newWorkConnMsg.PrivilegeKey = util.GetAuthKey(auth.token, newWorkConnMsg.Timestamp)
return nil return nil
} }