diff --git a/CHANGELOG.md b/CHANGELOG.md index 917afd4..6fc0e59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for Tailscale TS2021 protocol [#738](https://github.com/juanfont/headscale/pull/738) - Add ability to specify config location via env var `HEADSCALE_CONFIG` [#674](https://github.com/juanfont/headscale/issues/674) - Target Go 1.19 for Headscale [#778](https://github.com/juanfont/headscale/pull/778) +- Target Tailscale v1.30.0 to build Headscale [#780](https://github.com/juanfont/headscale/pull/780) ## 0.16.4 (2022-08-21) diff --git a/acls.go b/acls.go index 62cd04a..0b365c1 100644 --- a/acls.go +++ b/acls.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "io" + "net/netip" "os" "path/filepath" "strconv" @@ -13,7 +14,6 @@ import ( "github.com/rs/zerolog/log" "github.com/tailscale/hujson" "gopkg.in/yaml.v3" - "inet.af/netaddr" "tailscale.com/tailcfg" ) @@ -394,13 +394,13 @@ func expandAlias( } // if alias is an IP - ip, err := netaddr.ParseIP(alias) + ip, err := netip.ParseAddr(alias) if err == nil { return []string{ip.String()}, nil } // if alias is an CIDR - cidr, err := netaddr.ParseIPPrefix(alias) + cidr, err := netip.ParsePrefix(alias) if err == nil { return []string{cidr.String()}, nil } diff --git a/acls_test.go b/acls_test.go index fe2217c..db04ee3 100644 --- a/acls_test.go +++ b/acls_test.go @@ -2,11 +2,11 @@ package headscale import ( "errors" + "net/netip" "reflect" "testing" "gopkg.in/check.v1" - "inet.af/netaddr" "tailscale.com/tailcfg" ) @@ -131,7 +131,7 @@ func (s *Suite) TestValidExpandTagOwnersInSources(c *check.C) { NodeKey: "bar", DiscoKey: "faa", Hostname: "testmachine", - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, NamespaceID: namespace.ID, RegisterMethod: RegisterMethodAuthKey, AuthKeyID: uint(pak.ID), @@ -181,7 +181,7 @@ func (s *Suite) TestValidExpandTagOwnersInDestinations(c *check.C) { NodeKey: "bar", DiscoKey: "faa", Hostname: "testmachine", - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, NamespaceID: namespace.ID, RegisterMethod: RegisterMethodAuthKey, AuthKeyID: uint(pak.ID), @@ -231,7 +231,7 @@ func (s *Suite) TestInvalidTagValidNamespace(c *check.C) { NodeKey: "bar", DiscoKey: "faa", Hostname: "testmachine", - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, NamespaceID: namespace.ID, RegisterMethod: RegisterMethodAuthKey, AuthKeyID: uint(pak.ID), @@ -280,7 +280,7 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) { NodeKey: "bar", DiscoKey: "faa", Hostname: "webserver", - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, NamespaceID: namespace.ID, RegisterMethod: RegisterMethodAuthKey, AuthKeyID: uint(pak.ID), @@ -299,7 +299,7 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) { NodeKey: "bar2", DiscoKey: "faab", Hostname: "user", - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, NamespaceID: namespace.ID, RegisterMethod: RegisterMethodAuthKey, AuthKeyID: uint(pak.ID), @@ -844,10 +844,10 @@ func Test_expandAlias(t *testing.T) { args: args{ alias: "*", machines: []Machine{ - {IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}}, + {IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}}, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.78.84.227"), + netip.MustParseAddr("100.78.84.227"), }, }, }, @@ -864,25 +864,25 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -902,25 +902,25 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -951,7 +951,7 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{}, aclPolicy: ACLPolicy{ Hosts: Hosts{ - "homeNetwork": netaddr.MustParseIPPrefix("192.168.1.0/24"), + "homeNetwork": netip.MustParsePrefix("192.168.1.0/24"), }, }, stripEmailDomain: true, @@ -988,7 +988,7 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -999,7 +999,7 @@ func Test_expandAlias(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1010,13 +1010,13 @@ func Test_expandAlias(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1036,25 +1036,25 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -1077,27 +1077,27 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, ForcedTags: []string{"tag:hr-webserver"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, ForcedTags: []string{"tag:hr-webserver"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -1115,14 +1115,14 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, ForcedTags: []string{"tag:hr-webserver"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1133,13 +1133,13 @@ func Test_expandAlias(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -1161,7 +1161,7 @@ func Test_expandAlias(t *testing.T) { machines: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1172,7 +1172,7 @@ func Test_expandAlias(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1183,13 +1183,13 @@ func Test_expandAlias(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "marc"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1245,7 +1245,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { nodes: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1256,7 +1256,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1267,7 +1267,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1277,7 +1277,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, want: []Machine{ { - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.4")}, Namespace: Namespace{Name: "joe"}, }, }, @@ -1296,7 +1296,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { nodes: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1307,7 +1307,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1318,7 +1318,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1328,7 +1328,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, want: []Machine{ { - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.4")}, Namespace: Namespace{Name: "joe"}, }, }, @@ -1342,7 +1342,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { nodes: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1353,14 +1353,14 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, ForcedTags: []string{"tag:accountant-webserver"}, }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1370,7 +1370,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, want: []Machine{ { - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.4")}, Namespace: Namespace{Name: "joe"}, }, }, @@ -1384,7 +1384,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { nodes: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1395,7 +1395,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1406,7 +1406,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, @@ -1417,7 +1417,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { want: []Machine{ { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1428,7 +1428,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "joe"}, HostInfo: HostInfo{ @@ -1439,7 +1439,7 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) { }, { IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.4"), + netip.MustParseAddr("100.64.0.4"), }, Namespace: Namespace{Name: "joe"}, }, diff --git a/acls_types.go b/acls_types.go index 0f73d6f..04c6630 100644 --- a/acls_types.go +++ b/acls_types.go @@ -2,11 +2,11 @@ package headscale import ( "encoding/json" + "net/netip" "strings" "github.com/tailscale/hujson" "gopkg.in/yaml.v3" - "inet.af/netaddr" ) // ACLPolicy represents a Tailscale ACL Policy. @@ -30,7 +30,7 @@ type ACL struct { type Groups map[string][]string // Hosts are alias for IP addresses or subnets. -type Hosts map[string]netaddr.IPPrefix +type Hosts map[string]netip.Prefix // TagOwners specify what users (namespaces?) are allow to use certain tags. type TagOwners map[string][]string @@ -42,7 +42,7 @@ type ACLTest struct { Deny []string `json:"deny,omitempty" yaml:"deny,omitempty"` } -// UnmarshalJSON allows to parse the Hosts directly into netaddr objects. +// UnmarshalJSON allows to parse the Hosts directly into netip objects. func (hosts *Hosts) UnmarshalJSON(data []byte) error { newHosts := Hosts{} hostIPPrefixMap := make(map[string]string) @@ -60,7 +60,7 @@ func (hosts *Hosts) UnmarshalJSON(data []byte) error { if !strings.Contains(prefixStr, "/") { prefixStr += "/32" } - prefix, err := netaddr.ParseIPPrefix(prefixStr) + prefix, err := netip.ParsePrefix(prefixStr) if err != nil { return err } @@ -71,7 +71,7 @@ func (hosts *Hosts) UnmarshalJSON(data []byte) error { return nil } -// UnmarshalYAML allows to parse the Hosts directly into netaddr objects. +// UnmarshalYAML allows to parse the Hosts directly into netip objects. func (hosts *Hosts) UnmarshalYAML(data []byte) error { newHosts := Hosts{} hostIPPrefixMap := make(map[string]string) @@ -81,7 +81,7 @@ func (hosts *Hosts) UnmarshalYAML(data []byte) error { return err } for host, prefixStr := range hostIPPrefixMap { - prefix, err := netaddr.ParseIPPrefix(prefixStr) + prefix, err := netip.ParsePrefix(prefixStr) if err != nil { return err } diff --git a/app_test.go b/app_test.go index d8fd14f..c2ebe4a 100644 --- a/app_test.go +++ b/app_test.go @@ -1,11 +1,11 @@ package headscale import ( + "net/netip" "os" "testing" "gopkg.in/check.v1" - "inet.af/netaddr" ) func Test(t *testing.T) { @@ -39,8 +39,8 @@ func (s *Suite) ResetDB(c *check.C) { c.Fatal(err) } cfg := Config{ - IPPrefixes: []netaddr.IPPrefix{ - netaddr.MustParseIPPrefix("10.27.0.0/23"), + IPPrefixes: []netip.Prefix{ + netip.MustParsePrefix("10.27.0.0/23"), }, } diff --git a/cmd/headscale/cli/nodes.go b/cmd/headscale/cli/nodes.go index a4f2a69..375f274 100644 --- a/cmd/headscale/cli/nodes.go +++ b/cmd/headscale/cli/nodes.go @@ -3,6 +3,7 @@ package cli import ( "fmt" "log" + "net/netip" "strconv" "strings" "time" @@ -13,7 +14,6 @@ import ( "github.com/pterm/pterm" "github.com/spf13/cobra" "google.golang.org/grpc/status" - "inet.af/netaddr" "tailscale.com/types/key" ) @@ -557,7 +557,7 @@ func nodesToPtables( var IPV4Address string var IPV6Address string for _, addr := range machine.IpAddresses { - if netaddr.MustParseIP(addr).Is4() { + if netip.MustParseAddr(addr).Is4() { IPV4Address = addr } else { IPV6Address = addr diff --git a/config.go b/config.go index 0024731..678b575 100644 --- a/config.go +++ b/config.go @@ -9,11 +9,13 @@ import ( "strings" "time" + "net/netip" + "github.com/coreos/go-oidc/v3/oidc" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/spf13/viper" - "inet.af/netaddr" + "go4.org/netipx" "tailscale.com/tailcfg" "tailscale.com/types/dnstype" ) @@ -32,7 +34,7 @@ type Config struct { GRPCAllowInsecure bool EphemeralNodeInactivityTimeout time.Duration NodeUpdateCheckInterval time.Duration - IPPrefixes []netaddr.IPPrefix + IPPrefixes []netip.Prefix PrivateKeyPath string NoisePrivateKeyPath string BaseDomain string @@ -340,11 +342,11 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) { if viper.IsSet("dns_config.nameservers") { nameserversStr := viper.GetStringSlice("dns_config.nameservers") - nameservers := make([]netaddr.IP, len(nameserversStr)) + nameservers := make([]netip.Addr, len(nameserversStr)) resolvers := make([]*dnstype.Resolver, len(nameserversStr)) for index, nameserverStr := range nameserversStr { - nameserver, err := netaddr.ParseIP(nameserverStr) + nameserver, err := netip.ParseAddr(nameserverStr) if err != nil { log.Error(). Str("func", "getDNSConfig"). @@ -374,7 +376,7 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) { len(restrictedNameservers), ) for index, nameserverStr := range restrictedNameservers { - nameserver, err := netaddr.ParseIP(nameserverStr) + nameserver, err := netip.ParseAddr(nameserverStr) if err != nil { log.Error(). Str("func", "getDNSConfig"). @@ -427,7 +429,7 @@ func GetHeadscaleConfig() (*Config, error) { randomizeClientPort := viper.GetBool("randomize_client_port") configuredPrefixes := viper.GetStringSlice("ip_prefixes") - parsedPrefixes := make([]netaddr.IPPrefix, 0, len(configuredPrefixes)+1) + parsedPrefixes := make([]netip.Prefix, 0, len(configuredPrefixes)+1) logLevelStr := viper.GetString("log_level") logLevel, err := zerolog.ParseLevel(logLevelStr) @@ -444,7 +446,7 @@ func GetHeadscaleConfig() (*Config, error) { "use of 'ip_prefix' for configuration is deprecated", "please see 'ip_prefixes' in the shipped example.", ) - legacyPrefix, err := netaddr.ParseIPPrefix(legacyPrefixField) + legacyPrefix, err := netip.ParsePrefix(legacyPrefixField) if err != nil { panic(fmt.Errorf("failed to parse ip_prefix: %w", err)) } @@ -452,19 +454,19 @@ func GetHeadscaleConfig() (*Config, error) { } for i, prefixInConfig := range configuredPrefixes { - prefix, err := netaddr.ParseIPPrefix(prefixInConfig) + prefix, err := netip.ParsePrefix(prefixInConfig) if err != nil { panic(fmt.Errorf("failed to parse ip_prefixes[%d]: %w", i, err)) } parsedPrefixes = append(parsedPrefixes, prefix) } - prefixes := make([]netaddr.IPPrefix, 0, len(parsedPrefixes)) + prefixes := make([]netip.Prefix, 0, len(parsedPrefixes)) { // dedup normalizedPrefixes := make(map[string]int, len(parsedPrefixes)) for i, p := range parsedPrefixes { - normalized, _ := p.Range().Prefix() + normalized, _ := netipx.RangeOfPrefix(p).Prefix() normalizedPrefixes[normalized.String()] = i } @@ -475,7 +477,7 @@ func GetHeadscaleConfig() (*Config, error) { } if len(prefixes) < 1 { - prefixes = append(prefixes, netaddr.MustParseIPPrefix("100.64.0.0/10")) + prefixes = append(prefixes, netip.MustParsePrefix("100.64.0.0/10")) log.Warn(). Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes) } diff --git a/db.go b/db.go index f0a0a59..17df384 100644 --- a/db.go +++ b/db.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "net/netip" "time" "github.com/glebarez/sqlite" @@ -13,7 +14,6 @@ import ( "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/logger" - "inet.af/netaddr" "tailscale.com/tailcfg" ) @@ -259,7 +259,7 @@ func (hi HostInfo) Value() (driver.Value, error) { return string(bytes), err } -type IPPrefixes []netaddr.IPPrefix +type IPPrefixes []netip.Prefix func (i *IPPrefixes) Scan(destination interface{}) error { switch value := destination.(type) { diff --git a/derp_server.go b/derp_server.go index 098ca53..dbdbc7a 100644 --- a/derp_server.go +++ b/derp_server.go @@ -6,6 +6,7 @@ import ( "fmt" "net" "net/http" + "net/netip" "net/url" "strconv" "strings" @@ -163,7 +164,7 @@ func (h *Headscale) DERPHandler( pubKeyStr) } - h.DERPServer.tailscaleDERP.Accept(netConn, conn, netConn.RemoteAddr().String()) + h.DERPServer.tailscaleDERP.Accept(req.Context(), netConn, conn, netConn.RemoteAddr().String()) } // DERPProbeHandler is the endpoint that js/wasm clients hit to measure @@ -276,7 +277,8 @@ func serverSTUNListener(ctx context.Context, packetConn *net.UDPConn) { continue } - res := stun.Response(txid, udpAddr.IP, uint16(udpAddr.Port)) + addr, _ := netip.AddrFromSlice(udpAddr.IP) + res := stun.Response(txid, netip.AddrPortFrom(addr, uint16(udpAddr.Port))) _, err = packetConn.WriteTo(res, udpAddr) if err != nil { log.Trace().Caller().Err(err).Msgf("Issue writing to UDP") diff --git a/dns.go b/dns.go index be7c87c..8f1e88d 100644 --- a/dns.go +++ b/dns.go @@ -2,10 +2,11 @@ package headscale import ( "fmt" + "net/netip" "strings" mapset "github.com/deckarep/golang-set/v2" - "inet.af/netaddr" + "go4.org/netipx" "tailscale.com/tailcfg" "tailscale.com/util/dnsname" ) @@ -39,11 +40,11 @@ const ( // From the netmask we can find out the wildcard bits (the bits that are not set in the netmask). // This allows us to then calculate the subnets included in the subsequent class block and generate the entries. -func generateMagicDNSRootDomains(ipPrefixes []netaddr.IPPrefix) []dnsname.FQDN { +func generateMagicDNSRootDomains(ipPrefixes []netip.Prefix) []dnsname.FQDN { fqdns := make([]dnsname.FQDN, 0, len(ipPrefixes)) for _, ipPrefix := range ipPrefixes { - var generateDNSRoot func(netaddr.IPPrefix) []dnsname.FQDN - switch ipPrefix.IP().BitLen() { + var generateDNSRoot func(netip.Prefix) []dnsname.FQDN + switch ipPrefix.Addr().BitLen() { case ipv4AddressLength: generateDNSRoot = generateIPv4DNSRootDomain @@ -54,7 +55,7 @@ func generateMagicDNSRootDomains(ipPrefixes []netaddr.IPPrefix) []dnsname.FQDN { panic( fmt.Sprintf( "unsupported IP version with address length %d", - ipPrefix.IP().BitLen(), + ipPrefix.Addr().BitLen(), ), ) } @@ -65,9 +66,9 @@ func generateMagicDNSRootDomains(ipPrefixes []netaddr.IPPrefix) []dnsname.FQDN { return fqdns } -func generateIPv4DNSRootDomain(ipPrefix netaddr.IPPrefix) []dnsname.FQDN { +func generateIPv4DNSRootDomain(ipPrefix netip.Prefix) []dnsname.FQDN { // Conversion to the std lib net.IPnet, a bit easier to operate - netRange := ipPrefix.IPNet() + netRange := netipx.PrefixIPNet(ipPrefix) maskBits, _ := netRange.Mask.Size() // lastOctet is the last IP byte covered by the mask @@ -101,11 +102,11 @@ func generateIPv4DNSRootDomain(ipPrefix netaddr.IPPrefix) []dnsname.FQDN { return fqdns } -func generateIPv6DNSRootDomain(ipPrefix netaddr.IPPrefix) []dnsname.FQDN { +func generateIPv6DNSRootDomain(ipPrefix netip.Prefix) []dnsname.FQDN { const nibbleLen = 4 - maskBits, _ := ipPrefix.IPNet().Mask.Size() - expanded := ipPrefix.IP().StringExpanded() + maskBits, _ := netipx.PrefixIPNet(ipPrefix).Mask.Size() + expanded := ipPrefix.Addr().StringExpanded() nibbleStr := strings.Map(func(r rune) rune { if r == ':' { return -1 diff --git a/dns_test.go b/dns_test.go index a2bb9ae..60312ed 100644 --- a/dns_test.go +++ b/dns_test.go @@ -2,16 +2,16 @@ package headscale import ( "fmt" + "net/netip" "gopkg.in/check.v1" - "inet.af/netaddr" "tailscale.com/tailcfg" "tailscale.com/types/dnstype" ) func (s *Suite) TestMagicDNSRootDomains100(c *check.C) { - prefixes := []netaddr.IPPrefix{ - netaddr.MustParseIPPrefix("100.64.0.0/10"), + prefixes := []netip.Prefix{ + netip.MustParsePrefix("100.64.0.0/10"), } domains := generateMagicDNSRootDomains(prefixes) @@ -47,8 +47,8 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) { } func (s *Suite) TestMagicDNSRootDomains172(c *check.C) { - prefixes := []netaddr.IPPrefix{ - netaddr.MustParseIPPrefix("172.16.0.0/16"), + prefixes := []netip.Prefix{ + netip.MustParsePrefix("172.16.0.0/16"), } domains := generateMagicDNSRootDomains(prefixes) @@ -75,8 +75,8 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) { // Happens when netmask is a multiple of 4 bits (sounds likely). func (s *Suite) TestMagicDNSRootDomainsIPv6Single(c *check.C) { - prefixes := []netaddr.IPPrefix{ - netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48"), + prefixes := []netip.Prefix{ + netip.MustParsePrefix("fd7a:115c:a1e0::/48"), } domains := generateMagicDNSRootDomains(prefixes) @@ -89,8 +89,8 @@ func (s *Suite) TestMagicDNSRootDomainsIPv6Single(c *check.C) { } func (s *Suite) TestMagicDNSRootDomainsIPv6SingleMultiple(c *check.C) { - prefixes := []netaddr.IPPrefix{ - netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/50"), + prefixes := []netip.Prefix{ + netip.MustParsePrefix("fd7a:115c:a1e0::/50"), } domains := generateMagicDNSRootDomains(prefixes) @@ -165,7 +165,7 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.1")}, AuthKeyID: uint(preAuthKeyInShared1.ID), } app.db.Save(machineInShared1) @@ -182,7 +182,7 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) { NamespaceID: namespaceShared2.ID, Namespace: *namespaceShared2, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.2")}, AuthKeyID: uint(preAuthKeyInShared2.ID), } app.db.Save(machineInShared2) @@ -199,7 +199,7 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) { NamespaceID: namespaceShared3.ID, Namespace: *namespaceShared3, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.3")}, AuthKeyID: uint(preAuthKeyInShared3.ID), } app.db.Save(machineInShared3) @@ -216,7 +216,7 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.4")}, AuthKeyID: uint(PreAuthKey2InShared1.ID), } app.db.Save(machine2InShared1) @@ -308,7 +308,7 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.1")}, AuthKeyID: uint(preAuthKeyInShared1.ID), } app.db.Save(machineInShared1) @@ -325,7 +325,7 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) { NamespaceID: namespaceShared2.ID, Namespace: *namespaceShared2, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.2")}, AuthKeyID: uint(preAuthKeyInShared2.ID), } app.db.Save(machineInShared2) @@ -342,7 +342,7 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) { NamespaceID: namespaceShared3.ID, Namespace: *namespaceShared3, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.3")}, AuthKeyID: uint(preAuthKeyInShared3.ID), } app.db.Save(machineInShared3) @@ -359,7 +359,7 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.4")}, AuthKeyID: uint(preAuthKey2InShared1.ID), } app.db.Save(machine2InShared1) diff --git a/flake.nix b/flake.nix index ccfd8bc..7a6b679 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ # When updating go.mod or go.sum, a new sha will need to be calculated, # update this if you have a mismatch after doing a change to thos files. - vendorSha256 = "sha256-paDdPsi5OfxsmgX7c5NSDSLYDipFqxxcxV3K4Tc77nQ="; + vendorSha256 = "sha256-67pckq7tkpbVay+BivvqLM6yBuK5IBd9h1p7xOR4VuM="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; }; diff --git a/go.mod b/go.mod index 1afc819..477bec2 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 github.com/klauspost/compress v1.15.9 + github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282 github.com/ory/dockertest/v3 v3.9.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/philip-bui/grpc-zerolog v1.0.1 @@ -27,6 +28,7 @@ require ( github.com/stretchr/testify v1.8.0 github.com/tailscale/hujson v0.0.0-20220630195928-54599719472f github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e + go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 @@ -39,13 +41,13 @@ require ( gopkg.in/yaml.v3 v3.0.1 gorm.io/driver/postgres v1.3.8 gorm.io/gorm v1.23.8 - inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.28.0 + tailscale.com v1.30.0 ) require ( atomicgo.dev/cursor v0.1.1 // indirect atomicgo.dev/keyboard v0.2.8 // indirect + filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect @@ -62,8 +64,10 @@ require ( github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fxamacker/cbor/v2 v2.4.0 // indirect github.com/glebarez/go-sqlite v1.17.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.8 // indirect @@ -74,6 +78,7 @@ require ( github.com/gookit/color v1.5.0 // indirect github.com/hashicorp/go-version v1.4.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect @@ -121,21 +126,20 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.3.0 // indirect + github.com/x448/float16 v0.8.4 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect - golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect golang.zx2c4.com/wireguard/windows v0.4.10 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/ini.v1 v1.66.4 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect modernc.org/libc v1.16.8 // indirect modernc.org/mathutil v1.4.1 // indirect modernc.org/memory v1.1.1 // indirect diff --git a/go.sum b/go.sum index 6870e45..fc74e80 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= +filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= filippo.io/mkcert v1.4.3 h1:axpnmtrZMM8u5Hf4N3UXxboGemMOV+Tn+e+pkHM6E3o= github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ= github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI= @@ -207,7 +209,6 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/efekarakus/termcolor v1.0.1 h1:YAKFO3bnLrqZGTWyNLcYoSIAQFKVOmbqmDnwsU/znzg= github.com/efekarakus/termcolor v1.0.1/go.mod h1:AitrZNrE4nPO538fRsqf+p0WgLdAsGN5pUNrHEPsEMM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -236,6 +237,8 @@ github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= +github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= +github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -304,6 +307,8 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -478,6 +483,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= +github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -725,6 +732,8 @@ github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62 github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282 h1:TQMyrpijtkFyXpNI3rY5hsZQZw+paiH+BfAlsb81HBY= +github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282/go.mod h1:rW25Kyd08Wdn3UVn0YBsDTSvReu0jqpmJKzxITPSjks= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= @@ -964,6 +973,8 @@ github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7Fw github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -1016,12 +1027,11 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= go4.org/mem v0.0.0-20210711025021-927187094b94 h1:OAAkygi2Js191AJP1Ds42MhJRgeofeKGjuoUqNp1QC4= go4.org/mem v0.0.0-20210711025021-927187094b94/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= +go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf h1:IdwJUzqoIo5lkr2EOyKoe5qipUaEjbOKKY5+fzPBZ3A= +go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf/go.mod h1:+QXzaoURFd0rGDIjDNpyIkv+F9R7EmeKorvlKRnhqgA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1044,6 +1054,7 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1056,8 +1067,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 h1:FR+oGxGfbQu1d+jglI3rCkjAjUnhRSZcUxr+DqlDLNo= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= golang.org/x/exp/typeparams v0.0.0-20220328175248-053ad81199eb h1:fP6C8Xutcp5AlakmT/SkQot0pMicROAsEX7OfNPuG10= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1140,6 +1151,7 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= @@ -1276,8 +1288,8 @@ golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= -golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1585,8 +1597,9 @@ gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= +gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -1621,8 +1634,6 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= honnef.co/go/tools v0.4.0-0.dev.0.20220404092545-59d7a2877f83 h1:lZ9GIYaU+o5+X6ST702I/Ntyq9Y2oIMZ42rBQpem64A= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= -inet.af/netaddr v0.0.0-20220617031823-097006376321 h1:B4dC8ySKTQXasnjDTMsoCMf1sQG4WsMej0WXaHxunmU= -inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= @@ -1660,5 +1671,5 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 h1:SqYE5+A2qvRhErbsXFfUEUmpWEKxxRSMgGLkvRAFOV4= -tailscale.com v1.28.0 h1:eW5bJMqw6eu7YUjBcgJY94uIcm5Zv+xpyTxxa7ztZOM= -tailscale.com v1.28.0/go.mod h1:T9uKhlkxVPdSu1Qvp882evcS/hQ1+TAyZ7sJ/VACGRI= +tailscale.com v1.30.0 h1:J8k19aVG5z2W7FhpjkJyZ53HKb0tiNR1icvWly36Pvg= +tailscale.com v1.30.0/go.mod h1:MO+tWkQp2YIF3KBnnej/mQvgYccRS5Xk/IrEpZ4Z3BU= diff --git a/integration_common_test.go b/integration_common_test.go index 027eeff..fb5abb1 100644 --- a/integration_common_test.go +++ b/integration_common_test.go @@ -7,6 +7,7 @@ import ( "encoding/json" "errors" "fmt" + "net/netip" "os" "strconv" "strings" @@ -15,7 +16,6 @@ import ( v1 "github.com/juanfont/headscale/gen/go/headscale/v1" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" - "inet.af/netaddr" ) const ( @@ -26,8 +26,8 @@ const ( var ( errEnvVarEmpty = errors.New("getenv: environment variable empty") - IpPrefix4 = netaddr.MustParseIPPrefix("100.64.0.0/10") - IpPrefix6 = netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48") + IpPrefix4 = netip.MustParsePrefix("100.64.0.0/10") + IpPrefix6 = netip.MustParsePrefix("fd7a:115c:a1e0::/48") tailscaleVersions = []string{ // "head", @@ -195,8 +195,8 @@ func getDockerBuildOptions(version string) *dockertest.BuildOptions { func getIPs( tailscales map[string]dockertest.Resource, -) (map[string][]netaddr.IP, error) { - ips := make(map[string][]netaddr.IP) +) (map[string][]netip.Addr, error) { + ips := make(map[string][]netip.Addr) for hostname, tailscale := range tailscales { command := []string{"tailscale", "ip"} @@ -214,7 +214,7 @@ func getIPs( if len(address) < 1 { continue } - ip, err := netaddr.ParseIP(address) + ip, err := netip.ParseAddr(address) if err != nil { return nil, err } diff --git a/integration_general_test.go b/integration_general_test.go index 9f2ca3e..66652d7 100644 --- a/integration_general_test.go +++ b/integration_general_test.go @@ -10,6 +10,7 @@ import ( "fmt" "log" "net/http" + "net/netip" "os" "path" "strings" @@ -22,7 +23,6 @@ import ( "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "inet.af/netaddr" "tailscale.com/client/tailscale/apitype" "tailscale.com/ipn/ipnstate" ) @@ -477,8 +477,8 @@ func (s *IntegrationTestSuite) TestGetIpAddresses() { // } // } -func getIPsfromIPNstate(status ipnstate.Status) []netaddr.IP { - ips := make([]netaddr.IP, 0) +func getIPsfromIPNstate(status ipnstate.Status) []netip.Addr { + ips := make([]netip.Addr, 0) for _, peer := range status.Peer { ips = append(ips, peer.TailscaleIPs...) @@ -563,14 +563,14 @@ func (s *IntegrationTestSuite) TestTailDrop() { continue } - var ip4 netaddr.IP + var ip4 netip.Addr for _, ip := range ips[peername] { if ip.Is4() { ip4 = ip break } } - if ip4.IsZero() { + if ip4.IsUnspecified() { panic("no ipv4 address found") } @@ -748,8 +748,8 @@ func (s *IntegrationTestSuite) TestMagicDNS() { func getAPIURLs( tailscales map[string]dockertest.Resource, -) (map[netaddr.IP]string, error) { - fts := make(map[netaddr.IP]string) +) (map[netip.Addr]string, error) { + fts := make(map[netip.Addr]string) for _, tailscale := range tailscales { command := []string{ "curl", @@ -773,11 +773,11 @@ func getAPIURLs( for _, ft := range pft { n := ft.Node for _, a := range n.Addresses { // just add all the addresses - if _, ok := fts[a.IP()]; !ok { + if _, ok := fts[a.Addr()]; !ok { if ft.PeerAPIURL == "" { return nil, errors.New("api url is empty") } - fts[a.IP()] = ft.PeerAPIURL + fts[a.Addr()] = ft.PeerAPIURL } } } diff --git a/machine.go b/machine.go index 4399029..9fe450a 100644 --- a/machine.go +++ b/machine.go @@ -4,6 +4,7 @@ import ( "database/sql/driver" "errors" "fmt" + "net/netip" "sort" "strconv" "strings" @@ -12,7 +13,6 @@ import ( v1 "github.com/juanfont/headscale/gen/go/headscale/v1" "github.com/rs/zerolog/log" "google.golang.org/protobuf/types/known/timestamppb" - "inet.af/netaddr" "tailscale.com/tailcfg" "tailscale.com/types/key" ) @@ -83,7 +83,7 @@ type ( MachinesP []*Machine ) -type MachineAddresses []netaddr.IP +type MachineAddresses []netip.Addr func (ma MachineAddresses) ToStringSlice() []string { strSlice := make([]string, 0, len(ma)) @@ -103,7 +103,7 @@ func (ma *MachineAddresses) Scan(destination interface{}) error { if len(addr) < 1 { continue } - parsed, err := netaddr.ParseIP(addr) + parsed, err := netip.ParseAddr(addr) if err != nil { return err } @@ -623,14 +623,14 @@ func (machine Machine) toNode( discoKey = key.DiscoPublic{} } - addrs := []netaddr.IPPrefix{} + addrs := []netip.Prefix{} for _, machineAddress := range machine.IPAddresses { - ip := netaddr.IPPrefixFrom(machineAddress, machineAddress.BitLen()) + ip := netip.PrefixFrom(machineAddress, machineAddress.BitLen()) addrs = append(addrs, ip) } allowedIPs := append( - []netaddr.IPPrefix{}, + []netip.Prefix{}, addrs...) // we append the node own IP, as it is required by the clients // TODO(kradalby): Needs investigation, We probably dont need this condition @@ -873,16 +873,16 @@ func (h *Headscale) RegisterMachine(machine Machine, return &machine, nil } -func (machine *Machine) GetAdvertisedRoutes() []netaddr.IPPrefix { +func (machine *Machine) GetAdvertisedRoutes() []netip.Prefix { return machine.HostInfo.RoutableIPs } -func (machine *Machine) GetEnabledRoutes() []netaddr.IPPrefix { +func (machine *Machine) GetEnabledRoutes() []netip.Prefix { return machine.EnabledRoutes } func (machine *Machine) IsRoutesEnabled(routeStr string) bool { - route, err := netaddr.ParseIPPrefix(routeStr) + route, err := netip.ParsePrefix(routeStr) if err != nil { return false } @@ -901,9 +901,9 @@ func (machine *Machine) IsRoutesEnabled(routeStr string) bool { // EnableNodeRoute enables new routes based on a list of new routes. It will _replace_ the // previous list of routes. func (h *Headscale) EnableRoutes(machine *Machine, routeStrs ...string) error { - newRoutes := make([]netaddr.IPPrefix, len(routeStrs)) + newRoutes := make([]netip.Prefix, len(routeStrs)) for index, routeStr := range routeStrs { - route, err := netaddr.ParseIPPrefix(routeStr) + route, err := netip.ParsePrefix(routeStr) if err != nil { return err } diff --git a/machine_test.go b/machine_test.go index 5da0906..cadd0df 100644 --- a/machine_test.go +++ b/machine_test.go @@ -2,6 +2,7 @@ package headscale import ( "fmt" + "net/netip" "reflect" "strconv" "strings" @@ -9,7 +10,6 @@ import ( "time" "gopkg.in/check.v1" - "inet.af/netaddr" "tailscale.com/tailcfg" "tailscale.com/types/key" ) @@ -229,7 +229,7 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) { NodeKey: "bar" + strconv.Itoa(index), DiscoKey: "faa" + strconv.Itoa(index), IPAddresses: MachineAddresses{ - netaddr.MustParseIP(fmt.Sprintf("100.64.0.%v", strconv.Itoa(index+1))), + netip.MustParseAddr(fmt.Sprintf("100.64.0.%v", strconv.Itoa(index+1))), }, Hostname: "testmachine" + strconv.Itoa(index), NamespaceID: stor[index%2].namespace.ID, @@ -243,7 +243,7 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) { Groups: map[string][]string{ "group:test": {"admin"}, }, - Hosts: map[string]netaddr.IPPrefix{}, + Hosts: map[string]netip.Prefix{}, TagOwners: map[string][]string{}, ACLs: []ACL{ { @@ -326,9 +326,9 @@ func (s *Suite) TestExpireMachine(c *check.C) { } func (s *Suite) TestSerdeAddressStrignSlice(c *check.C) { - input := MachineAddresses([]netaddr.IP{ - netaddr.MustParseIP("192.0.2.1"), - netaddr.MustParseIP("2001:db8::1"), + input := MachineAddresses([]netip.Addr{ + netip.MustParseAddr("192.0.2.1"), + netip.MustParseAddr("2001:db8::1"), }) serialized, err := input.Value() c.Assert(err, check.IsNil) @@ -559,21 +559,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -588,19 +588,19 @@ func Test_getFilteredByACLPeers(t *testing.T) { }, machine: &Machine{ // current machine ID: 1, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, Namespace: Namespace{Name: "joe"}, }, }, want: Machines{ { ID: 2, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, Namespace: Namespace{Name: "marc"}, }, { ID: 3, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.3")}, Namespace: Namespace{Name: "mickael"}, }, }, @@ -612,21 +612,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -641,14 +641,14 @@ func Test_getFilteredByACLPeers(t *testing.T) { }, machine: &Machine{ // current machine ID: 1, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.1")}, Namespace: Namespace{Name: "joe"}, }, }, want: Machines{ { ID: 2, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, Namespace: Namespace{Name: "marc"}, }, }, @@ -660,21 +660,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -689,14 +689,14 @@ func Test_getFilteredByACLPeers(t *testing.T) { }, machine: &Machine{ // current machine ID: 2, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, Namespace: Namespace{Name: "marc"}, }, }, want: Machines{ { ID: 3, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.3")}, Namespace: Namespace{Name: "mickael"}, }, }, @@ -708,21 +708,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -738,7 +738,7 @@ func Test_getFilteredByACLPeers(t *testing.T) { machine: &Machine{ // current machine ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, @@ -747,7 +747,7 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, @@ -760,21 +760,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -790,7 +790,7 @@ func Test_getFilteredByACLPeers(t *testing.T) { machine: &Machine{ // current machine ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, @@ -799,14 +799,14 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -819,21 +819,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -848,7 +848,7 @@ func Test_getFilteredByACLPeers(t *testing.T) { }, machine: &Machine{ // current machine ID: 2, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, Namespace: Namespace{Name: "marc"}, }, }, @@ -856,13 +856,13 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 3, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.3")}, Namespace: Namespace{Name: "mickael"}, }, }, @@ -874,21 +874,21 @@ func Test_getFilteredByACLPeers(t *testing.T) { { ID: 1, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.1"), + netip.MustParseAddr("100.64.0.1"), }, Namespace: Namespace{Name: "joe"}, }, { ID: 2, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.2"), + netip.MustParseAddr("100.64.0.2"), }, Namespace: Namespace{Name: "marc"}, }, { ID: 3, IPAddresses: MachineAddresses{ - netaddr.MustParseIP("100.64.0.3"), + netip.MustParseAddr("100.64.0.3"), }, Namespace: Namespace{Name: "mickael"}, }, @@ -897,7 +897,7 @@ func Test_getFilteredByACLPeers(t *testing.T) { }, machine: &Machine{ // current machine ID: 2, - IPAddresses: MachineAddresses{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: MachineAddresses{netip.MustParseAddr("100.64.0.2")}, Namespace: Namespace{Name: "marc"}, }, }, diff --git a/namespaces_test.go b/namespaces_test.go index 6f33585..42b8de4 100644 --- a/namespaces_test.go +++ b/namespaces_test.go @@ -1,11 +1,11 @@ package headscale import ( + "net/netip" "testing" "gopkg.in/check.v1" "gorm.io/gorm" - "inet.af/netaddr" ) func (s *Suite) TestCreateAndDestroyNamespace(c *check.C) { @@ -146,7 +146,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.1")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.1")}, AuthKeyID: uint(preAuthKeyShared1.ID), } app.db.Save(machineInShared1) @@ -163,7 +163,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) { NamespaceID: namespaceShared2.ID, Namespace: *namespaceShared2, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.2")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.2")}, AuthKeyID: uint(preAuthKeyShared2.ID), } app.db.Save(machineInShared2) @@ -180,7 +180,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) { NamespaceID: namespaceShared3.ID, Namespace: *namespaceShared3, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.3")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.3")}, AuthKeyID: uint(preAuthKeyShared3.ID), } app.db.Save(machineInShared3) @@ -197,7 +197,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) { NamespaceID: namespaceShared1.ID, Namespace: *namespaceShared1, RegisterMethod: RegisterMethodAuthKey, - IPAddresses: []netaddr.IP{netaddr.MustParseIP("100.64.0.4")}, + IPAddresses: []netip.Addr{netip.MustParseAddr("100.64.0.4")}, AuthKeyID: uint(preAuthKey2Shared1.ID), } app.db.Save(machine2InShared1) diff --git a/routes.go b/routes.go index 23217ca..676c79b 100644 --- a/routes.go +++ b/routes.go @@ -2,8 +2,7 @@ package headscale import ( "fmt" - - "inet.af/netaddr" + "net/netip" ) const ( @@ -16,7 +15,7 @@ const ( func (h *Headscale) GetAdvertisedNodeRoutes( namespace string, nodeName string, -) (*[]netaddr.IPPrefix, error) { +) (*[]netip.Prefix, error) { machine, err := h.GetMachine(namespace, nodeName) if err != nil { return nil, err @@ -31,7 +30,7 @@ func (h *Headscale) GetAdvertisedNodeRoutes( func (h *Headscale) GetEnabledNodeRoutes( namespace string, nodeName string, -) ([]netaddr.IPPrefix, error) { +) ([]netip.Prefix, error) { machine, err := h.GetMachine(namespace, nodeName) if err != nil { return nil, err @@ -47,7 +46,7 @@ func (h *Headscale) IsNodeRouteEnabled( nodeName string, routeStr string, ) bool { - route, err := netaddr.ParseIPPrefix(routeStr) + route, err := netip.ParsePrefix(routeStr) if err != nil { return false } @@ -79,7 +78,7 @@ func (h *Headscale) EnableNodeRoute( return err } - route, err := netaddr.ParseIPPrefix(routeStr) + route, err := netip.ParsePrefix(routeStr) if err != nil { return err } diff --git a/routes_test.go b/routes_test.go index 89b712b..f1ae388 100644 --- a/routes_test.go +++ b/routes_test.go @@ -1,8 +1,9 @@ package headscale import ( + "net/netip" + "gopkg.in/check.v1" - "inet.af/netaddr" "tailscale.com/tailcfg" ) @@ -16,11 +17,11 @@ func (s *Suite) TestGetRoutes(c *check.C) { _, err = app.GetMachine("test", "test_get_route_machine") c.Assert(err, check.NotNil) - route, err := netaddr.ParseIPPrefix("10.0.0.0/24") + route, err := netip.ParsePrefix("10.0.0.0/24") c.Assert(err, check.IsNil) hostInfo := tailcfg.Hostinfo{ - RoutableIPs: []netaddr.IPPrefix{route}, + RoutableIPs: []netip.Prefix{route}, } machine := Machine{ @@ -60,18 +61,18 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) { _, err = app.GetMachine("test", "test_enable_route_machine") c.Assert(err, check.NotNil) - route, err := netaddr.ParseIPPrefix( + route, err := netip.ParsePrefix( "10.0.0.0/24", ) c.Assert(err, check.IsNil) - route2, err := netaddr.ParseIPPrefix( + route2, err := netip.ParsePrefix( "150.0.10.0/25", ) c.Assert(err, check.IsNil) hostInfo := tailcfg.Hostinfo{ - RoutableIPs: []netaddr.IPPrefix{route, route2}, + RoutableIPs: []netip.Prefix{route, route2}, } machine := Machine{ diff --git a/utils.go b/utils.go index e7fb13a..666683c 100644 --- a/utils.go +++ b/utils.go @@ -13,6 +13,7 @@ import ( "fmt" "io/fs" "net" + "net/netip" "os" "path/filepath" "reflect" @@ -21,7 +22,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/viper" - "inet.af/netaddr" + "go4.org/netipx" "tailscale.com/tailcfg" "tailscale.com/types/key" ) @@ -140,7 +141,7 @@ func (h *Headscale) getAvailableIPs() (MachineAddresses, error) { var err error ipPrefixes := h.cfg.IPPrefixes for _, ipPrefix := range ipPrefixes { - var ip *netaddr.IP + var ip *netip.Addr ip, err = h.getAvailableIP(ipPrefix) if err != nil { return ips, err @@ -151,16 +152,16 @@ func (h *Headscale) getAvailableIPs() (MachineAddresses, error) { return ips, err } -func GetIPPrefixEndpoints(na netaddr.IPPrefix) (netaddr.IP, netaddr.IP) { - var network, broadcast netaddr.IP - ipRange := na.Range() +func GetIPPrefixEndpoints(na netip.Prefix) (netip.Addr, netip.Addr) { + var network, broadcast netip.Addr + ipRange := netipx.RangeOfPrefix(na) network = ipRange.From() broadcast = ipRange.To() return network, broadcast } -func (h *Headscale) getAvailableIP(ipPrefix netaddr.IPPrefix) (*netaddr.IP, error) { +func (h *Headscale) getAvailableIP(ipPrefix netip.Prefix) (*netip.Addr, error) { usedIps, err := h.getUsedIPs() if err != nil { return nil, err @@ -181,7 +182,7 @@ func (h *Headscale) getAvailableIP(ipPrefix netaddr.IPPrefix) (*netaddr.IP, erro fallthrough case usedIps.Contains(ip): fallthrough - case ip.IsZero() || ip.IsLoopback(): + case ip == netip.Addr{} || ip.IsLoopback(): ip = ip.Next() continue @@ -192,19 +193,19 @@ func (h *Headscale) getAvailableIP(ipPrefix netaddr.IPPrefix) (*netaddr.IP, erro } } -func (h *Headscale) getUsedIPs() (*netaddr.IPSet, error) { +func (h *Headscale) getUsedIPs() (*netipx.IPSet, error) { // FIXME: This really deserves a better data model, // but this was quick to get running and it should be enough // to begin experimenting with a dual stack tailnet. var addressesSlices []string h.db.Model(&Machine{}).Pluck("ip_addresses", &addressesSlices) - var ips netaddr.IPSetBuilder + var ips netipx.IPSetBuilder for _, slice := range addressesSlices { var machineAddresses MachineAddresses err := machineAddresses.Scan(slice) if err != nil { - return &netaddr.IPSet{}, fmt.Errorf( + return &netipx.IPSet{}, fmt.Errorf( "failed to read ip from database: %w", err, ) @@ -217,7 +218,7 @@ func (h *Headscale) getUsedIPs() (*netaddr.IPSet, error) { ipSet, err := ips.IPSet() if err != nil { - return &netaddr.IPSet{}, fmt.Errorf( + return &netipx.IPSet{}, fmt.Errorf( "failed to build IP Set: %w", err, ) @@ -250,7 +251,7 @@ func GrpcSocketDialer(ctx context.Context, addr string) (net.Conn, error) { return d.DialContext(ctx, "unix", addr) } -func ipPrefixToString(prefixes []netaddr.IPPrefix) []string { +func ipPrefixToString(prefixes []netip.Prefix) []string { result := make([]string, len(prefixes)) for index, prefix := range prefixes { @@ -260,13 +261,13 @@ func ipPrefixToString(prefixes []netaddr.IPPrefix) []string { return result } -func stringToIPPrefix(prefixes []string) ([]netaddr.IPPrefix, error) { - result := make([]netaddr.IPPrefix, len(prefixes)) +func stringToIPPrefix(prefixes []string) ([]netip.Prefix, error) { + result := make([]netip.Prefix, len(prefixes)) for index, prefixStr := range prefixes { - prefix, err := netaddr.ParseIPPrefix(prefixStr) + prefix, err := netip.ParsePrefix(prefixStr) if err != nil { - return []netaddr.IPPrefix{}, err + return []netip.Prefix{}, err } result[index] = prefix @@ -275,7 +276,7 @@ func stringToIPPrefix(prefixes []string) ([]netaddr.IPPrefix, error) { return result, nil } -func contains[T string | netaddr.IPPrefix](ts []T, t T) bool { +func contains[T string | netip.Prefix](ts []T, t T) bool { for _, v := range ts { if reflect.DeepEqual(v, t) { return true diff --git a/utils_test.go b/utils_test.go index 07fa62d..5e9710c 100644 --- a/utils_test.go +++ b/utils_test.go @@ -1,8 +1,10 @@ package headscale import ( + "net/netip" + + "go4.org/netipx" "gopkg.in/check.v1" - "inet.af/netaddr" ) func (s *Suite) TestGetAvailableIp(c *check.C) { @@ -10,7 +12,7 @@ func (s *Suite) TestGetAvailableIp(c *check.C) { c.Assert(err, check.IsNil) - expected := netaddr.MustParseIP("10.27.0.1") + expected := netip.MustParseAddr("10.27.0.1") c.Assert(len(ips), check.Equals, 1) c.Assert(ips[0].String(), check.Equals, expected.String()) @@ -46,8 +48,8 @@ func (s *Suite) TestGetUsedIps(c *check.C) { c.Assert(err, check.IsNil) - expected := netaddr.MustParseIP("10.27.0.1") - expectedIPSetBuilder := netaddr.IPSetBuilder{} + expected := netip.MustParseAddr("10.27.0.1") + expectedIPSetBuilder := netipx.IPSetBuilder{} expectedIPSetBuilder.Add(expected) expectedIPSet, _ := expectedIPSetBuilder.IPSet() @@ -96,11 +98,11 @@ func (s *Suite) TestGetMultiIp(c *check.C) { usedIps, err := app.getUsedIPs() c.Assert(err, check.IsNil) - expected0 := netaddr.MustParseIP("10.27.0.1") - expected9 := netaddr.MustParseIP("10.27.0.10") - expected300 := netaddr.MustParseIP("10.27.0.45") + expected0 := netip.MustParseAddr("10.27.0.1") + expected9 := netip.MustParseAddr("10.27.0.10") + expected300 := netip.MustParseAddr("10.27.0.45") - notExpectedIPSetBuilder := netaddr.IPSetBuilder{} + notExpectedIPSetBuilder := netipx.IPSetBuilder{} notExpectedIPSetBuilder.Add(expected0) notExpectedIPSetBuilder.Add(expected9) notExpectedIPSetBuilder.Add(expected300) @@ -121,7 +123,7 @@ func (s *Suite) TestGetMultiIp(c *check.C) { c.Assert( machine1.IPAddresses[0], check.Equals, - netaddr.MustParseIP("10.27.0.1"), + netip.MustParseAddr("10.27.0.1"), ) machine50, err := app.GetMachineByID(50) @@ -130,10 +132,10 @@ func (s *Suite) TestGetMultiIp(c *check.C) { c.Assert( machine50.IPAddresses[0], check.Equals, - netaddr.MustParseIP("10.27.0.50"), + netip.MustParseAddr("10.27.0.50"), ) - expectedNextIP := netaddr.MustParseIP("10.27.1.95") + expectedNextIP := netip.MustParseAddr("10.27.1.95") nextIP, err := app.getAvailableIPs() c.Assert(err, check.IsNil) @@ -153,7 +155,7 @@ func (s *Suite) TestGetAvailableIpMachineWithoutIP(c *check.C) { ips, err := app.getAvailableIPs() c.Assert(err, check.IsNil) - expected := netaddr.MustParseIP("10.27.0.1") + expected := netip.MustParseAddr("10.27.0.1") c.Assert(len(ips), check.Equals, 1) c.Assert(ips[0].String(), check.Equals, expected.String())