TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-05 17:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

API取消对节点时钟的检查

Browse Source
This commit is contained in:
刘祥超
2021-11-16 09:02:55 +08:00
parent 1224758b5b
commit acdddf5e12
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/rpc/services/service_base.go
View File

@@ -16,7 +16,6 @@ import (
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"time"
) )
type BaseService struct { type BaseService struct {
@@ -162,12 +161,6 @@ func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.U
return rpcutils.UserTypeNone, 0, errors.New("decode token error: " + err.Error()) return rpcutils.UserTypeNone, 0, errors.New("decode token error: " + err.Error())
} }
timestamp := m.GetInt64("timestamp")
if time.Now().Unix()-timestamp > 600 {
// 请求超过10分钟认为超时
return rpcutils.UserTypeNone, 0, errors.New("authenticate timeout, please check your system clock")
}
role = apiToken.Role role = apiToken.Role
switch apiToken.Role { switch apiToken.Role {
case rpcutils.UserTypeNode: case rpcutils.UserTypeNode:

7
internal/rpc/utils/utils.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"time"
) )
type UserType = string type UserType = string
@@ -125,12 +124,6 @@ func ValidateRequest(ctx context.Context, userTypes ...UserType) (userType UserT
return UserTypeNone, 0, 0, errors.New("decode token error: " + err.Error()) return UserTypeNone, 0, 0, errors.New("decode token error: " + err.Error())
} }
timestamp := m.GetInt64("timestamp")
if time.Now().Unix()-timestamp > 600 {
// 请求超过10分钟认为超时
return UserTypeNone, 0, 0, errors.New("authenticate timeout, please check your system clock")
}
t := m.GetString("type") t := m.GetString("type")
if len(userTypes) > 0 && !lists.ContainsString(userTypes, t) { if len(userTypes) > 0 && !lists.ContainsString(userTypes, t) {
return UserTypeNone, 0, 0, errors.New("not supported node type: '" + t + "'") return UserTypeNone, 0, 0, errors.New("not supported node type: '" + t + "'")