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

cmd/tailscale/cli, tailcfg: allow tag without "tag:" prefix in 'tailscale up'

Browse Source 
Fixes #861
This commit is contained in:
Brad Fitzpatrick 2020-10-28 07:59:57 -07:00
parent d6ad41dcea
commit cd07437ade
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/tailscale/cli/up.go
View File

@ -182,11 +182,18 @@ func runUp(ctx context.Context, args []string) error {
var tags []string var tags []string
if upArgs.advertiseTags != "" { if upArgs.advertiseTags != "" {
tags = strings.Split(upArgs.advertiseTags, ",") tags = strings.Split(upArgs.advertiseTags, ",")
for _, tag := range tags { for i, tag := range tags {
err := tailcfg.CheckTag(tag) if strings.HasPrefix(tag, "tag:") {
if err != nil { // Accept fully-qualified tags (starting with
fatalf("tag: %q: %s", tag, err) // "tag:"), as we do in the ACL file.
err := tailcfg.CheckTag(tag)
if err != nil {
fatalf("tag: %q: %v", tag, err)
}
} else if err := tailcfg.CheckTagSuffix(tag); err != nil {
fatalf("tag: %q: %v", tag, err)
} }
tags[i] = "tag:" + tag
} }
} }

38
tailcfg/tailcfg.go
View File

@ -13,6 +13,7 @@
"reflect" "reflect"
"strings" "strings"
"time" "time"
"unicode/utf8"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"go4.org/mem" "go4.org/mem"
@ -210,13 +211,8 @@ func (m MachineStatus) String() string {
} }
} }
func isNum(b byte) bool { func isNum(r rune) bool { return r >= '0' && r <= '9' }
return b >= '0' && b <= '9' func isAlpha(r rune) bool { return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') }
}
func isAlpha(b byte) bool {
return (b >= 'A' && b <= 'Z') || (b >= 'a' && b <= 'z')
}
// CheckTag valids whether a given string can be used as an ACL tag. // CheckTag valids whether a given string can be used as an ACL tag.
// For now we allow only ascii alphanumeric tags, and they need to start // For now we allow only ascii alphanumeric tags, and they need to start
@ -231,20 +227,34 @@ func CheckTag(tag string) error {
if !strings.HasPrefix(tag, "tag:") { if !strings.HasPrefix(tag, "tag:") {
return errors.New("tags must start with 'tag:'") return errors.New("tags must start with 'tag:'")
} }
tag = tag[4:] suffix := tag[len("tag:"):]
if err := CheckTagSuffix(suffix); err != nil {
return fmt.Errorf("invalid tag %q: %w", tag, err)
}
return nil
}
// CheckTagSuffix checks whether tag is a valid tag suffix (the part
// appearing after "tag:"). The error message does not reference
// "tag:", so it's suitable for use by the "tailscale up" CLI tool
// where the "tag:" isn't required. The returned error also does not
// reference the tag itself, so the caller can wrap it as needed with
// either the full or short form.
func CheckTagSuffix(tag string) error {
if tag == "" { if tag == "" {
return errors.New("tag names must not be empty") return errors.New("tag names must not be empty")
} }
if !isAlpha(tag[0]) { if i := strings.IndexFunc(tag, func(r rune) bool { return r >= utf8.RuneSelf }); i != -1 {
return errors.New("tag names must start with a letter, after 'tag:'") return errors.New("tag names must only contain ASCII")
} }
if !isAlpha(rune(tag[0])) {
for _, b := range []byte(tag) { return errors.New("tag name must start with a letter")
if !isNum(b) && !isAlpha(b) && b != '-' { }
for _, r := range tag {
if !isNum(r) && !isAlpha(r) && r != '-' {
return errors.New("tag names can only contain numbers, letters, or dashes") return errors.New("tag names can only contain numbers, letters, or dashes")
} }
} }
return nil return nil
} }