Skip to content

Allow IPv6 compat addresses when parsing TCPv6 in V1 header #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emersion wants to merge 1 commit into from
Closed

Allow IPv6 compat addresses when parsing TCPv6 in V1 header #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions header_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,22 @@ import (
// Stuff to be used in both versions tests.

const (
NO_PROTOCOL = "There is no spoon"
IP4_ADDR = "127.0.0.1"
IP6_ADDR = "::1"
PORT = 65533
INVALID_PORT = 99999
NO_PROTOCOL = "There is no spoon"
IP4_ADDR = "127.0.0.1"
IP6_ADDR = "::1"
IP6_COMPAT_ADDR = "0:0:0:0:0:ffff:7f00:1"
PORT = 65533
INVALID_PORT = 99999
)

var (
v4ip = net.ParseIP(IP4_ADDR).To4()
v6ip = net.ParseIP(IP6_ADDR).To16()
v4ip = net.ParseIP(IP4_ADDR).To4()
v6ip = net.ParseIP(IP6_ADDR).To16()
v6CompatIP = net.ParseIP(IP4_ADDR).To16()

v4addr net.Addr = &net.TCPAddr{IP: v4ip, Port: PORT}
v6addr net.Addr = &net.TCPAddr{IP: v6ip, Port: PORT}
v4addr net.Addr = &net.TCPAddr{IP: v4ip, Port: PORT}
v6addr net.Addr = &net.TCPAddr{IP: v6ip, Port: PORT}
v6CompatAddr net.Addr = &net.TCPAddr{IP: v6CompatIP, Port: PORT}

v4UDPAddr net.Addr = &net.UDPAddr{IP: v4ip, Port: PORT}
v6UDPAddr net.Addr = &net.UDPAddr{IP: v6ip, Port: PORT}
Expand Down
17 changes: 11 additions & 6 deletions v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,16 @@ func parseV1PortNumber(portStr string) (int, error) {
return port, nil
}

func parseV1IPAddress(protocol AddressFamilyAndProtocol, addrStr string) (addr net.IP, err error) {
addr = net.ParseIP(addrStr)
tryV4 := addr.To4()
if (protocol == TCPv4 && tryV4 == nil) || (protocol == TCPv6 && tryV4 != nil) {
err = ErrInvalidAddress
func parseV1IPAddress(protocol AddressFamilyAndProtocol, addrStr string) (net.IP, error) {
ip := net.ParseIP(addrStr)
switch protocol {
case TCPv4:
ip = ip.To4()
case TCPv6:
ip = ip.To16()
}
return
if ip == nil {
return nil, ErrInvalidAddress
}
return ip, nil
}
18 changes: 15 additions & 3 deletions v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ var (
TCP4AddressesAndPorts = strings.Join([]string{IP4_ADDR, IP4_ADDR, strconv.Itoa(PORT), strconv.Itoa(PORT)}, separator)
TCP4AddressesAndInvalidPorts = strings.Join([]string{IP4_ADDR, IP4_ADDR, strconv.Itoa(INVALID_PORT), strconv.Itoa(INVALID_PORT)}, separator)
TCP6AddressesAndPorts = strings.Join([]string{IP6_ADDR, IP6_ADDR, strconv.Itoa(PORT), strconv.Itoa(PORT)}, separator)
TCP6CompatAddressesAndPorts = strings.Join([]string{IP6_COMPAT_ADDR, IP6_ADDR, strconv.Itoa(PORT), strconv.Itoa(PORT)}, separator)

fixtureTCP4V1 = "PROXY TCP4 " + TCP4AddressesAndPorts + crlf + "GET /"
fixtureTCP6V1 = "PROXY TCP6 " + TCP6AddressesAndPorts + crlf + "GET /"
fixtureTCP4V1 = "PROXY TCP4 " + TCP4AddressesAndPorts + crlf + "GET /"
fixtureTCP6V1 = "PROXY TCP6 " + TCP6AddressesAndPorts + crlf + "GET /"
fixtureTCP6CompatV1 = "PROXY TCP6 " + TCP6CompatAddressesAndPorts + crlf + "GET /"
)

var invalidParseV1Tests = []struct {
Expand Down Expand Up @@ -54,7 +56,7 @@ var invalidParseV1Tests = []struct {
func TestReadV1Invalid(t *testing.T) {
for _, tt := range invalidParseV1Tests {
if _, err := Read(tt.reader); err != tt.expectedError {
t.Fatalf("TestReadV1Invalid: expected %s, actual %s", tt.expectedError, err.Error())
t.Fatalf("TestReadV1Invalid: expected %s, actual %s", tt.expectedError, err)
}
}
}
Expand Down Expand Up @@ -83,6 +85,16 @@ var validParseAndWriteV1Tests = []struct {
DestinationAddr: v6addr,
},
},
{
bufio.NewReader(strings.NewReader(fixtureTCP6CompatV1)),
&Header{
Version: 1,
Command: PROXY,
TransportProtocol: TCPv6,
SourceAddr: v6CompatAddr,
DestinationAddr: v6addr,
},
},
}

func TestParseV1Valid(t *testing.T) {
Expand Down