TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-20 21:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现公用的IP名单

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-23 13:14:37 +08:00
parent d3c9c0a552
commit 8947fa8213
2 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/nodes/http_request_waf.go
View File

@@ -47,8 +47,12 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
// 检查IP白名单 // 检查IP白名单
remoteAddrs := this.requestRemoteAddrs() remoteAddrs := this.requestRemoteAddrs()
inbound := firewallPolicy.Inbound inbound := firewallPolicy.Inbound
if inbound.AllowListRef != nil && inbound.AllowListRef.IsOn && inbound.AllowListRef.ListId > 0 { if inbound == nil {
list := iplibrary.SharedIPListManager.FindList(inbound.AllowListRef.ListId) return
}
for _, ref := range inbound.AllAllowListRefs() {
if ref.IsOn && ref.ListId > 0 {
list := iplibrary.SharedIPListManager.FindList(ref.ListId)
if list != nil { if list != nil {
found, _ := list.ContainsIPStrings(remoteAddrs) found, _ := list.ContainsIPStrings(remoteAddrs)
if found { if found {
@@ -57,10 +61,12 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
} }
} }
} }
}
// 检查IP黑名单 // 检查IP黑名单
if inbound.DenyListRef != nil && inbound.DenyListRef.IsOn && inbound.DenyListRef.ListId > 0 { for _, ref := range inbound.AllDenyListRefs() {
list := iplibrary.SharedIPListManager.FindList(inbound.DenyListRef.ListId) if ref.IsOn && ref.ListId > 0 {
list := iplibrary.SharedIPListManager.FindList(ref.ListId)
if list != nil { if list != nil {
found, item := list.ContainsIPStrings(remoteAddrs) found, item := list.ContainsIPStrings(remoteAddrs)
if found { if found {
@@ -92,6 +98,7 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
} }
} }
} }
}
// 检查地区封禁 // 检查地区封禁
if iplibrary.SharedLibrary != nil { if iplibrary.SharedLibrary != nil {

15
internal/stats/http_request_stat_manager.go
View File

@@ -17,7 +17,7 @@ import (
var SharedHTTPRequestStatManager = NewHTTPRequestStatManager() var SharedHTTPRequestStatManager = NewHTTPRequestStatManager()
// HTTP请求相关的统计 // HTTPRequestStatManager HTTP请求相关的统计
// 这里的统计是一个辅助统计，注意不要因为统计而影响服务工作性能 // 这里的统计是一个辅助统计，注意不要因为统计而影响服务工作性能
type HTTPRequestStatManager struct { type HTTPRequestStatManager struct {
ipChan chan string ipChan chan string
@@ -32,7 +32,7 @@ type HTTPRequestStatManager struct {
dailyFirewallRuleGroupMap map[string]int64 // serverId@firewallRuleGroupId@action => count dailyFirewallRuleGroupMap map[string]int64 // serverId@firewallRuleGroupId@action => count
} }
// 获取新对象 // NewHTTPRequestStatManager 获取新对象
func NewHTTPRequestStatManager() *HTTPRequestStatManager { func NewHTTPRequestStatManager() *HTTPRequestStatManager {
return &HTTPRequestStatManager{ return &HTTPRequestStatManager{
ipChan: make(chan string, 10_000), // TODO 将来可以配置容量 ipChan: make(chan string, 10_000), // TODO 将来可以配置容量
@@ -46,7 +46,7 @@ func NewHTTPRequestStatManager() *HTTPRequestStatManager {
} }
} }
// 启动 // Start 启动
func (this *HTTPRequestStatManager) Start() { func (this *HTTPRequestStatManager) Start() {
loopTicker := time.NewTicker(1 * time.Second) loopTicker := time.NewTicker(1 * time.Second)
uploadTicker := time.NewTicker(30 * time.Minute) uploadTicker := time.NewTicker(30 * time.Minute)
@@ -76,7 +76,7 @@ func (this *HTTPRequestStatManager) Start() {
} }
} }
// 添加客户端地址 // AddRemoteAddr 添加客户端地址
func (this *HTTPRequestStatManager) AddRemoteAddr(serverId int64, remoteAddr string) { func (this *HTTPRequestStatManager) AddRemoteAddr(serverId int64, remoteAddr string) {
if len(remoteAddr) == 0 { if len(remoteAddr) == 0 {
return return
@@ -100,7 +100,7 @@ func (this *HTTPRequestStatManager) AddRemoteAddr(serverId int64, remoteAddr str
} }
} }
// 添加UserAgent // AddUserAgent 添加UserAgent
func (this *HTTPRequestStatManager) AddUserAgent(serverId int64, userAgent string) { func (this *HTTPRequestStatManager) AddUserAgent(serverId int64, userAgent string) {
if len(userAgent) == 0 { if len(userAgent) == 0 {
return return
@@ -113,7 +113,7 @@ func (this *HTTPRequestStatManager) AddUserAgent(serverId int64, userAgent strin
} }
} }
// 添加防火墙拦截动作 // AddFirewallRuleGroupId 添加防火墙拦截动作
func (this *HTTPRequestStatManager) AddFirewallRuleGroupId(serverId int64, firewallRuleGroupId int64, action string) { func (this *HTTPRequestStatManager) AddFirewallRuleGroupId(serverId int64, firewallRuleGroupId int64, action string) {
if firewallRuleGroupId <= 0 { if firewallRuleGroupId <= 0 {
return return
@@ -125,7 +125,7 @@ func (this *HTTPRequestStatManager) AddFirewallRuleGroupId(serverId int64, firew
} }
} }
// 单个循环 // Loop 单个循环
func (this *HTTPRequestStatManager) Loop() error { func (this *HTTPRequestStatManager) Loop() error {
timeout := time.NewTimer(10 * time.Minute) // 执行的最大时间 timeout := time.NewTimer(10 * time.Minute) // 执行的最大时间
userAgentParser := &user_agent.UserAgent{} userAgentParser := &user_agent.UserAgent{}
@@ -189,6 +189,7 @@ Loop:
return nil return nil
} }
// Upload 上传数据
func (this *HTTPRequestStatManager) Upload() error { func (this *HTTPRequestStatManager) Upload() error {
// 上传统计数据 // 上传统计数据
rpcClient, err := rpc.SharedRPC() rpcClient, err := rpc.SharedRPC()