mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-04 14:13:03 +00:00
fa5d7a255b
* v5: Health Check & LeastLoad Strategy (rebased from 2c5a71490368500a982018a74a6d519c7e121816) Some changes will be necessary to integrate it into V2Ray * Update proto * parse duration conf with time.Parse() * moving health ping to observatory as a standalone component * moving health ping to observatory as a standalone component: auto generated file * add initialization for health ping * incorporate changes in router implementation * support principle target output * add v4 json support for BurstObservatory & fix balancer reference * update API command * remove cancelled API * return zero length value when observer is not found * remove duplicated targeted dispatch * adjust test with updated structure * bug fix for observer * fix strategy selector * fix strategy least load * Fix ticker usage ticker.Close does not close ticker.C * feat: Replace default Health Ping URL to HTTPS (#1991) * fix selectLeastLoad() returns wrong number of nodes (#2083) * Test: fix leastload strategy unit test * fix(router): panic caused by concurrent map read and write (#2678) * Clean up code --------- Co-authored-by: Jebbs <qjebbs@gmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: 世界 <i@sekai.icu> Co-authored-by: Bernd Eichelberger <46166740+4-FLOSS-Free-Libre-Open-Source-Software@users.noreply.github.com> Co-authored-by: 秋のかえで <autmaple@protonmail.com> Co-authored-by: Rinka <kujourinka@gmail.com>
355 lines
7.2 KiB
Go
355 lines
7.2 KiB
Go
package conf_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
_ "unsafe"
|
|
|
|
"github.com/xtls/xray-core/app/router"
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/common/platform"
|
|
"github.com/xtls/xray-core/common/platform/filesystem"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
. "github.com/xtls/xray-core/infra/conf"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
func init() {
|
|
wd, err := os.Getwd()
|
|
common.Must(err)
|
|
|
|
if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && os.IsNotExist(err) {
|
|
common.Must(filesystem.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(wd, "..", "..", "resources", "geoip.dat")))
|
|
}
|
|
|
|
os.Setenv("xray.location.asset", wd)
|
|
}
|
|
|
|
func TestToCidrList(t *testing.T) {
|
|
t.Log(os.Getenv("xray.location.asset"))
|
|
|
|
common.Must(filesystem.CopyFile(platform.GetAssetLocation("geoiptestrouter.dat"), "geoip.dat"))
|
|
|
|
ips := StringList([]string{
|
|
"geoip:us",
|
|
"geoip:cn",
|
|
"geoip:!cn",
|
|
"ext:geoiptestrouter.dat:!cn",
|
|
"ext:geoiptestrouter.dat:ca",
|
|
"ext-ip:geoiptestrouter.dat:!cn",
|
|
"ext-ip:geoiptestrouter.dat:!ca",
|
|
})
|
|
|
|
_, err := ToCidrList(ips)
|
|
if err != nil {
|
|
t.Fatalf("Failed to parse geoip list, got %s", err)
|
|
}
|
|
}
|
|
|
|
func TestRouterConfig(t *testing.T) {
|
|
createParser := func() func(string) (proto.Message, error) {
|
|
return func(s string) (proto.Message, error) {
|
|
config := new(RouterConfig)
|
|
if err := json.Unmarshal([]byte(s), config); err != nil {
|
|
return nil, err
|
|
}
|
|
return config.Build()
|
|
}
|
|
}
|
|
|
|
runMultiTestCase(t, []TestCase{
|
|
{
|
|
Input: `{
|
|
"strategy": "rules",
|
|
"settings": {
|
|
"domainStrategy": "AsIs",
|
|
"rules": [
|
|
{
|
|
"type": "field",
|
|
"domain": [
|
|
"baidu.com",
|
|
"qq.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",
|
|
},
|
|
},
|
|
{
|
|
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",
|
|
"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",
|
|
},
|
|
},
|
|
{
|
|
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",
|
|
"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",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|