Skip to content
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

Jump to bottom

fix: parse correctly some IPv6 CIDRs #9

Merged
merged 1 commit into from
Feb 8, 2022
Merged

fix: parse correctly some IPv6 CIDRs #9

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
6 changes: 3 additions & 3 deletions net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ func FormatCIDR(ip net.IP, network net.IPNet) string {
// AddressContainsPort checks to see if the supplied address contains both an address and a port.
// This will not catch every possible permutation, but it is a best-effort routine suitable for prechecking human-interactive parameters.
func AddressContainsPort(addr string) bool {
if !strings.Contains(addr, ":") {
if !strings.Contains(addr, ":") || strings.Contains(addr, "/") {
return false
}

pieces := strings.Split(addr, ":")

if ip := net.ParseIP(strings.Trim(addr, "[]")); ip != nil {
return false
}

pieces := strings.Split(addr, ":")

// Check to see if it parses as an IP _without_ the last (presumed) `:port`
trimmedAddr := strings.TrimSuffix(addr, ":"+pieces[len(pieces)-1])

Expand Down
12 changes: 11 additions & 1 deletion net_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ func TestAddressContainsPort(t *testing.T) {

assert.Equal(t, talosnet.AddressContainsPort("[2001:db8:3:4:5:6:7:1:bad]:64321"), false)
assert.Equal(t, talosnet.AddressContainsPort("2001:db8:0::2000"), false)
assert.Equal(t, talosnet.AddressContainsPort("fd00::169:254:2:53"), false)
assert.Equal(t, talosnet.AddressContainsPort("[fd00::169:254:2:53]"), false)
assert.Equal(t, talosnet.AddressContainsPort("::1"), false)
assert.Equal(t, talosnet.AddressContainsPort("127.0.0.1"), false)
assert.Equal(t, talosnet.AddressContainsPort("node0"), false)
Expand Down Expand Up @@ -181,11 +183,19 @@ func TestParseCIDR(t *testing.T) {
IP: net.ParseIP("2001:db8:abef::ffff"),
Mask: net.CIDRMask(32, 128),
},
"[fd00::169:254:2:53]/128": {
IP: net.ParseIP("fd00::169:254:2:53"),
Mask: net.CIDRMask(128, 128),
},
"fd00::169:254:2:53/128": {
IP: net.ParseIP("fd00::169:254:2:53"),
Mask: net.CIDRMask(128, 128),
},
}

for in, expected := range goodTests {
parsedIP, err := talosnet.ParseCIDR(in)
assert.Nil(t, err, "error should be nil")
require.Nil(t, err, "error should be nil")
assert.True(t, parsedIP.IP.Equal(expected.IP), "IP addresses should be equal")
assert.Equal(t, expected.Mask.String(), parsedIP.Mask.String(), "Network masks should be equal")
}
Expand Down