mirror of
https://github.com/v2fly/v2ray-core.git
synced 2026-04-18 19:49:13 -04:00
isolate router settings synthesis
This commit is contained in:
Shelikhoo
159
infra/conf/synthetic/router/router.go
Normal file
159
infra/conf/synthetic/router/router.go
Normal file
@@ -0,0 +1,159 @@
|
||||
package router
|
||||
|
||||
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"strings"
|
||||
|
||||
"github.com/golang/protobuf/proto"
|
||||
|
||||
"github.com/v2fly/v2ray-core/v4/app/router"
|
||||
"github.com/v2fly/v2ray-core/v4/common/platform"
|
||||
"github.com/v2fly/v2ray-core/v4/common/serial"
|
||||
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon"
|
||||
"github.com/v2fly/v2ray-core/v4/infra/conf/geodata"
|
||||
rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule"
|
||||
)
|
||||
|
||||
type RouterRulesConfig struct {
|
||||
RuleList []json.RawMessage `json:"rules"`
|
||||
DomainStrategy string `json:"domainStrategy"`
|
||||
}
|
||||
|
||||
// StrategyConfig represents a strategy config
|
||||
type StrategyConfig struct {
|
||||
Type string `json:"type"`
|
||||
Settings *json.RawMessage `json:"settings"`
|
||||
}
|
||||
|
||||
type BalancingRule struct {
|
||||
Tag string `json:"tag"`
|
||||
Selectors cfgcommon.StringList `json:"selector"`
|
||||
Strategy StrategyConfig `json:"strategy"`
|
||||
FallbackTag string `json:"fallbackTag"`
|
||||
}
|
||||
|
||||
// Build builds the balancing rule
|
||||
func (r *BalancingRule) Build() (*router.BalancingRule, error) {
|
||||
if r.Tag == "" {
|
||||
return nil, newError("empty balancer tag")
|
||||
}
|
||||
if len(r.Selectors) == 0 {
|
||||
return nil, newError("empty selector list")
|
||||
}
|
||||
|
||||
var strategy string
|
||||
switch strings.ToLower(r.Strategy.Type) {
|
||||
case strategyRandom, "":
|
||||
r.Strategy.Type = strategyRandom
|
||||
strategy = strategyRandom
|
||||
case strategyLeastLoad:
|
||||
strategy = strategyLeastLoad
|
||||
case strategyLeastPing:
|
||||
strategy = "leastping"
|
||||
default:
|
||||
return nil, newError("unknown balancing strategy: " + r.Strategy.Type)
|
||||
}
|
||||
|
||||
settings := []byte("{}")
|
||||
if r.Strategy.Settings != nil {
|
||||
settings = ([]byte)(*r.Strategy.Settings)
|
||||
}
|
||||
rawConfig, err := strategyConfigLoader.LoadWithID(settings, r.Strategy.Type)
|
||||
if err != nil {
|
||||
return nil, newError("failed to parse to strategy config.").Base(err)
|
||||
}
|
||||
var ts proto.Message
|
||||
if builder, ok := rawConfig.(cfgcommon.Buildable); ok {
|
||||
ts, err = builder.Build()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return &router.BalancingRule{
|
||||
Strategy: strategy,
|
||||
StrategySettings: serial.ToTypedMessage(ts),
|
||||
FallbackTag: r.FallbackTag,
|
||||
OutboundSelector: r.Selectors,
|
||||
Tag: r.Tag,
|
||||
}, nil
|
||||
}
|
||||
|
||||
type RouterConfig struct {
|
||||
Settings *RouterRulesConfig `json:"settings"` // Deprecated
|
||||
RuleList []json.RawMessage `json:"rules"`
|
||||
DomainStrategy *string `json:"domainStrategy"`
|
||||
Balancers []*BalancingRule `json:"balancers"`
|
||||
|
||||
DomainMatcher string `json:"domainMatcher"`
|
||||
}
|
||||
|
||||
func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy {
|
||||
ds := ""
|
||||
if c.DomainStrategy != nil {
|
||||
ds = *c.DomainStrategy
|
||||
} else if c.Settings != nil {
|
||||
ds = c.Settings.DomainStrategy
|
||||
}
|
||||
|
||||
switch strings.ToLower(ds) {
|
||||
case "alwaysip", "always_ip", "always-ip":
|
||||
return router.Config_UseIp
|
||||
case "ipifnonmatch", "ip_if_non_match", "ip-if-non-match":
|
||||
return router.Config_IpIfNonMatch
|
||||
case "ipondemand", "ip_on_demand", "ip-on-demand":
|
||||
return router.Config_IpOnDemand
|
||||
default:
|
||||
return router.Config_AsIs
|
||||
}
|
||||
}
|
||||
|
||||
func (c *RouterConfig) Build() (*router.Config, error) {
|
||||
config := new(router.Config)
|
||||
config.DomainStrategy = c.getDomainStrategy()
|
||||
|
||||
cfgctx := cfgcommon.NewConfigureLoadingContext(context.Background())
|
||||
|
||||
geoloadername := platform.NewEnvFlag("v2ray.conf.geoloader").GetValue(func() string {
|
||||
return "standard"
|
||||
})
|
||||
|
||||
if loader, err := geodata.GetGeoDataLoader(geoloadername); err == nil {
|
||||
cfgcommon.SetGeoDataLoader(cfgctx, loader)
|
||||
} else {
|
||||
return nil, newError("unable to create geo data loader ").Base(err)
|
||||
}
|
||||
|
||||
var rawRuleList []json.RawMessage
|
||||
if c != nil {
|
||||
rawRuleList = c.RuleList
|
||||
if c.Settings != nil {
|
||||
c.RuleList = append(c.RuleList, c.Settings.RuleList...)
|
||||
rawRuleList = c.RuleList
|
||||
}
|
||||
}
|
||||
|
||||
for _, rawRule := range rawRuleList {
|
||||
rule, err := rule2.ParseRule(cfgctx, rawRule)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if rule.DomainMatcher == "" {
|
||||
rule.DomainMatcher = c.DomainMatcher
|
||||
}
|
||||
|
||||
config.Rule = append(config.Rule, rule)
|
||||
}
|
||||
for _, rawBalancer := range c.Balancers {
|
||||
balancer, err := rawBalancer.Build()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
config.BalancingRule = append(config.BalancingRule, balancer)
|
||||
}
|
||||
return config, nil
|
||||
}
|
||||
103
infra/conf/synthetic/router/router_strategy.go
Normal file
103
infra/conf/synthetic/router/router_strategy.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package router
|
||||
|
||||
import (
|
||||
"github.com/golang/protobuf/proto"
|
||||
"github.com/v2fly/v2ray-core/v4/app/observatory/burst"
|
||||
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration"
|
||||
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader"
|
||||
|
||||
"github.com/v2fly/v2ray-core/v4/app/router"
|
||||
)
|
||||
|
||||
const (
|
||||
strategyRandom string = "random"
|
||||
strategyLeastLoad string = "leastload"
|
||||
strategyLeastPing string = "leastping"
|
||||
)
|
||||
|
||||
var (
|
||||
strategyConfigLoader = loader.NewJSONConfigLoader(loader.ConfigCreatorCache{
|
||||
strategyRandom: func() interface{} { return new(strategyEmptyConfig) },
|
||||
strategyLeastLoad: func() interface{} { return new(strategyLeastLoadConfig) },
|
||||
strategyLeastPing: func() interface{} { return new(strategyLeastPingConfig) },
|
||||
}, "type", "settings")
|
||||
)
|
||||
|
||||
type strategyEmptyConfig struct {
|
||||
}
|
||||
|
||||
func (v *strategyEmptyConfig) Build() (proto.Message, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
type strategyLeastLoadConfig struct {
|
||||
// weight settings
|
||||
Costs []*router.StrategyWeight `json:"costs,omitempty"`
|
||||
// ping rtt baselines
|
||||
Baselines []duration.Duration `json:"baselines,omitempty"`
|
||||
// expected nodes count to select
|
||||
Expected int32 `json:"expected,omitempty"`
|
||||
// max acceptable rtt, filter away high delay nodes. defalut 0
|
||||
MaxRTT duration.Duration `json:"maxRTT,omitempty"`
|
||||
// acceptable failure rate
|
||||
Tolerance float64 `json:"tolerance,omitempty"`
|
||||
|
||||
ObserverTag string `json:"observerTag,omitempty"`
|
||||
}
|
||||
|
||||
// HealthCheckSettings holds settings for health Checker
|
||||
type HealthCheckSettings struct {
|
||||
Destination string `json:"destination"`
|
||||
Connectivity string `json:"connectivity"`
|
||||
Interval duration.Duration `json:"interval"`
|
||||
SamplingCount int `json:"sampling"`
|
||||
Timeout duration.Duration `json:"timeout"`
|
||||
}
|
||||
|
||||
func (h HealthCheckSettings) Build() (proto.Message, error) {
|
||||
return &burst.HealthPingConfig{
|
||||
Destination: h.Destination,
|
||||
Connectivity: h.Connectivity,
|
||||
Interval: int64(h.Interval),
|
||||
Timeout: int64(h.Timeout),
|
||||
SamplingCount: int32(h.SamplingCount),
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Build implements Buildable.
|
||||
func (v *strategyLeastLoadConfig) Build() (proto.Message, error) {
|
||||
config := &router.StrategyLeastLoadConfig{}
|
||||
config.Costs = v.Costs
|
||||
config.Tolerance = float32(v.Tolerance)
|
||||
config.ObserverTag = v.ObserverTag
|
||||
if config.Tolerance < 0 {
|
||||
config.Tolerance = 0
|
||||
}
|
||||
if config.Tolerance > 1 {
|
||||
config.Tolerance = 1
|
||||
}
|
||||
config.Expected = v.Expected
|
||||
if config.Expected < 0 {
|
||||
config.Expected = 0
|
||||
}
|
||||
config.MaxRTT = int64(v.MaxRTT)
|
||||
if config.MaxRTT < 0 {
|
||||
config.MaxRTT = 0
|
||||
}
|
||||
config.Baselines = make([]int64, 0)
|
||||
for _, b := range v.Baselines {
|
||||
if b <= 0 {
|
||||
continue
|
||||
}
|
||||
config.Baselines = append(config.Baselines, int64(b))
|
||||
}
|
||||
return config, nil
|
||||
}
|
||||
|
||||
type strategyLeastPingConfig struct {
|
||||
ObserverTag string `json:"observerTag,omitempty"`
|
||||
}
|
||||
|
||||
func (s strategyLeastPingConfig) Build() (proto.Message, error) {
|
||||
return &router.StrategyLeastPingConfig{ObserverTag: s.ObserverTag}, nil
|
||||
}
|
||||
392
infra/conf/synthetic/router/router_test.go
Normal file
392
infra/conf/synthetic/router/router_test.go
Normal file
@@ -0,0 +1,392 @@
|
||||
package router_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist"
|
||||
router2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router"
|
||||
"testing"
|
||||
"time"
|
||||
_ "unsafe"
|
||||
|
||||
"github.com/golang/protobuf/proto"
|
||||
|
||||
"github.com/v2fly/v2ray-core/v4/app/router"
|
||||
"github.com/v2fly/v2ray-core/v4/common/net"
|
||||
"github.com/v2fly/v2ray-core/v4/common/serial"
|
||||
|
||||
// Geo loaders
|
||||
_ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative"
|
||||
_ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard"
|
||||
)
|
||||
|
||||
func TestRouterConfig(t *testing.T) {
|
||||
createParser := func() func(string) (proto.Message, error) {
|
||||
return func(s string) (proto.Message, error) {
|
||||
config := new(router2.RouterConfig)
|
||||
if err := json.Unmarshal([]byte(s), config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return config.Build()
|
||||
}
|
||||
}
|
||||
|
||||
testassist.RunMultiTestCase(t, []testassist.TestCase{
|
||||
{
|
||||
Input: `{
|
||||
"strategy": "rules",
|
||||
"settings": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"domain": [
|
||||
"baidu.com",
|
||||
"qq.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"domains": [
|
||||
"v2fly.org",
|
||||
"github.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"ip": [
|
||||
"10.0.0.0/8",
|
||||
"::1/128"
|
||||
],
|
||||
"outboundTag": "test"
|
||||
},{
|
||||
"type": "field",
|
||||
"port": "53, 443, 1000-2000",
|
||||
"outboundTag": "test"
|
||||
},{
|
||||
"type": "field",
|
||||
"port": 123,
|
||||
"outboundTag": "test"
|
||||
}
|
||||
]
|
||||
},
|
||||
"balancers": [
|
||||
{
|
||||
"tag": "b1",
|
||||
"selector": ["test"]
|
||||
},
|
||||
{
|
||||
"tag": "b2",
|
||||
"selector": ["test"],
|
||||
"strategy": {
|
||||
"type": "leastload",
|
||||
"settings": {
|
||||
"healthCheck": {
|
||||
"interval": "5m0s",
|
||||
"sampling": 2,
|
||||
"timeout": "5s",
|
||||
"destination": "dest",
|
||||
"connectivity": "conn"
|
||||
},
|
||||
"costs": [
|
||||
{
|
||||
"regexp": true,
|
||||
"match": "\\d+(\\.\\d+)",
|
||||
"value": 5
|
||||
}
|
||||
],
|
||||
"baselines": ["400ms", "600ms"],
|
||||
"expected": 6,
|
||||
"maxRTT": "1000ms",
|
||||
"tolerance": 0.5
|
||||
}
|
||||
},
|
||||
"fallbackTag": "fall"
|
||||
}
|
||||
]
|
||||
}`,
|
||||
Parser: createParser(),
|
||||
Output: &router.Config{
|
||||
DomainStrategy: router.Config_AsIs,
|
||||
BalancingRule: []*router.BalancingRule{
|
||||
{
|
||||
Tag: "b1",
|
||||
OutboundSelector: []string{"test"},
|
||||
Strategy: "random",
|
||||
},
|
||||
{
|
||||
Tag: "b2",
|
||||
OutboundSelector: []string{"test"},
|
||||
Strategy: "leastload",
|
||||
StrategySettings: serial.ToTypedMessage(&router.StrategyLeastLoadConfig{
|
||||
Costs: []*router.StrategyWeight{
|
||||
{
|
||||
Regexp: true,
|
||||
Match: "\\d+(\\.\\d+)",
|
||||
Value: 5,
|
||||
},
|
||||
},
|
||||
Baselines: []int64{
|
||||
int64(time.Duration(400) * time.Millisecond),
|
||||
int64(time.Duration(600) * time.Millisecond),
|
||||
},
|
||||
Expected: 6,
|
||||
MaxRTT: int64(time.Duration(1000) * time.Millisecond),
|
||||
Tolerance: 0.5,
|
||||
}),
|
||||
FallbackTag: "fall",
|
||||
},
|
||||
},
|
||||
Rule: []*router.RoutingRule{
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "baidu.com",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "qq.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "v2fly.org",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "github.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Geoip: []*router.GeoIP{
|
||||
{
|
||||
Cidr: []*router.CIDR{
|
||||
{
|
||||
Ip: []byte{10, 0, 0, 0},
|
||||
Prefix: 8,
|
||||
},
|
||||
{
|
||||
Ip: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
|
||||
Prefix: 128,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "test",
|
||||
},
|
||||
},
|
||||
{
|
||||
PortList: &net.PortList{
|
||||
Range: []*net.PortRange{
|
||||
{From: 53, To: 53},
|
||||
{From: 443, To: 443},
|
||||
{From: 1000, To: 2000},
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "test",
|
||||
},
|
||||
},
|
||||
{
|
||||
PortList: &net.PortList{
|
||||
Range: []*net.PortRange{
|
||||
{From: 123, To: 123},
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Input: `{
|
||||
"strategy": "rules",
|
||||
"settings": {
|
||||
"domainStrategy": "IPIfNonMatch",
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"domain": [
|
||||
"baidu.com",
|
||||
"qq.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"domains": [
|
||||
"v2fly.org",
|
||||
"github.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"ip": [
|
||||
"10.0.0.0/8",
|
||||
"::1/128"
|
||||
],
|
||||
"outboundTag": "test"
|
||||
}
|
||||
]
|
||||
}
|
||||
}`,
|
||||
Parser: createParser(),
|
||||
Output: &router.Config{
|
||||
DomainStrategy: router.Config_IpIfNonMatch,
|
||||
Rule: []*router.RoutingRule{
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "baidu.com",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "qq.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "v2fly.org",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "github.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Geoip: []*router.GeoIP{
|
||||
{
|
||||
Cidr: []*router.CIDR{
|
||||
{
|
||||
Ip: []byte{10, 0, 0, 0},
|
||||
Prefix: 8,
|
||||
},
|
||||
{
|
||||
Ip: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
|
||||
Prefix: 128,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Input: `{
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"domain": [
|
||||
"baidu.com",
|
||||
"qq.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"domains": [
|
||||
"v2fly.org",
|
||||
"github.com"
|
||||
],
|
||||
"outboundTag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"ip": [
|
||||
"10.0.0.0/8",
|
||||
"::1/128"
|
||||
],
|
||||
"outboundTag": "test"
|
||||
}
|
||||
]
|
||||
}`,
|
||||
Parser: createParser(),
|
||||
Output: &router.Config{
|
||||
DomainStrategy: router.Config_AsIs,
|
||||
Rule: []*router.RoutingRule{
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "baidu.com",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "qq.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Domain: []*router.Domain{
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "v2fly.org",
|
||||
},
|
||||
{
|
||||
Type: router.Domain_Plain,
|
||||
Value: "github.com",
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "direct",
|
||||
},
|
||||
},
|
||||
{
|
||||
Geoip: []*router.GeoIP{
|
||||
{
|
||||
Cidr: []*router.CIDR{
|
||||
{
|
||||
Ip: []byte{10, 0, 0, 0},
|
||||
Prefix: 8,
|
||||
},
|
||||
{
|
||||
Ip: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
|
||||
Prefix: 128,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
TargetTag: &router.RoutingRule_Tag{
|
||||
Tag: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user