Skip to content

cmd/tailcat: accept a bare IPv6 address in socks --listen #155

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

Open
RaphaelFakhri wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

cmd/tailcat: accept a bare IPv6 address in socks --listen #155

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
10 changes: 10 additions & 0 deletions cmd/tailcat/socks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@ func TestNormalizeListenAddrPort(t *testing.T) {
input: "[2001:db8::1]",
want: "[2001:db8::1]:0",
},
{
name: "omit port with unbracketed IPv6 address",
input: "::1",
want: "[::1]:0",
},
{
name: "omit port with unbracketed IPv6 unspecified address",
input: "::",
want: "[::]:0",
},
{
name: "others",
input: "foo",
Expand Down
6 changes: 5 additions & 1 deletion cmd/tailcat/tailcat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,8 +999,12 @@ func normalizeListenAddrPort(s string) string {
return net.JoinHostPort(host, port)
} else if port, err := strconv.ParseUint(s, 10, 16); err == nil {
return net.JoinHostPort("127.0.0.1", strconv.Itoa(int(port)))
} else if _, err := netip.ParseAddr(s); err == nil {
// A bare IP address. JoinHostPort brackets an IPv6 address
// such as "::1", which appending ":0" would leave ambiguous.
return net.JoinHostPort(s, "0")
}
// Assume it's a hostname or IP without a port.
// Assume it's a hostname without a port.
return s + ":0"
}

Expand Down