diff --git a/adapter/outbound/snell.go b/adapter/outbound/snell.go index 679a4622..7452d0cd 100644 --- a/adapter/outbound/snell.go +++ b/adapter/outbound/snell.go @@ -93,7 +93,7 @@ func (s *Snell) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C. } if metadata.NetWork == C.UDP { - err = snell.WriteUDPHeaderWithClientID(c, s.version, s.userKey) + err = snell.WriteUDPHeader(c, s.version, s.userKey) if err == nil && s.version >= snell.Version4 { if sc, ok := c.(*snell.Snell); ok { err = sc.ReadReply() @@ -101,7 +101,7 @@ func (s *Snell) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C. } return } - err = snell.WriteHeaderWithReuseAndClientID(c, metadata.String(), uint(metadata.DstPort), s.version, s.reuse, s.userKey) + err = snell.WriteHeader(c, metadata.String(), metadata.DstPort, s.version, s.reuse, s.userKey) return } diff --git a/transport/snell/snell.go b/transport/snell/snell.go index dd06cc40..8a601ede 100644 --- a/transport/snell/snell.go +++ b/transport/snell/snell.go @@ -100,15 +100,7 @@ func (s *Snell) ReadReply() error { return fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) } -func WriteHeader(conn net.Conn, host string, port uint, version int) error { - return WriteHeaderWithReuse(conn, host, port, version, false) -} - -func WriteHeaderWithReuse(conn net.Conn, host string, port uint, version int, reuse bool) error { - return WriteHeaderWithReuseAndClientID(conn, host, port, version, reuse, nil) -} - -func WriteHeaderWithReuseAndClientID(conn net.Conn, host string, port uint, version int, reuse bool, clientID []byte) error { +func WriteHeader(conn net.Conn, host string, port uint16, version int, reuse bool, clientID []byte) error { if len(clientID) > MaxClientIDLength { return errors.New("snell client ID too long") } @@ -140,11 +132,7 @@ func WriteHeaderWithReuseAndClientID(conn net.Conn, host string, port uint, vers return nil } -func WriteUDPHeader(conn net.Conn, version int) error { - return WriteUDPHeaderWithClientID(conn, version, nil) -} - -func WriteUDPHeaderWithClientID(conn net.Conn, version int, clientID []byte) error { +func WriteUDPHeader(conn net.Conn, version int, clientID []byte) error { if version < Version3 { return errors.New("unsupport UDP version") } diff --git a/transport/snell/v4_test.go b/transport/snell/v4_test.go index 6b1ecb1c..bc1220b0 100644 --- a/transport/snell/v4_test.go +++ b/transport/snell/v4_test.go @@ -301,7 +301,7 @@ func TestSnellWriteHeaderConnectCommand(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { conn := &bufferConn{} - if err := WriteHeaderWithReuse(conn, "example.com", 443, tt.version, tt.reuse); err != nil { + if err := WriteHeader(conn, "example.com", 443, tt.version, tt.reuse, nil); err != nil { t.Fatal(err) } data := conn.Bytes() @@ -315,55 +315,17 @@ func TestSnellWriteHeaderConnectCommand(t *testing.T) { } } -func TestSnellV6ClientIDHeaders(t *testing.T) { - clientID := []byte("alice-key") - - for _, tt := range []struct { - name string - reuse bool - cmd byte - }{ - {name: "connect", cmd: CommandConnect}, - {name: "reuse", reuse: true, cmd: CommandConnectV2}, - } { - t.Run(tt.name, func(t *testing.T) { - conn := &bufferConn{} - if err := WriteHeaderWithReuseAndClientID(conn, "example.com", 443, Version6, tt.reuse, clientID); err != nil { - t.Fatal(err) - } - - want := []byte{Version, tt.cmd, byte(len(clientID))} - want = append(want, clientID...) - want = append(want, byte(len("example.com"))) - want = append(want, "example.com"...) - want = append(want, 0x01, 0xbb) - if !bytes.Equal(conn.Bytes(), want) { - t.Fatalf("TCP header = %x, want %x", conn.Bytes(), want) - } - }) - } - - udpConn := &bufferConn{} - if err := WriteUDPHeaderWithClientID(udpConn, Version6, clientID); err != nil { - t.Fatal(err) - } - wantUDP := append([]byte{Version, CommandUDP, byte(len(clientID))}, clientID...) - if !bytes.Equal(udpConn.Bytes(), wantUDP) { - t.Fatalf("UDP header = %x, want %x", udpConn.Bytes(), wantUDP) - } -} - func TestSnellClientIDValidation(t *testing.T) { maxID := bytes.Repeat([]byte{'k'}, MaxClientIDLength) tcpConn := &bufferConn{} - if err := WriteHeaderWithReuseAndClientID(tcpConn, "example.com", 443, Version6, false, maxID); err != nil { + if err := WriteHeader(tcpConn, "example.com", 443, Version6, false, maxID); err != nil { t.Fatalf("TCP header rejected a %d-byte client ID: %v", MaxClientIDLength, err) } if got := tcpConn.Bytes()[2]; got != 0xff { t.Fatalf("TCP client ID length = %d, want 255", got) } udpConn := &bufferConn{} - if err := WriteUDPHeaderWithClientID(udpConn, Version6, maxID); err != nil { + if err := WriteUDPHeader(udpConn, Version6, maxID); err != nil { t.Fatalf("UDP header rejected a %d-byte client ID: %v", MaxClientIDLength, err) } if got := udpConn.Bytes()[2]; got != 0xff { @@ -371,25 +333,25 @@ func TestSnellClientIDValidation(t *testing.T) { } oversizedID := make([]byte, 256) - if err := WriteHeaderWithReuseAndClientID(&bufferConn{}, "example.com", 443, Version6, false, oversizedID); err == nil { + if err := WriteHeader(&bufferConn{}, "example.com", 443, Version6, false, oversizedID); err == nil { t.Fatal("TCP header accepted a client ID longer than 255 bytes") } - if err := WriteUDPHeaderWithClientID(&bufferConn{}, Version6, oversizedID); err == nil { + if err := WriteUDPHeader(&bufferConn{}, Version6, oversizedID); err == nil { t.Fatal("UDP header accepted a client ID longer than 255 bytes") } clientID := []byte("alice-key") - if err := WriteHeaderWithReuseAndClientID(&bufferConn{}, "example.com", 443, Version4, false, clientID); err == nil { + if err := WriteHeader(&bufferConn{}, "example.com", 443, Version4, false, clientID); err == nil { t.Fatal("TCP header accepted a client ID for Snell v4") } - if err := WriteUDPHeaderWithClientID(&bufferConn{}, Version4, clientID); err == nil { + if err := WriteUDPHeader(&bufferConn{}, Version4, clientID); err == nil { t.Fatal("UDP header accepted a client ID for Snell v4") } } func TestSnellEmptyClientIDRemainsCompatible(t *testing.T) { tcpConn := &bufferConn{} - if err := WriteHeaderWithReuse(tcpConn, "example.com", 443, Version6, true); err != nil { + if err := WriteHeader(tcpConn, "example.com", 443, Version6, true, nil); err != nil { t.Fatal(err) } if got := tcpConn.Bytes()[2]; got != 0 { @@ -397,7 +359,7 @@ func TestSnellEmptyClientIDRemainsCompatible(t *testing.T) { } udpConn := &bufferConn{} - if err := WriteUDPHeader(udpConn, Version6); err != nil { + if err := WriteUDPHeader(udpConn, Version6, nil); err != nil { t.Fatal(err) } if want := []byte{Version, CommandUDP, 0}; !bytes.Equal(udpConn.Bytes(), want) { diff --git a/transport/snell/v6_test.go b/transport/snell/v6_test.go index 513168b0..1eb44b8a 100644 --- a/transport/snell/v6_test.go +++ b/transport/snell/v6_test.go @@ -202,3 +202,41 @@ func TestValidateV6PSK(t *testing.T) { require.Error(t, ValidateV6PSK(make([]byte, 256))) require.NoError(t, ValidateV6PSK([]byte(v6TestPSK))) } + +func TestSnellV6ClientIDHeaders(t *testing.T) { + clientID := []byte("alice-key") + + for _, tt := range []struct { + name string + reuse bool + cmd byte + }{ + {name: "connect", cmd: CommandConnect}, + {name: "reuse", reuse: true, cmd: CommandConnectV2}, + } { + t.Run(tt.name, func(t *testing.T) { + conn := &bufferConn{} + if err := WriteHeader(conn, "example.com", 443, Version6, tt.reuse, clientID); err != nil { + t.Fatal(err) + } + + want := []byte{Version, tt.cmd, byte(len(clientID))} + want = append(want, clientID...) + want = append(want, byte(len("example.com"))) + want = append(want, "example.com"...) + want = append(want, 0x01, 0xbb) + if !bytes.Equal(conn.Bytes(), want) { + t.Fatalf("TCP header = %x, want %x", conn.Bytes(), want) + } + }) + } + + udpConn := &bufferConn{} + if err := WriteUDPHeader(udpConn, Version6, clientID); err != nil { + t.Fatal(err) + } + wantUDP := append([]byte{Version, CommandUDP, byte(len(clientID))}, clientID...) + if !bytes.Equal(udpConn.Bytes(), wantUDP) { + t.Fatalf("UDP header = %x, want %x", udpConn.Bytes(), wantUDP) + } +}