black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 01:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vless tests

Browse source
This commit is contained in:
世界 2023-03-02 00:31:56 +08:00
parent 6e22c004f6
commit e8802357e1
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/go.mod
View file

@ -10,7 +10,7 @@ require (
github.com/docker/docker v20.10.18+incompatible github.com/docker/docker v20.10.18+incompatible
github.com/docker/go-connections v0.4.0 github.com/docker/go-connections v0.4.0
github.com/gofrs/uuid v4.4.0+incompatible github.com/gofrs/uuid v4.4.0+incompatible
github.com/sagernet/sing v0.1.8-0.20230228034829-bb617490652c github.com/sagernet/sing v0.1.8-0.20230301160041-9fab0a9f4304
github.com/sagernet/sing-shadowsocks v0.1.2-0.20230221080503-769c01d6bba9 github.com/sagernet/sing-shadowsocks v0.1.2-0.20230221080503-769c01d6bba9
github.com/spyzhov/ajson v0.7.1 github.com/spyzhov/ajson v0.7.1
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1

4
test/go.sum
View file

@ -146,8 +146,8 @@ github.com/sagernet/reality v0.0.0-20230228045158-d3e085a8e5d1 h1:8mSzchN6DkM26J
github.com/sagernet/reality v0.0.0-20230228045158-d3e085a8e5d1/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/reality v0.0.0-20230228045158-d3e085a8e5d1/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
github.com/sagernet/sing v0.0.0-20220812082120-05f9836bff8f/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= github.com/sagernet/sing v0.0.0-20220812082120-05f9836bff8f/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
github.com/sagernet/sing v0.1.8-0.20230228034829-bb617490652c h1:+YUwfoIkKlMi3Y1QrOy+OlIELC9KWV0+/5F3NX72q8U= github.com/sagernet/sing v0.1.8-0.20230301160041-9fab0a9f4304 h1:Yi7wqvHv+ZFLHPQn1DiSAdnMZkb5Cra7Y4s8vzBLrFE=
github.com/sagernet/sing v0.1.8-0.20230228034829-bb617490652c/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk= github.com/sagernet/sing v0.1.8-0.20230301160041-9fab0a9f4304/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
github.com/sagernet/sing-dns v0.1.4 h1:7VxgeoSCiiazDSaXXQVcvrTBxFpOePPq/4XdgnUDN+0= github.com/sagernet/sing-dns v0.1.4 h1:7VxgeoSCiiazDSaXXQVcvrTBxFpOePPq/4XdgnUDN+0=
github.com/sagernet/sing-dns v0.1.4/go.mod h1:1+6pCa48B1AI78lD+/i/dLgpw4MwfnsSpZo0Ds8wzzk= github.com/sagernet/sing-dns v0.1.4/go.mod h1:1+6pCa48B1AI78lD+/i/dLgpw4MwfnsSpZo0Ds8wzzk=
github.com/sagernet/sing-shadowsocks v0.1.2-0.20230221080503-769c01d6bba9 h1:qS39eA4C7x+zhEkySbASrtmb6ebdy5v0y2M6mgkmSO0= github.com/sagernet/sing-shadowsocks v0.1.2-0.20230221080503-769c01d6bba9 h1:qS39eA4C7x+zhEkySbASrtmb6ebdy5v0y2M6mgkmSO0=

1
test/reality_test.go
View file

@ -36,6 +36,7 @@ func TestVLESSVisionReality(t *testing.T) {
{ {
Name: "sekai", Name: "sekai",
UUID: userUUID.String(), UUID: userUUID.String(),
Flow: vless.FlowVision,
}, },
}, },
TLS: &option.InboundTLSOptions{ TLS: &option.InboundTLSOptions{

2
test/vless_test.go
View file

@ -234,6 +234,7 @@ func testVLESSSelf(t *testing.T, flow string) {
{ {
Name: "sekai", Name: "sekai",
UUID: userUUID.String(), UUID: userUUID.String(),
Flow: flow,
}, },
}, },
TLS: &option.InboundTLSOptions{ TLS: &option.InboundTLSOptions{
@ -308,6 +309,7 @@ func testVLESSSelfTLS(t *testing.T, flow string) {
{ {
Name: "sekai", Name: "sekai",
UUID: userUUID.String(), UUID: userUUID.String(),
Flow: flow,
}, },
}, },
TLS: &option.InboundTLSOptions{ TLS: &option.InboundTLSOptions{

9
transport/vless/service.go
View file

@ -69,7 +69,7 @@ func (s *Service[T]) NewConnection(ctx context.Context, conn net.Conn, metadata
userFlow := s.userFlow[user] userFlow := s.userFlow[user]
if request.Flow != userFlow { if request.Flow != userFlow {
return E.New("flow mismatch: expected ", userFlow, ", but got ", request.Flow) return E.New("flow mismatch: expected ", flowName(userFlow), ", but got ", flowName(request.Flow))
} }
protocolConn := conn protocolConn := conn
@ -94,6 +94,13 @@ func (s *Service[T]) NewConnection(ctx context.Context, conn net.Conn, metadata
} }
} }
func flowName(value string) string {
if value == "" {
return "none"
}
return value
}
type serverConn struct { type serverConn struct {
net.Conn net.Conn
responseWriter io.Writer responseWriter io.Writer