增加常量

pkg/nodeconfigs/defaults.go

@@ -9,6 +9,7 @@ const (
 	DefaultMaxThreadsMin = 1000    // 单节点最大线程数最小值
 	DefaultMaxThreadsMax = 100_000 // 单节点最大线程数最大值
 
-	DefaultTCPMaxConnections = 100_000 // 单节点TCP最大连接数
-	DefaultTCPLinger         = 3       // 单节点TCP Linger值
+	DefaultTCPMaxConnections   = 100_000 // 单节点TCP最大连接数
+	DefaultTCPLinger           = 3       // 单节点TCP Linger值
+	DefaultTLSHandshakeTimeout = 3       // TLS握手超时时间
 )

pkg/serverconfigs/firewallconfigs/http_firewall_template.go

@@ -421,7 +421,7 @@ func HTTPFirewallTemplate() *HTTPFirewallPolicy {
 		{
 			set := &HTTPFirewallRuleSet{}
 			set.IsOn = true
-			set.Name = "常见网络爬虫"
+			set.Name = "搜索引擎"
 			set.Code = "20001"
 			set.Connector = HTTPFirewallRuleConnectorOr
 			set.Actions = []*HTTPFirewallActionConfig{
@@ -434,7 +434,56 @@ func HTTPFirewallTemplate() *HTTPFirewallPolicy {
 				IsOn:              true,
 				Param:             "${userAgent}",
 				Operator:          HTTPFirewallRuleOperatorMatch,
-				Value:             `Googlebot|AdsBot|bingbot|BingPreview|facebookexternalhit|Slurp|Sogou|proximic|Baiduspider|yandex|twitterbot|spider|python`,
+				Value:             `360spider|adldxbot|adsbot-google|applebot|admantx|alexa|baidu|bingbot|bingpreview|facebookexternalhit|googlebot|proximic|slurp|sogou|twitterbot|yandex|spider`,
+				IsCaseInsensitive: true,
+			})
+
+			group.AddRuleSet(set)
+		}
+
+		{
+			set := &HTTPFirewallRuleSet{}
+			set.IsOn = true
+			set.Name = "爬虫工具"
+			set.Code = "20003"
+			set.Connector = HTTPFirewallRuleConnectorOr
+			set.Actions = []*HTTPFirewallActionConfig{
+				{
+					Code: HTTPFirewallActionBlock,
+				},
+			}
+
+			set.AddRule(&HTTPFirewallRule{
+				IsOn:              true,
+				Param:             "${userAgent}",
+				Operator:          HTTPFirewallRuleOperatorMatch,
+				Value:             `python|pycurl|http-client|httpclient|apachebench|nethttp|http_request|java|perl|ruby|scrapy|php|rust`,
+				IsCaseInsensitive: true,
+			})
+
+			group.AddRuleSet(set)
+		}
+
+		{
+			set := &HTTPFirewallRuleSet{}
+			set.IsOn = true
+			set.Name = "下载工具"
+			set.Code = "20004"
+			set.Connector = HTTPFirewallRuleConnectorOr
+			set.Actions = []*HTTPFirewallActionConfig{
+				{
+					Code: HTTPFirewallActionTag,
+					Options: maps.Map{
+						"tags": []string{"download"},
+					},
+				},
+			}
+
+			set.AddRule(&HTTPFirewallRule{
+				IsOn:              true,
+				Param:             "${userAgent}",
+				Operator:          HTTPFirewallRuleOperatorMatch,
+				Value:             `wget|curl`,
 				IsCaseInsensitive: true,
 			})
 

pkg/systemconfigs/check_updates_config.go

@@ -0,0 +1,8 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package systemconfigs
+
+// CheckUpdatesConfig 检查更新配置
+type CheckUpdatesConfig struct {
+	AutoCheck bool `yaml:"autoCheck" json:"autoCheck"`
+}

pkg/systemconfigs/settings.go

@@ -10,6 +10,7 @@ const (
 	SettingCodeAdminSecurityConfig   SettingCode = "adminSecurityConfig" // 管理员安全设置
 	SettingCodeDatabaseConfigSetting SettingCode = "databaseConfig"      // 数据库相关配置
 	SettingCodeAccessLogQueue        SettingCode = "accessLogQueue"      // 访问日志队列
+	SettingCodeCheckUpdates          SettingCode = "checkUpdates"        // 检查自动更新配置
 
 	SettingCodeNSAccessLogSetting SettingCode = "nsAccessLogSetting" // NS相关全局配置
 	SettingCodeNSNodeMonitor      SettingCode = "nsNodeMonitor"      // 监控NS节点状态