TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-21 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg: implement text encoding for ProtoPortRange

Browse Source 
Updates tailscale/corp#15043
Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker
2023-10-06 11:40:32 -07:00
committed by James Tucker
parent 96f01a73b1
commit 4abd470322
2 changed files with 82 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tailcfg/proto_port_range_test.go
View File

@@ -4,12 +4,15 @@
package tailcfg
import (
"errors"
"encoding"
"testing"
"tailscale.com/types/ipproto"
"tailscale.com/util/vizerror"
)
var _ encoding.TextUnmarshaler = (*ProtoPortRange)(nil)
func TestProtoPortRangeParsing(t *testing.T) {
pr := func(s, e uint16) PortRange {
return PortRange{First: s, Last: e}
@@ -26,30 +29,28 @@ func TestProtoPortRangeParsing(t *testing.T) {
{in: "tcp:*", out: ProtoPortRange{Proto: int(ipproto.TCP), Ports: PortRangeAny}},
{
in: "tcp:",
err: errors.New(`invalid port list: ""`),
err: vizerror.Errorf("invalid port list: %#v", ""),
},
{
in: ":80",
err: errors.New(`empty protocol`),
err: errEmptyProtocol,
},
{
in: "",
err: errors.New(`empty string`),
err: errEmptyString,
},
}
for _, tc := range tests {
t.Run(tc.in, func(t *testing.T) {
ppr, err := parseProtoPortRange(tc.in)
if gotErr, wantErr := err != nil, tc.err != nil; gotErr != wantErr {
t.Fatalf("got err %v; want %v", err, tc.err)
} else if gotErr {
if err.Error() != tc.err.Error() {
t.Fatalf("got err %q; want %q", err, tc.err)
var ppr ProtoPortRange
err := ppr.UnmarshalText([]byte(tc.in))
if tc.err != err {
if err == nil || tc.err.Error() != err.Error() {
t.Fatalf("want err=%v, got %v", tc.err, err)
}
return
}
if *ppr != tc.out {
if ppr != tc.out {
t.Fatalf("got %v; want %v", ppr, tc.out)
}
})
@@ -88,3 +89,43 @@ func TestProtoPortRangeString(t *testing.T) {
}
}
}
func TestProtoPortRangeRoundTrip(t *testing.T) {
tests := []struct {
input ProtoPortRange
text string
}{
{ProtoPortRange{Ports: PortRangeAny}, "*"},
{ProtoPortRange{Ports: PortRange{23, 23}}, "23"},
{ProtoPortRange{Ports: PortRange{80, 120}}, "80-120"},
{ProtoPortRange{Proto: 100, Ports: PortRange{80, 80}}, "100:80"},
{ProtoPortRange{Proto: 200, Ports: PortRange{101, 105}}, "200:101-105"},
{ProtoPortRange{Proto: 1, Ports: PortRangeAny}, "icmp:*"},
{ProtoPortRange{Proto: 2, Ports: PortRangeAny}, "igmp:*"},
{ProtoPortRange{Proto: 6, Ports: PortRange{10, 13}}, "tcp:10-13"},
{ProtoPortRange{Proto: 17, Ports: PortRangeAny}, "udp:*"},
{ProtoPortRange{Proto: 0x84, Ports: PortRange{999, 999}}, "sctp:999"},
{ProtoPortRange{Proto: 0x3a, Ports: PortRangeAny}, "ipv6-icmp:*"},
{ProtoPortRange{Proto: 0x21, Ports: PortRangeAny}, "dccp:*"},
{ProtoPortRange{Proto: 0x2f, Ports: PortRangeAny}, "gre:*"},
}
for _, tc := range tests {
out, err := tc.input.MarshalText()
if err != nil {
t.Errorf("MarshalText for %v: %v", tc.input, err)
continue
}
if got := string(out); got != tc.text {
t.Errorf("MarshalText for %#v: got %q, want %q", tc.input, got, tc.text)
}
var ppr ProtoPortRange
if err := ppr.UnmarshalText(out); err != nil {
t.Errorf("UnmarshalText for %q: err=%v", tc.text, err)
continue
}
if ppr != tc.input {
t.Errorf("round trip error for %q: got %v, want %#v", tc.text, ppr, tc.input)
}
}
}