Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push Connect Update #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Push Connect Update #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdc6706
PushRsp Debug
W192547975 May 18, 2024
7c3fcca
Revert "PushRsp Debug"
W192547975 May 24, 2024
c0ce330
Push Connect Update
W192547975 May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 37 additions & 24 deletions pushhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"errors"
"fmt"
"time"

"github.com/openp2p-cn/totp"
)

type pushHandler struct {
Expand Down Expand Up @@ -50,28 +48,41 @@ func (h *pushHandler) handleMessage(ctx *msgContext) error {
fromSess.write(head.MainType, MsgPushRsp, rsp)
return errors.New("peer offline")
}
if head.SubType == MsgPushConnectReq {
// verify user/password
req := PushConnectReq{}
err := json.Unmarshal(ctx.msg[openP2PHeaderSize+PushHeaderSize:], &req)
if err != nil {
gLog.Printf(LvERROR, "wrong MsgPushConnectReq:%s", err)
return err
}
gLog.Printf(LvINFO, "%s is connecting to %s...", req.From, toSess.node)
t := totp.TOTP{Step: totp.RelayTOTPStep}
if !(t.Verify(req.Token, toSess.token, time.Now().Unix()) || (toSess.token == req.FromToken)) { // (toSess.token == req.FromToken) is deprecated
gLog.Printf(LvERROR, "%s --- %s MsgPushConnectReq push denied", req.From, toSess.node)
rsp := PushRsp{Error: 1, Detail: "MsgPushConnectReq push denied"}
fromSess.write(head.MainType, MsgPushRsp, rsp)
return errors.New("push denied")
if isByPassMsg(head.SubType) {
switch head.SubType {
case MsgPushConnectReq:
gLog.Printf(LvINFO, "%s is connecting to %s...", fromSess.node, toSess.node)
/*
// verify user/password
t := totp.TOTP{Step: totp.RelayTOTPStep}
if !(t.Verify(req.Token, toSess.token, time.Now().Unix()) || (toSess.token == req.FromToken)) { // (toSess.token == req.FromToken) is deprecated
gLog.Printf(LvERROR, "%s --- %s MsgPushConnectReq push denied", req.From, toSess.node)
rsp := PushRsp{Error: 1, Detail: "MsgPushConnectReq push denied"}
fromSess.write(head.MainType, MsgPushRsp, rsp)
return errors.New("push denied")
}
*/
case MsgPushConnectRsp:
// check rsp.Error for permission
var rsp PushConnectRsp
err := json.Unmarshal(ctx.msg[openP2PHeaderSize+PushHeaderSize:], &rsp)
if err != nil {
gLog.Printf(LvERROR, "wrong MsgPushConnectRsp:%s", err)
return err
}
if rsp.Error&0xFF == 0 { // allow more success code
// cache push permission 60s
gWSSessionMgr.pushPermission.Store(pushHead.To, &pushNodeInfo{pushHead.From, time.Now().Add(time.Minute)})
gWSSessionMgr.pushPermission.Store(pushHead.From, &pushNodeInfo{pushHead.To, time.Now().Add(time.Minute)})
// TODO: clear cache
} else {
gLog.Printf(LvWARN, "%s --- %s connect error %d: %s", rsp.To, rsp.From, rsp.Error, rsp.Detail)
}
case MsgPushAPPKey:
gLog.Println(LvDEBUG, "sync app key")
default:
gLog.Println(LvWARN, "unknown by pass msg ", head.SubType)
}
// cache push permission 60s
gWSSessionMgr.pushPermission.Store(pushHead.From, &pushNodeInfo{pushHead.To, time.Now().Add(time.Minute)})
gWSSessionMgr.pushPermission.Store(pushHead.To, &pushNodeInfo{pushHead.From, time.Now().Add(time.Minute)})
// TODO: clear cache
} else if isByPassMsg(head.SubType) {
gLog.Println(LvDEBUG, "sync app key")
} else {
// verify push permission
// verify from as key
Expand Down Expand Up @@ -113,5 +124,7 @@ func isSupportMsg(msgType uint16) bool {
}

func isByPassMsg(msgType uint16) bool {
return msgType == MsgPushAPPKey
return msgType == MsgPushConnectReq ||
msgType == MsgPushConnectRsp ||
msgType == MsgPushAPPKey
}