TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2026-01-04 18:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现WAF

Browse Source
This commit is contained in:
刘祥超
2020-10-08 15:06:56 +08:00
parent d247f2f582
commit eac1e5ee68
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/nodeconfigs/node_config.go
View File

@@ -3,6 +3,7 @@ package nodeconfigs
import (
"encoding/json"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/iwind/TeaGo/Tea"
"io/ioutil"
@@ -20,7 +21,8 @@ type NodeConfig struct {
// 全局配置
GlobalConfig *serverconfigs.GlobalConfig `yaml:"globalConfig" json:"globalConfig"` // 全局配置
cachePolicies []*serverconfigs.HTTPCachePolicy
cachePolicies []*serverconfigs.HTTPCachePolicy
firewallPolicies []*firewallconfigs.HTTPFirewallPolicy
}
// 取得当前节点配置单例
@@ -76,7 +78,15 @@ func (this *NodeConfig) Init() error {
this.cachePolicies = []*serverconfigs.HTTPCachePolicy{}
for _, server := range this.Servers {
if server.Web != nil {
this.lookupCachePolicy(server.Web)
this.lookupWeb(server.Web)
}
}
// firewall policies
this.firewallPolicies = []*firewallconfigs.HTTPFirewallPolicy{}
for _, server := range this.Servers {
if server.Web != nil {
this.lookupWeb(server.Web)
}
}
@@ -113,6 +123,11 @@ func (this *NodeConfig) AllCachePolicies() []*serverconfigs.HTTPCachePolicy {
return this.cachePolicies
}
// 获取使用的所有的WAF策略
func (this *NodeConfig) AllHTTPFirewallPolicies() []*firewallconfigs.HTTPFirewallPolicy {
return this.firewallPolicies
}
// 写入到文件
func (this *NodeConfig) Save() error {
shared.Locker.Lock()
@@ -126,11 +141,13 @@ func (this *NodeConfig) Save() error {
return ioutil.WriteFile(Tea.ConfigFile("node.json"), data, 0777)
}
// 查找Web中的缓存策略
func (this *NodeConfig) lookupCachePolicy(web *serverconfigs.HTTPWebConfig) {
// 查找Web中的缓存策略、防火墙策略等
func (this *NodeConfig) lookupWeb(web *serverconfigs.HTTPWebConfig) {
if web == nil {
return
}
// cache
if web.Cache != nil && len(web.Cache.CacheRefs) > 0 {
for _, cacheRef := range web.Cache.CacheRefs {
if cacheRef.CachePolicy != nil && !this.hasCachePolicy(cacheRef.CachePolicyId) {
@@ -139,8 +156,13 @@ func (this *NodeConfig) lookupCachePolicy(web *serverconfigs.HTTPWebConfig) {
}
}
// firewall
if web.FirewallPolicy != nil && !this.hasHTTPFirewallPolicy(web.FirewallPolicy.Id) {
this.firewallPolicies = append(this.firewallPolicies, web.FirewallPolicy)
}
for _, location := range web.Locations {
this.lookupCachePolicy(location.Web)
this.lookupWeb(location.Web)
}
}
@@ -153,3 +175,13 @@ func (this *NodeConfig) hasCachePolicy(cachePolicyId int64) bool {
}
return false
}
// 检查防火墙策略是否已收集
func (this *NodeConfig) hasHTTPFirewallPolicy(firewallPolicyId int64) bool {
for _, p := range this.firewallPolicies {
if p.Id == firewallPolicyId {
return true
}
}
return false
}

14
pkg/serverconfigs/http_web_config.go
View File

@@ -20,13 +20,13 @@ type HTTPWebConfig struct {
MaxRequestBodySize string `yaml:"maxRequestBodySize" json:"maxRequestBodySize"` // 请求body最大尺寸 TODO 需要实现
AccessLogRef *HTTPAccessLogRef `yaml:"accessLog" json:"accessLog"` // 访问日志配置
StatRef *HTTPStatRef `yaml:"statRef" json:"statRef"` // 统计配置
Cache *HTTPCacheConfig `yaml:"cache" json:"cache"`
FirewallRef *firewallconfigs.HTTPFirewallRef `yaml:"firewallRef" json:"firewallRef"` // 防火墙设置
FirewallPolicy *firewallconfigs.HTTPFirewallPolicy `yaml:"firewallPolicy" json:"firewallPolicy"` // 防火墙策略
WebsocketRef *HTTPWebsocketRef `yaml:"websocketRef" json:"websocketRef"` // Websocket应用配置
Websocket *HTTPWebsocketConfig `yaml:"websocket" json:"websocket"` // Websocket配置
RewriteRefs []*HTTPRewriteRef `yaml:"rewriteRefs" json:"rewriteRefs"` // 重写规则配置
RewriteRules []*HTTPRewriteRule `yaml:"rewriteRules" json:"rewriteRules"` // 重写规则
Cache *HTTPCacheConfig `yaml:"cache" json:"cache"` // 缓存配置
FirewallRef *firewallconfigs.HTTPFirewallRef `yaml:"firewallRef" json:"firewallRef"` // 防火墙设置
FirewallPolicy *firewallconfigs.HTTPFirewallPolicy `yaml:"firewallPolicy" json:"firewallPolicy"` // 防火墙策略
WebsocketRef *HTTPWebsocketRef `yaml:"websocketRef" json:"websocketRef"` // Websocket应用配置
Websocket *HTTPWebsocketConfig `yaml:"websocket" json:"websocket"` // Websocket配置
RewriteRefs []*HTTPRewriteRef `yaml:"rewriteRefs" json:"rewriteRefs"` // 重写规则配置
RewriteRules []*HTTPRewriteRule `yaml:"rewriteRules" json:"rewriteRules"` // 重写规则
RequestHeaderPolicyRef *shared.HTTPHeaderPolicyRef `yaml:"requestHeaderPolicyRef" json:"requestHeaderPolicyRef"` // 请求Header
RequestHeaderPolicy *shared.HTTPHeaderPolicy `yaml:"requestHeaderPolicy" json:"requestHeaderPolicy"` // 请求Header策略