diff options
| author | a e r t h <aerth@users.noreply.github.com> | 2018-07-26 18:57:20 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-07-26 18:57:20 +0800 |
| commit | 021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a (patch) | |
| tree | 67fc9abcf11c04fc5d45c14d8883aa0a928583a3 /cmd | |
| parent | feed8069a64ab4464aff589ecccf1bb3907faba4 (diff) | |
| download | dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar.gz dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar.bz2 dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar.lz dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar.xz dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.tar.zst dexon-021d6fbbbbdfe295dbb3619f8ec3fc8662c1e26a.zip | |
cmd: prevent accidental invalid commands (#17248)
* cmd: stop parsing bootnodes if one is invalid
* cmd/geth: require valid command as argument (or no arg)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 3 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 1c618de35..77ef6afe2 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -251,6 +251,9 @@ func main() { // It creates a default node based on the command line arguments and runs it in // blocking mode, waiting for it to be shut down. func geth(ctx *cli.Context) error { + if args := ctx.Args(); len(args) > 0 { + return fmt.Errorf("invalid command: %q", args[0]) + } node := makeFullNode(ctx) startNode(ctx, node) node.Wait() diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 29a79b4a2..27e56f109 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -644,8 +644,7 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) { for _, url := range urls { node, err := discover.ParseNode(url) if err != nil { - log.Error("Bootstrap URL invalid", "enode", url, "err", err) - continue + log.Crit("Bootstrap URL invalid", "enode", url, "err", err) } cfg.BootstrapNodes = append(cfg.BootstrapNodes, node) } |