TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-19 05:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: don't crash on invalid filter CIDR from server

Browse Source 
Fixes #691
This commit is contained in:
Brad Fitzpatrick 2020-08-17 07:56:03 -07:00
parent e64ab89712
commit 337c86b89d
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
control/controlclient/filter.go
View File

@ -7,6 +7,7 @@ package controlclient
import ( import (
"fmt" "fmt"
"net" "net"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
) )
@ -26,6 +27,9 @@ func parseIP(host string, defaultBits int) (filter.Net, error) {
if ip == nil || len(ip) != 4 { if ip == nil || len(ip) != 4 {
return filter.NetNone, fmt.Errorf("ports=%#v: invalid IPv4 address", host) return filter.NetNone, fmt.Errorf("ports=%#v: invalid IPv4 address", host)
} }
if len(ip) == 4 && (defaultBits < 0 || defaultBits > 32) {
return filter.NetNone, fmt.Errorf("invalid CIDR size %d for host %q", defaultBits, host)
}
return filter.Net{ return filter.Net{
IP: filter.NewIP(ip), IP: filter.NewIP(ip),
Mask: filter.Netmask(defaultBits), Mask: filter.Netmask(defaultBits),

42
control/controlclient/filter_test.go Normal file
View File

@ -0,0 +1,42 @@
// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package controlclient
import (
"net"
"testing"
"tailscale.com/wgengine/filter"
"tailscale.com/wgengine/packet"
)
func TestParseIP(t *testing.T) {
tests := []struct {
host string
bits int
want filter.Net
wantErr string
}{
{"8.8.8.8", 24, filter.Net{IP: packet.NewIP(net.ParseIP("8.8.8.8")), Mask: packet.NewIP(net.ParseIP("255.255.255.0"))}, ""},
{"8.8.8.8", 33, filter.Net{}, `invalid CIDR size 33 for host "8.8.8.8"`},
{"8.8.8.8", -1, filter.Net{}, `invalid CIDR size -1 for host "8.8.8.8"`},
{"0.0.0.0", 24, filter.Net{}, `ports="0.0.0.0": to allow all IP addresses, use *:port, not 0.0.0.0:port`},
{"*", 24, filter.NetAny, ""},
{"fe80::1", 128, filter.NetNone, `ports="fe80::1": invalid IPv4 address`},
}
for _, tt := range tests {
got, err := parseIP(tt.host, tt.bits)
if err != nil {
if err.Error() == tt.wantErr {
continue
}
t.Errorf("parseIP(%q, %v) error: %v; want error %q", tt.host, tt.bits, err, tt.wantErr)
}
if got != tt.want {
t.Errorf("parseIP(%q, %v) = %#v; want %#v", tt.host, tt.bits, got, tt.want)
continue
}
}
}