From 83d734e10953e08a1c0d3e8d772c785fefd12aec Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 17 Dec 2018 10:17:16 +0000 Subject: [PATCH 1/2] Make yggdrasilctl less crashy --- cmd/yggdrasilctl/main.go | 41 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 8135815f..4dcbbef7 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -30,6 +30,7 @@ func main() { if r := recover(); r != nil { logger.Println("Fatal error:", r) fmt.Print(logbuffer) + panic(r) os.Exit(1) } }() @@ -37,13 +38,15 @@ func main() { endpoint := defaults.GetDefaults().DefaultAdminListen flag.Usage = func() { - fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n", os.Args[0]) + fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0]) fmt.Println("Options:") flag.PrintDefaults() - fmt.Println("Commands:\n - Use \"list\" for a list of available commands") + fmt.Println("\nPlease note that options must always specified BEFORE the command\non the command line or they will be ignored.\n") + fmt.Println("Commands:\n - Use \"list\" for a list of available commands\n") fmt.Println("Examples:") fmt.Println(" - ", os.Args[0], "list") fmt.Println(" - ", os.Args[0], "getPeers") + fmt.Println(" - ", os.Args[0], "-v getSelf") fmt.Println(" - ", os.Args[0], "setTunTap name=auto mtu=1500 tap_mode=false") fmt.Println(" - ", os.Args[0], "-endpoint=tcp://localhost:9001 getDHT") fmt.Println(" - ", os.Args[0], "-endpoint=unix:///var/run/ygg.sock getDHT") @@ -122,24 +125,34 @@ func main() { for c, a := range args { if c == 0 { + if strings.HasPrefix(a, "-") { + logger.Printf("Ignoring flag %s as it should be specified before other parameters\n", a) + continue + } logger.Printf("Sending request: %v\n", a) send["request"] = a continue } tokens := strings.Split(a, "=") - if i, err := strconv.Atoi(tokens[1]); err == nil { - logger.Printf("Sending parameter %s: %d\n", tokens[0], i) - send[tokens[0]] = i - } else { - switch strings.ToLower(tokens[1]) { - case "true": - send[tokens[0]] = true - case "false": - send[tokens[0]] = false - default: - send[tokens[0]] = tokens[1] + if len(tokens) == 1 { + send[tokens[0]] = true + } else if len(tokens) > 2 { + send[tokens[0]] = strings.Join(tokens[1:], "=") + } else if len(tokens) == 2 { + if i, err := strconv.Atoi(tokens[1]); err == nil { + logger.Printf("Sending parameter %s: %d\n", tokens[0], i) + send[tokens[0]] = i + } else { + switch strings.ToLower(tokens[1]) { + case "true": + send[tokens[0]] = true + case "false": + send[tokens[0]] = false + default: + send[tokens[0]] = tokens[1] + } + logger.Printf("Sending parameter %s: %v\n", tokens[0], send[tokens[0]]) } - logger.Printf("Sending parameter %s: %v\n", tokens[0], send[tokens[0]]) } } From 422424af64c539a99a7a7f0d574f1af3eaeb7fe8 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 17 Dec 2018 10:19:20 +0000 Subject: [PATCH 2/2] Don't panic --- cmd/yggdrasilctl/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 4dcbbef7..189a53a7 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -30,7 +30,6 @@ func main() { if r := recover(); r != nil { logger.Println("Fatal error:", r) fmt.Print(logbuffer) - panic(r) os.Exit(1) } }() @@ -201,7 +200,7 @@ func main() { if !keysOrdered { for k := range slv.(map[string]interface{}) { if !*verbose { - if k == "box_pub_key" || k == "box_sig_key" { + if k == "box_pub_key" || k == "box_sig_key" || k == "nodeinfo" { continue } }