TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-19 04:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加IP灰名单，用于仅记录并观察IP

Browse Source
This commit is contained in:
刘祥超
2024-05-05 19:08:06 +08:00
parent c6b2c3a004
commit cda24afca8
6 changed files with 164 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/rpc/services/service_ip_list.go
View File

@@ -27,11 +27,12 @@ func (this *IPListService) CreateIPList(ctx context.Context, req *pb.CreateIPLis
var tx = this.NullTx()
// 修正默认的代号
if req.Code == "white" || req.Code == "black" {
if req.Code == "white" || req.Code == "black" || req.Code == "grey" {
req.Code = req.Code + "-" + rands.HexString(8)
}
// 检查用户相关信息
var sourceUserId = userId
if userId > 0 {
// 检查网站ID
if req.ServerId > 0 {
@@ -40,6 +41,11 @@ func (this *IPListService) CreateIPList(ctx context.Context, req *pb.CreateIPLis
return nil, err
}
}
} else if req.ServerId > 0 {
sourceUserId, err = models.SharedServerDAO.FindServerUserId(tx, req.ServerId)
if err != nil {
return nil, err
}
}
// 检查代号
@@ -57,7 +63,7 @@ func (this *IPListService) CreateIPList(ctx context.Context, req *pb.CreateIPLis
}
}
listId, err := models.SharedIPListDAO.CreateIPList(tx, userId, req.ServerId, req.Type, req.Name, req.Code, req.TimeoutJSON, req.Description, req.IsPublic, req.IsGlobal)
listId, err := models.SharedIPListDAO.CreateIPList(tx, sourceUserId, req.ServerId, req.Type, req.Name, req.Code, req.TimeoutJSON, req.Description, req.IsPublic, req.IsGlobal)
if err != nil {
return nil, err
}
@@ -107,7 +113,7 @@ func (this *IPListService) FindEnabledIPList(ctx context.Context, req *pb.FindEn
var tx = this.NullTx()
if userId > 0 {
// 检查用户所属名单
if req.IpListId != firewallconfigs.GlobalListId {
if !firewallconfigs.IsGlobalListId(req.IpListId) {
err = models.SharedIPListDAO.CheckUserIPList(tx, userId, req.IpListId)
if err != nil {
return nil, err