Config: Remove more legacy fields (#3817)

This commit is contained in:
Kobe Arthur Scofield
2024-09-19 09:05:59 +08:00
committed by GitHub
parent f406b2dee0
commit 57a41f3b4b
52 changed files with 569 additions and 1157 deletions

View File

@@ -305,9 +305,7 @@ func TestCommanderAddRemoveUser(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -462,9 +460,7 @@ func TestCommanderStats(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -486,9 +482,7 @@ func TestCommanderStats(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -31,18 +31,26 @@ func TestResolveIP(t *testing.T) {
serverConfig := &core.Config{
App: []*serial.TypedMessage{
serial.ToTypedMessage(&dns.Config{
Hosts: map[string]*net.IPOrDomain{
"google.com": net.NewIPOrDomain(dest.Address),
StaticHosts: []*dns.Config_HostMapping{
{
Type: dns.DomainMatchingType_Full,
Domain: "google.com",
Ip: [][]byte{dest.Address.IP()},
},
},
}),
serial.ToTypedMessage(&router.Config{
DomainStrategy: router.Config_IpIfNonMatch,
Rule: []*router.RoutingRule{
{
Cidr: []*router.CIDR{
Geoip: []*router.GeoIP{
{
Ip: []byte{127, 0, 0, 0},
Prefix: 8,
Cidr: []*router.CIDR{
{
Ip: []byte{127, 0, 0, 0},
Prefix: 8,
},
},
},
},
TargetTag: &router.RoutingRule_Tag{

View File

@@ -87,9 +87,7 @@ func TestDokodemoTCP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -185,9 +183,7 @@ func TestDokodemoUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},

View File

@@ -55,9 +55,7 @@ func TestPassiveConnection(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -165,9 +163,7 @@ func TestProxy(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -305,9 +301,7 @@ func TestProxyOverKCP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -394,9 +388,7 @@ func TestBlackhole(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -407,9 +399,7 @@ func TestBlackhole(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest2.Address),
Port: uint32(dest2.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -430,7 +420,9 @@ func TestBlackhole(t *testing.T) {
TargetTag: &router.RoutingRule_Tag{
Tag: "blocked",
},
PortRange: net.SinglePortRange(dest2.Port),
PortList: &net.PortList{
Range: []*net.PortRange{net.SinglePortRange(dest2.Port)},
},
},
},
}),
@@ -522,9 +514,7 @@ func TestUDPConnection(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -568,9 +558,7 @@ func TestDomainSniffing(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(net.LocalHostIP),
Port: 443,
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{

View File

@@ -112,9 +112,7 @@ func TestVMessClosing(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -218,9 +216,7 @@ func TestZeroBuffer(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -78,9 +78,7 @@ func TestReverseProxy(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -145,9 +143,7 @@ func TestReverseProxy(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -261,9 +257,7 @@ func TestReverseProxyLongRunning(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -342,9 +336,7 @@ func TestReverseProxyLongRunning(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -66,9 +66,7 @@ func TestSocksBridgeTCP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -147,9 +145,7 @@ func TestSocksWithHttpRequest(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -219,9 +215,7 @@ func TestSocksBridageUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -255,9 +249,7 @@ func TestSocksBridageUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -338,9 +330,7 @@ func TestSocksBridageUDPWithRouting(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -378,9 +368,7 @@ func TestSocksBridageUDPWithRouting(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},

View File

@@ -83,9 +83,7 @@ func TestSimpleTLSConnection(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -200,9 +198,7 @@ func TestAutoIssuingCertificate(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -307,9 +303,7 @@ func TestTLSOverKCP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -409,9 +403,7 @@ func TestTLSOverWebSocket(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -530,9 +522,7 @@ func TestHTTP2(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -651,9 +641,7 @@ func TestGRPC(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -769,9 +757,7 @@ func TestGRPCMultiMode(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -882,9 +868,7 @@ func TestSimpleTLSConnectionPinned(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -986,9 +970,7 @@ func TestSimpleTLSConnectionPinnedWrongCert(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1089,9 +1071,7 @@ func TestUTLSConnectionPinned(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1194,9 +1174,7 @@ func TestUTLSConnectionPinnedWrongCert(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -78,9 +78,7 @@ func TestHTTPConnectionHeader(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -87,9 +87,7 @@ func TestVless(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -194,9 +192,7 @@ func TestVlessTls(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -319,9 +315,7 @@ func TestVlessXtlsVision(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -455,9 +449,7 @@ func TestVlessXtlsVisionReality(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -73,9 +73,7 @@ func TestVMessDynamicPort(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -135,9 +133,7 @@ func TestVMessDynamicPort(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -229,9 +225,7 @@ func TestVMessGCM(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -333,9 +327,7 @@ func TestVMessGCMReadv(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -440,9 +432,7 @@ func TestVMessGCMUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -541,9 +531,7 @@ func TestVMessChacha20(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -643,9 +631,7 @@ func TestVMessNone(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -747,9 +733,7 @@ func TestVMessKCP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -875,9 +859,7 @@ func TestVMessKCPLarge(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1004,9 +986,7 @@ func TestVMessGCMMux(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1122,9 +1102,7 @@ func TestVMessGCMMuxUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -1135,9 +1113,7 @@ func TestVMessGCMMuxUDP(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(udpDest.Address),
Port: uint32(udpDest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_UDP},
},
Networks: []net.Network{net.Network_UDP},
}),
},
},
@@ -1250,9 +1226,7 @@ func TestVMessZero(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1351,9 +1325,7 @@ func TestVMessGCMLengthAuth(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -1457,9 +1429,7 @@ func TestVMessGCMLengthAuthPlusNoTerminationSignal(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},

View File

@@ -84,9 +84,7 @@ func TestWireguard(t *testing.T) {
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
}),
},
},