检查IP是否允许访问时增加缓存

This commit is contained in:
刘祥超
2020-11-20 22:09:26 +08:00
parent 3ec89a432c
commit 9ef9ea52f7
3 changed files with 44 additions and 1 deletions

View File

@@ -5,4 +5,6 @@ type Event = string
const ( const (
EventStart Event = "start" // start loading EventStart Event = "start" // start loading
EventQuit Event = "quit" // quit node gracefully EventQuit Event = "quit" // quit node gracefully
EventSecurityConfigChanged Event = "securityConfigChanged" // 安全设置变更
) )

View File

@@ -2,6 +2,7 @@ package securitymanager
import ( import (
"encoding/json" "encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/events"
"github.com/TeaOSLab/EdgeAdmin/internal/rpc" "github.com/TeaOSLab/EdgeAdmin/internal/rpc"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/logs" "github.com/iwind/TeaGo/logs"
@@ -61,6 +62,10 @@ func UpdateSecurityConfig(securityConfig *SecurityConfig) error {
return err return err
} }
sharedSecurityConfig = securityConfig sharedSecurityConfig = securityConfig
// 通知更新
events.Notify(events.EventSecurityConfigChanged)
return nil return nil
} }

View File

@@ -1,16 +1,52 @@
package helpers package helpers
import ( import (
"github.com/TeaOSLab/EdgeAdmin/internal/events"
nodes "github.com/TeaOSLab/EdgeAdmin/internal/rpc" nodes "github.com/TeaOSLab/EdgeAdmin/internal/rpc"
"github.com/TeaOSLab/EdgeAdmin/internal/securitymanager" "github.com/TeaOSLab/EdgeAdmin/internal/securitymanager"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/logs" "github.com/iwind/TeaGo/logs"
"net" "net"
"sync"
) )
// 检查用户IP var ipCacheMap = map[string]bool{} // ip => bool
var ipCacheLocker = sync.Mutex{}
func init() {
events.On(events.EventSecurityConfigChanged, func() {
ipCacheLocker.Lock()
ipCacheMap = map[string]bool{}
ipCacheLocker.Unlock()
})
}
// 检查用户IP并支持缓存
func checkIP(config *securitymanager.SecurityConfig, ipAddr string) bool { func checkIP(config *securitymanager.SecurityConfig, ipAddr string) bool {
ipCacheLocker.Lock()
ipCache, ok := ipCacheMap[ipAddr]
if ok && ipCache {
ipCacheLocker.Unlock()
return ipCache
}
ipCacheLocker.Unlock()
result := checkIPWithoutCache(config, ipAddr)
ipCacheLocker.Lock()
// 缓存的内容不能过多
if len(ipCacheMap) > 100_000 {
ipCacheMap = map[string]bool{}
}
ipCacheMap[ipAddr] = result
ipCacheLocker.Unlock()
return result
}
// 检查用户IP
func checkIPWithoutCache(config *securitymanager.SecurityConfig, ipAddr string) bool {
if config == nil { if config == nil {
return true return true
} }