Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-05 21:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

report geoip separately, fix server creation & deletion bugs (#14)

Browse Source 
* new geoip method

* report geoip separately, fix server creation & deletion bugs

* fix struct tag

* fix write name

* remove deleteion list

* remove rpc realip header

* Revert "remove rpc realip header"

This reverts commit 8a5f86cf2d7df87f28cfa2a3b3430f449dd6ed73.
This commit is contained in:
UUBulb
2024-11-22 22:40:43 +08:00
committed by GitHub
parent d699d0ee87
commit fc98c0919f
16 changed files with 427 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
service/rpc/auth.go
View File

@@ -2,14 +2,14 @@ package rpc
import (
"context"
"log"
"sync"
petname "github.com/dustinkirkland/golang-petname"
"github.com/hashicorp/go-uuid"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
"github.com/hashicorp/go-uuid"
"github.com/naiba/nezha/model"
"github.com/naiba/nezha/service/singleton"
)
@@ -25,8 +25,8 @@ func (a *authHandler) Check(ctx context.Context) (uint64, error) {
return 0, status.Errorf(codes.Unauthenticated, "获取 metaData 失败")
}
realIp := ctx.Value(model.CtxKeyRealIP{})
log.Printf("bingo rpc realIp: %s, metadata: %v", realIp, md)
//realIp := ctx.Value(model.CtxKeyRealIP{})
//log.Printf("bingo rpc realIp: %s, metadata: %v", realIp, md)
var clientSecret string
if value, ok := md["client_secret"]; ok {
@@ -34,7 +34,7 @@ func (a *authHandler) Check(ctx context.Context) (uint64, error) {
}
if clientSecret != singleton.Conf.AgentSecretKey {
return 0, status.Errorf(codes.Unauthenticated, "客户端认证失败")
return 0, status.Error(codes.Unauthenticated, "客户端认证失败")
}
var clientUUID string
@@ -43,22 +43,25 @@ func (a *authHandler) Check(ctx context.Context) (uint64, error) {
}
if _, err := uuid.ParseUUID(clientUUID); err != nil {
return 0, status.Errorf(codes.Unauthenticated, "客户端 UUID 不合法")
return 0, status.Error(codes.Unauthenticated, "客户端 UUID 不合法")
}
singleton.ServerLock.RLock()
defer singleton.ServerLock.RUnlock()
clientID, hasID := singleton.ServerUUIDToID[clientUUID]
if !hasID {
s := model.Server{UUID: clientUUID}
s := model.Server{UUID: clientUUID, Name: petname.Generate(2, "-")}
if err := singleton.DB.Create(&s).Error; err != nil {
return 0, status.Errorf(codes.Unauthenticated, err.Error())
return 0, status.Error(codes.Unauthenticated, err.Error())
}
s.Host = &model.Host{}
s.State = &model.HostState{}
s.TaskCloseLock = new(sync.Mutex)
// generate a random silly server name
singleton.ServerList[s.ID] = &s
singleton.ServerUUIDToID[clientUUID] = s.ID
singleton.ReSortServer()
clientID = s.ID
}