mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-04 17:01:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli/serve_v2: improve validation error

Browse Source 
Specify the app apability that failed the test, instead of the
entire comma-separated list.

Fixes #cleanup

Signed-off-by: Gesa Stupperich <gesa@tailscale.com>
This commit is contained in:
Gesa Stupperich 2025-10-30 13:57:39 +00:00 committed by Gesa Stupperich
parent 95426b79a9
commit adee8b9180
2 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/cli/serve_v2.go
View File

@ -116,7 +116,7 @@ func (u *acceptAppCapsFlag) Set(s string) error {
for _, appCap := range appCaps { for _, appCap := range appCaps {
appCap = strings.TrimSpace(appCap) appCap = strings.TrimSpace(appCap)
if !validAppCap.MatchString(appCap) { if !validAppCap.MatchString(appCap) {
return fmt.Errorf("%q does not match the form {domain}/{name}, where domain must be a fully qualified domain name", s) return fmt.Errorf("%q does not match the form {domain}/{name}, where domain must be a fully qualified domain name", appCap)
} }
*u.Value = append(*u.Value, tailcfg.PeerCapability(appCap)) *u.Value = append(*u.Value, tailcfg.PeerCapability(appCap))
} }

62
cmd/tailscale/cli/serve_v2_test.go
View File

@ -12,6 +12,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"regexp"
"slices" "slices"
"strconv" "strconv"
"strings" "strings"
@ -908,8 +909,13 @@ func TestServeDevConfigMutations(t *testing.T) {
name: "invalid_accept_caps_invalid_app_cap", name: "invalid_accept_caps_invalid_app_cap",
steps: []step{ steps: []step{
{ {
command: cmd("serve --bg --accept-app-caps=example/cap/foo 3000"), // should be {domain.tld}/{name} command: cmd("serve --bg --accept-app-caps=example.com/cap/fine,NOTFINE 3000"), // should be {domain.tld}/{name}
wantErr: anyErr(), wantErr: func(err error) (badErrMsg string) {
if err == nil || !strings.Contains(err.Error(), fmt.Sprintf("%q does not match", "NOTFINE")) {
return fmt.Sprintf("wanted validation error that quotes the non-matching capability (and nothing more) but got %q", err.Error())
}
return ""
},
}, },
}, },
}, },
@ -1231,10 +1237,11 @@ func TestSrcTypeFromFlags(t *testing.T) {
func TestAcceptSetAppCapsFlag(t *testing.T) { func TestAcceptSetAppCapsFlag(t *testing.T) {
testCases := []struct { testCases := []struct {
name string name string
inputs []string inputs []string
expectErr bool expectErr bool
expectedValue []tailcfg.PeerCapability expectErrToMatch *regexp.Regexp
expectedValue []tailcfg.PeerCapability
}{ }{
{ {
name: "valid_simple", name: "valid_simple",
@ -1262,7 +1269,7 @@ func TestAcceptSetAppCapsFlag(t *testing.T) {
}, },
{ {
name: "valid_multiple_sets", name: "valid_multiple_sets",
inputs: []string{"one.com/foo", "two.com/bar"}, inputs: []string{"one.com/foo,two.com/bar"},
expectErr: false, expectErr: false,
expectedValue: []tailcfg.PeerCapability{"one.com/foo", "two.com/bar"}, expectedValue: []tailcfg.PeerCapability{"one.com/foo", "two.com/bar"},
}, },
@ -1273,10 +1280,11 @@ func TestAcceptSetAppCapsFlag(t *testing.T) {
expectedValue: nil, // Empty string should be a no-op and not append anything. expectedValue: nil, // Empty string should be a no-op and not append anything.
}, },
{ {
name: "invalid_path_chars", name: "invalid_path_chars",
inputs: []string{"domain.com/path_with_underscore"}, inputs: []string{"domain.com/path_with_underscore"},
expectErr: true, expectErr: true,
expectedValue: nil, // Slice should remain empty. expectErrToMatch: regexp.MustCompile(`"domain.com/path_with_underscore"`),
expectedValue: nil, // Slice should remain empty.
}, },
{ {
name: "valid_subdomain", name: "valid_subdomain",
@ -1285,22 +1293,25 @@ func TestAcceptSetAppCapsFlag(t *testing.T) {
expectedValue: []tailcfg.PeerCapability{"sub.domain.com/name"}, expectedValue: []tailcfg.PeerCapability{"sub.domain.com/name"},
}, },
{ {
name: "invalid_no_path", name: "invalid_no_path",
inputs: []string{"domain.com/"}, inputs: []string{"domain.com/"},
expectErr: true, expectErr: true,
expectedValue: nil, expectErrToMatch: regexp.MustCompile(`"domain.com/"`),
expectedValue: nil,
}, },
{ {
name: "invalid_no_domain", name: "invalid_no_domain",
inputs: []string{"/path/only"}, inputs: []string{"/path/only"},
expectErr: true, expectErr: true,
expectedValue: nil, expectErrToMatch: regexp.MustCompile(`"/path/only"`),
expectedValue: nil,
}, },
{ {
name: "some_invalid_some_valid", name: "some_invalid_some_valid",
inputs: []string{"one.com/foo", "bad/bar", "two.com/baz"}, inputs: []string{"one.com/foo,bad/bar,two.com/baz"},
expectErr: true, expectErr: true,
expectedValue: []tailcfg.PeerCapability{"one.com/foo"}, // Parsing will stop after first error expectErrToMatch: regexp.MustCompile(`"bad/bar"`),
expectedValue: []tailcfg.PeerCapability{"one.com/foo"}, // Parsing will stop after first error
}, },
} }
@ -1320,6 +1331,11 @@ func TestAcceptSetAppCapsFlag(t *testing.T) {
if tc.expectErr && err == nil { if tc.expectErr && err == nil {
t.Errorf("expected an error, but got none") t.Errorf("expected an error, but got none")
} }
if tc.expectErrToMatch != nil {
if !tc.expectErrToMatch.MatchString(err.Error()) {
t.Errorf("expected error to match %q, but was %q", tc.expectErrToMatch, err)
}
}
if !tc.expectErr && err != nil { if !tc.expectErr && err != nil {
t.Errorf("did not expect an error, but got: %v", err) t.Errorf("did not expect an error, but got: %v", err)
} }