purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 06:36:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Config: Remove legacy config fields again (#3782)

Browse Source 
* Remove more lecacy fields

* Patch missing bracket

* Fix tests

* Fix missing comma

* Fix buried test bomb

* Cleanup test after removed legacy test content
This commit is contained in:
Kobe Arthur Scofield 2024-09-11 22:37:25 +08:00 committed by GitHub
parent c90affe7db
commit 6b1bf312d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 55 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
infra/conf/router.go
View File

@ -14,11 +14,6 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
type RouterRulesConfig struct {
RuleList []json.RawMessage `json:"rules"`
DomainStrategy string `json:"domainStrategy"`
}
// StrategyConfig represents a strategy config // StrategyConfig represents a strategy config
type StrategyConfig struct { type StrategyConfig struct {
Type string `json:"type"` Type string `json:"type"`
@ -76,7 +71,6 @@ func (r *BalancingRule) Build() (*router.BalancingRule, error) {
} }
type RouterConfig struct { type RouterConfig struct {
Settings *RouterRulesConfig `json:"settings"` // Deprecated
RuleList []json.RawMessage `json:"rules"` RuleList []json.RawMessage `json:"rules"`
DomainStrategy *string `json:"domainStrategy"` DomainStrategy *string `json:"domainStrategy"`
Balancers []*BalancingRule `json:"balancers"` Balancers []*BalancingRule `json:"balancers"`
@ -88,8 +82,6 @@ func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy {
ds := "" ds := ""
if c.DomainStrategy != nil { if c.DomainStrategy != nil {
ds = *c.DomainStrategy ds = *c.DomainStrategy
} else if c.Settings != nil {
ds = c.Settings.DomainStrategy
} }
switch strings.ToLower(ds) { switch strings.ToLower(ds) {
@ -111,10 +103,6 @@ func (c *RouterConfig) Build() (*router.Config, error) {
var rawRuleList []json.RawMessage var rawRuleList []json.RawMessage
if c != nil { if c != nil {
rawRuleList = c.RuleList rawRuleList = c.RuleList
if c.Settings != nil {
c.RuleList = append(c.RuleList, c.Settings.RuleList...)
rawRuleList = c.RuleList
}
} }
for _, rawRule := range rawRuleList { for _, rawRule := range rawRuleList {

161
infra/conf/router_test.go
View File

@ -64,36 +64,33 @@ func TestRouterConfig(t *testing.T) {
runMultiTestCase(t, []TestCase{ runMultiTestCase(t, []TestCase{
{ {
Input: `{ Input: `{
"strategy": "rules", "domainStrategy": "AsIs",
"settings": { "rules": [
"domainStrategy": "AsIs", {
"rules": [ "type": "field",
{ "domain": [
"type": "field", "baidu.com",
"domain": [ "qq.com"
"baidu.com", ],
"qq.com" "outboundTag": "direct"
], },
"outboundTag": "direct" {
}, "type": "field",
{ "ip": [
"type": "field", "10.0.0.0/8",
"ip": [ "::1/128"
"10.0.0.0/8", ],
"::1/128" "outboundTag": "test"
], },{
"outboundTag": "test" "type": "field",
},{ "port": "53, 443, 1000-2000",
"type": "field", "outboundTag": "test"
"port": "53, 443, 1000-2000", },{
"outboundTag": "test" "type": "field",
},{ "port": 123,
"type": "field", "outboundTag": "test"
"port": 123, }
"outboundTag": "test" ],
}
]
},
"balancers": [ "balancers": [
{ {
"tag": "b1", "tag": "b1",
@ -225,28 +222,25 @@ func TestRouterConfig(t *testing.T) {
}, },
{ {
Input: `{ Input: `{
"strategy": "rules", "domainStrategy": "IPIfNonMatch",
"settings": { "rules": [
"domainStrategy": "IPIfNonMatch", {
"rules": [ "type": "field",
{ "domain": [
"type": "field", "baidu.com",
"domain": [ "qq.com"
"baidu.com", ],
"qq.com" "outboundTag": "direct"
], },
"outboundTag": "direct" {
}, "type": "field",
{ "ip": [
"type": "field", "10.0.0.0/8",
"ip": [ "::1/128"
"10.0.0.0/8", ],
"::1/128" "outboundTag": "test"
], }
"outboundTag": "test" ]
}
]
}
}`, }`,
Parser: createParser(), Parser: createParser(),
Output: &router.Config{ Output: &router.Config{
@ -289,68 +283,5 @@ func TestRouterConfig(t *testing.T) {
}, },
}, },
}, },
{
Input: `{
"domainStrategy": "AsIs",
"rules": [
{
"type": "field",
"domain": [
"baidu.com",
"qq.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",
},
},
{
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",
},
},
},
},
},
}) })
} }

13
infra/conf/xray.go
View File

@ -361,11 +361,6 @@ func (c *StatsConfig) Build() (*stats.Config, error) {
} }
type Config struct { type Config struct {
// Port of this Point server.
// Deprecated: Port exists for historical compatibility
// and should not be used.
Port uint16 `json:"port"`
// Deprecated: Global transport config is no longer used // Deprecated: Global transport config is no longer used
// left for returning error // left for returning error
Transport map[string]json.RawMessage `json:"transport"` Transport map[string]json.RawMessage `json:"transport"`
@ -597,14 +592,6 @@ func (c *Config) Build() (*core.Config, error) {
inbounds = append(inbounds, c.InboundConfigs...) inbounds = append(inbounds, c.InboundConfigs...)
} }
// Backward compatibility.
if len(inbounds) > 0 && inbounds[0].PortList == nil && c.Port > 0 {
inbounds[0].PortList = &PortList{[]PortRange{{
From: uint32(c.Port),
To: uint32(c.Port),
}}}
}
if len(c.Transport) > 0 { if len(c.Transport) > 0 {
return nil, errors.New("Global transport config is deprecated") return nil, errors.New("Global transport config is deprecated")
} }

21
infra/conf/xray_test.go
View File

@ -74,18 +74,15 @@ func TestXrayConfig(t *testing.T) {
} }
}], }],
"routing": { "routing": {
"strategy": "rules", "rules": [
"settings": { {
"rules": [ "ip": [
{ "10.0.0.0/8"
"ip": [ ],
"10.0.0.0/8" "type": "field",
], "outboundTag": "blocked"
"type": "field", }
"outboundTag": "blocked" ]
}
]
}
} }
}`, }`,
Parser: createParser(), Parser: createParser(),