homelab/traefik
1
0
Fork 0
Code Activity

Don't allow non flag arguments by default.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-06-18 12:10:06 +02:00 • committed by Traefiker Bot
parent be888b59a6
commit 31614bebc4
2 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
pkg/cli/commands.go
View file

@ -3,7 +3,6 @@
package cli
import (
"errors"
"fmt"
"os"
"path/filepath"
@ -17,7 +16,9 @@ type Command struct {
Resources []ResourceLoader
Run func([]string) error
Hidden bool
subCommands []*Command
// AllowArg if not set, disallows any argument that is not a known command or a sub-command.
AllowArg bool
subCommands []*Command
}
// AddCommand Adds a sub command.
@ -40,13 +41,17 @@ func Execute(cmd *Command) error {
}
func execute(cmd *Command, args []string, root bool) error {
// Calls command without args.
if len(args) == 1 {
if err := run(cmd, args); err != nil {
if err := run(cmd, args[1:]); err != nil {
return fmt.Errorf("command %s error: %v", args[0], err)
}
return nil
}
// Special case: if the command is the top level one,
// and the first arg (`args[1]`) is not the command name or a known sub-command,
// then we run the top level command itself.
if root && cmd.Name != args[1] && !contains(cmd.subCommands, args[1]) {
if err := run(cmd, args[1:]); err != nil {
return fmt.Errorf("command %s error: %v", filepath.Base(args[0]), err)
@ -54,6 +59,7 @@ func execute(cmd *Command, args []string, root bool) error {
return nil
}
// Calls command by its name.
if len(args) >= 2 && cmd.Name == args[1] {
if err := run(cmd, args[2:]); err != nil {
return fmt.Errorf("command %s error: %v", cmd.Name, err)
@ -61,6 +67,7 @@ func execute(cmd *Command, args []string, root bool) error {
return nil
}
// No sub-command, calls the current command.
if len(cmd.subCommands) == 0 {
if err := run(cmd, args[1:]); err != nil {
return fmt.Errorf("command %s error: %v", cmd.Name, err)
@ -68,6 +75,7 @@ func execute(cmd *Command, args []string, root bool) error {
return nil
}
// Trying to find the sub-command.
for _, subCmd := range cmd.subCommands {
if len(args) >= 2 && subCmd.Name == args[1] {
return execute(subCmd, args[1:], false)
@ -84,7 +92,12 @@ func run(cmd *Command, args []string) error {
if cmd.Run == nil {
_ = PrintHelp(os.Stdout, cmd)
return errors.New("command not found")
return fmt.Errorf("command %s is not runnable", cmd.Name)
}
if len(args) > 0 && !isFlag(args[0]) && !cmd.AllowArg {
_ = PrintHelp(os.Stdout, cmd)
return fmt.Errorf("command not found: %v", args)
}
if cmd.Configuration == nil {
@ -113,3 +126,7 @@ func contains(cmds []*Command, name string) bool {
return false
}
func isFlag(arg string) bool {
return len(arg) > 0 && arg[1] == '-'
}