Test: 允许面板下发禁用协议规则

Author: wyx2685

core/custom.go

@@ -114,23 +114,25 @@ func GetCustomConfig(infos []*panel.NodeInfo) (*dns.Config, []*core.OutboundHand
 					continue
 				}
 				coreRouterConfig.RuleList = append(coreRouterConfig.RuleList, rawRule)
-			case "route":
-				if route.ActionValue == nil {
-					continue
+			case "block_protocol":
+				rule := map[string]interface{}{
+					"protocol":    route.Match,
+					"outboundTag": "block",
 				}
-				outbound := &coreConf.OutboundDetourConfig{}
-				err := json.Unmarshal([]byte(*route.ActionValue), outbound)
+				rawRule, err := json.Marshal(rule)
 				if err != nil {
 					continue
 				}
-				if hasOutboundWithTag(coreOutboundConfig, outbound.Tag) {
+				coreRouterConfig.RuleList = append(coreRouterConfig.RuleList, rawRule)
+			case "route":
+				if route.ActionValue == nil {
 					continue
 				}
-				custom_outbound, err := outbound.Build()
+				outbound := &coreConf.OutboundDetourConfig{}
+				err := json.Unmarshal([]byte(*route.ActionValue), outbound)
 				if err != nil {
 					continue
 				}
-				coreOutboundConfig = append(coreOutboundConfig, custom_outbound)
 				rule := map[string]interface{}{
 					"domain":      route.Match,
 					"outboundTag": outbound.Tag,
@@ -140,23 +142,23 @@ func GetCustomConfig(infos []*panel.NodeInfo) (*dns.Config, []*core.OutboundHand
 					continue
 				}
 				coreRouterConfig.RuleList = append(coreRouterConfig.RuleList, rawRule)
-			case "route_ip":
-				if route.ActionValue == nil {
+				if hasOutboundWithTag(coreOutboundConfig, outbound.Tag) {
 					continue
 				}
-				outbound := &coreConf.OutboundDetourConfig{}
-				err := json.Unmarshal([]byte(*route.ActionValue), outbound)
+				custom_outbound, err := outbound.Build()
 				if err != nil {
 					continue
 				}
-				if hasOutboundWithTag(coreOutboundConfig, outbound.Tag) {
+				coreOutboundConfig = append(coreOutboundConfig, custom_outbound)
+			case "route_ip":
+				if route.ActionValue == nil {
 					continue
 				}
-				custom_outbound, err := outbound.Build()
+				outbound := &coreConf.OutboundDetourConfig{}
+				err := json.Unmarshal([]byte(*route.ActionValue), outbound)
 				if err != nil {
 					continue
 				}
-				coreOutboundConfig = append(coreOutboundConfig, custom_outbound)
 				rule := map[string]interface{}{
 					"ip":          route.Match,
 					"outboundTag": outbound.Tag,
@@ -166,6 +168,14 @@ func GetCustomConfig(infos []*panel.NodeInfo) (*dns.Config, []*core.OutboundHand
 					continue
 				}
 				coreRouterConfig.RuleList = append(coreRouterConfig.RuleList, rawRule)
+				if hasOutboundWithTag(coreOutboundConfig, outbound.Tag) {
+					continue
+				}
+				custom_outbound, err := outbound.Build()
+				if err != nil {
+					continue
+				}
+				coreOutboundConfig = append(coreOutboundConfig, custom_outbound)
 			case "default_out":
 				if route.ActionValue == nil {
 					continue