curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-3395: Improve help for list command

This commit is contained in:
Igor Postelnik 2020-09-15 08:36:36 -05:00
parent 5753aa9f18
commit cb6d424765
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/cloudflared/tunnel/subcommands.go
View File

@ -17,6 +17,7 @@ import (
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/net/idna"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
@ -377,7 +378,7 @@ func dnsRouteFromArg(c *cli.Context) (tunnelstore.Route, error) {
userHostname := c.Args().Get(userHostnameIndex) userHostname := c.Args().Get(userHostnameIndex)
if userHostname == "" { if userHostname == "" {
return nil, cliutil.UsageError("The third argument should be the hostname") return nil, cliutil.UsageError("The third argument should be the hostname")
} else if !validateName(userHostname) { } else if !validateHostname(userHostname) {
return nil, errors.Errorf("%s is not a valid hostname", userHostname) return nil, errors.Errorf("%s is not a valid hostname", userHostname)
} }
return tunnelstore.NewDNSRoute(userHostname), nil return tunnelstore.NewDNSRoute(userHostname), nil
@ -395,7 +396,7 @@ func lbRouteFromArg(c *cli.Context) (tunnelstore.Route, error) {
lbName := c.Args().Get(lbNameIndex) lbName := c.Args().Get(lbNameIndex)
if lbName == "" { if lbName == "" {
return nil, cliutil.UsageError("The third argument should be the load balancer name") return nil, cliutil.UsageError("The third argument should be the load balancer name")
} else if !validateName(lbName) { } else if !validateHostname(lbName) {
return nil, errors.Errorf("%s is not a valid load balancer name", lbName) return nil, errors.Errorf("%s is not a valid load balancer name", lbName)
} }
@ -415,6 +416,16 @@ func validateName(s string) bool {
return nameRegex.MatchString(s) return nameRegex.MatchString(s)
} }
func validateHostname(s string) bool {
// Slightly stricter than PunyCodeProfile
idnaProfile := idna.New(
idna.ValidateLabels(true),
idna.VerifyDNSLength(true))
puny, err := idnaProfile.ToASCII(s)
return err == nil && validateName(puny)
}
func routeCommand(c *cli.Context) error { func routeCommand(c *cli.Context) error {
if c.NArg() < 2 { if c.NArg() < 2 {
return cliutil.UsageError(`"cloudflared tunnel route" requires the first argument to be the route type(dns or lb), followed by the ID or name of the tunnel`) return cliutil.UsageError(`"cloudflared tunnel route" requires the first argument to be the route type(dns or lb), followed by the ID or name of the tunnel`)