From f37e37632ed64305d8bb78cf2ef126d01c6598af Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Sun, 28 Apr 2024 18:37:07 -0400
Subject: [PATCH] Add VLESS seed tests
---
proxy/proxy.go | 2 +-
proxy/scheduler.go | 4 +-
testing/scenarios/vless_test.go | 224 ++++++++++++++++++++++++++++++++
3 files changed, 227 insertions(+), 3 deletions(-)
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 07fd4857..101239fd 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -229,7 +229,7 @@ func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
switchToDirectCopy = &w.trafficState.Outbound.DownlinkReaderDirectCopy
}
- if *withinPaddingBuffers || !ShouldStopSeed(w.addons, w.trafficState) {
+ if *withinPaddingBuffers || w.trafficState.NumberOfPacketReceived <= 8 || !ShouldStopSeed(w.addons, w.trafficState) {
mb2 := make(buf.MultiBuffer, 0, len(buffer))
for _, b := range buffer {
newbuffer := XtlsUnpadding(b, w.trafficState, w.isUplink, w.ctx)
diff --git a/proxy/scheduler.go b/proxy/scheduler.go
index 52810c71..e4ad021a 100644
--- a/proxy/scheduler.go
+++ b/proxy/scheduler.go
@@ -49,8 +49,8 @@ func(s *Scheduler) mainLoop() {
if err != nil {
errors.LogWarningInner(s.ctx, err, "failed to generate delay", trigger)
}
- d = time.Duration(uint32(l.Int64()) + s.addons.Delay.MinMillis)
- time.Sleep(d * time.Millisecond)
+ d = time.Duration(uint32(l.Int64()) + s.addons.Delay.MinMillis) * time.Millisecond
+ time.Sleep(d)
}
s.bufferReadLock.Lock() // guard against multiple trigger threads
diff --git a/testing/scenarios/vless_test.go b/testing/scenarios/vless_test.go
index dcac17ea..9b8365ad 100644
--- a/testing/scenarios/vless_test.go
+++ b/testing/scenarios/vless_test.go
@@ -125,6 +125,104 @@ func TestVless(t *testing.T) {
}
}
+func TestVlessSeedWithIndependentScheduler(t *testing.T) {
+ tcpServer := tcp.Server{
+ MsgProcessor: xor,
+ }
+ dest, err := tcpServer.Start()
+ common.Must(err)
+ defer tcpServer.Close()
+
+ userID := protocol.NewID(uuid.New())
+ serverPort := tcp.PickPort()
+ serverConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ }),
+ ProxySettings: serial.ToTypedMessage(&inbound.Config{
+ Clients: []*protocol.User{
+ {
+ Account: serial.ToTypedMessage(&vless.Account{
+ Id: userID.String(),
+ Seed: "1",
+ }),
+ },
+ },
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&freedom.Config{}),
+ },
+ },
+ }
+
+ clientPort := tcp.PickPort()
+ clientConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(clientPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ }),
+ ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
+ Address: net.NewIPOrDomain(dest.Address),
+ Port: uint32(dest.Port),
+ Networks: []net.Network{net.Network_TCP},
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&outbound.Config{
+ Vnext: []*protocol.ServerEndpoint{
+ {
+ Address: net.NewIPOrDomain(net.LocalHostIP),
+ Port: uint32(serverPort),
+ User: []*protocol.User{
+ {
+ Account: serial.ToTypedMessage(&vless.Account{
+ Id: userID.String(),
+ Seed: "1",
+ }),
+ },
+ },
+ },
+ },
+ }),
+ },
+ },
+ }
+
+ servers, err := InitializeServerConfigs(serverConfig, clientConfig)
+ common.Must(err)
+ defer CloseAllServers(servers)
+
+ var errg errgroup.Group
+ for i := 0; i < 10; i++ {
+ errg.Go(testTCPConn(clientPort, 1024*1024, time.Second*30))
+ }
+ if err := errg.Wait(); err != nil {
+ t.Error(err)
+ }
+}
+
func TestVlessTls(t *testing.T) {
tcpServer := tcp.Server{
MsgProcessor: xor,
@@ -371,6 +469,132 @@ func TestVlessXtlsVision(t *testing.T) {
}
}
+func TestVlessXtlsVisionWithSeed(t *testing.T) {
+ tcpServer := tcp.Server{
+ MsgProcessor: xor,
+ }
+ dest, err := tcpServer.Start()
+ common.Must(err)
+ defer tcpServer.Close()
+
+ userID := protocol.NewID(uuid.New())
+ serverPort := tcp.PickPort()
+ serverConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ StreamSettings: &internet.StreamConfig{
+ ProtocolName: "tcp",
+ SecurityType: serial.GetMessageType(&tls.Config{}),
+ SecuritySettings: []*serial.TypedMessage{
+ serial.ToTypedMessage(&tls.Config{
+ Certificate: []*tls.Certificate{tls.ParseCertificate(cert.MustGenerate(nil))},
+ }),
+ },
+ },
+ }),
+ ProxySettings: serial.ToTypedMessage(&inbound.Config{
+ Clients: []*protocol.User{
+ {
+ Account: serial.ToTypedMessage(&vless.Account{
+ Id: userID.String(),
+ Flow: vless.XRV,
+ Seed: "1",
+ }),
+ },
+ },
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&freedom.Config{}),
+ },
+ },
+ }
+
+ clientPort := tcp.PickPort()
+ clientConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(clientPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ }),
+ ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
+ Address: net.NewIPOrDomain(dest.Address),
+ Port: uint32(dest.Port),
+ Networks: []net.Network{net.Network_TCP},
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&outbound.Config{
+ Vnext: []*protocol.ServerEndpoint{
+ {
+ Address: net.NewIPOrDomain(net.LocalHostIP),
+ Port: uint32(serverPort),
+ User: []*protocol.User{
+ {
+ Account: serial.ToTypedMessage(&vless.Account{
+ Id: userID.String(),
+ Flow: vless.XRV,
+ Seed: "1",
+ }),
+ },
+ },
+ },
+ },
+ }),
+ SenderSettings: serial.ToTypedMessage(&proxyman.SenderConfig{
+ StreamSettings: &internet.StreamConfig{
+ ProtocolName: "tcp",
+ TransportSettings: []*internet.TransportConfig{
+ {
+ ProtocolName: "tcp",
+ Settings: serial.ToTypedMessage(&transtcp.Config{}),
+ },
+ },
+ SecurityType: serial.GetMessageType(&tls.Config{}),
+ SecuritySettings: []*serial.TypedMessage{
+ serial.ToTypedMessage(&tls.Config{
+ AllowInsecure: true,
+ }),
+ },
+ },
+ }),
+ },
+ },
+ }
+
+ servers, err := InitializeServerConfigs(serverConfig, clientConfig)
+ common.Must(err)
+ defer CloseAllServers(servers)
+
+ var errg errgroup.Group
+ for i := 0; i < 10; i++ {
+ errg.Go(testTCPConn(clientPort, 1024*1024, time.Second*30))
+ }
+ if err := errg.Wait(); err != nil {
+ t.Error(err)
+ }
+}
+
func TestVlessXtlsVisionReality(t *testing.T) {
tcpServer := tcp.Server{
MsgProcessor: xor,