Merge pull request #36 from uprendis/feature/ip-flags-err-handling

Add error handling for parsing of IPrestrictFlag/PrivateNodeFlag flags

Author: uprendis

cmd/utils/flags.go

@@ -33,6 +33,10 @@ import (
 	"text/template"
 	"time"
 
+	pcsclite "github.com/gballet/go-libpcsclite"
+	gopsutil "github.com/shirou/gopsutil/mem"
+	"gopkg.in/urfave/cli.v1"
+
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common"
@@ -66,9 +70,6 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 	"github.com/ethereum/go-ethereum/params"
-	pcsclite "github.com/gballet/go-libpcsclite"
-	gopsutil "github.com/shirou/gopsutil/mem"
-	"gopkg.in/urfave/cli.v1"
 )
 
 func init() {
@@ -1205,12 +1206,19 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
 		cfg.NetRestrict = list
 	}
 
+	var err error
 	if iprestrict := ctx.GlobalString(IPrestrictFlag.Name); iprestrict != "" {
-		cfg.IPRestrict = netutil.ParseIPs(iprestrict)
+		cfg.IPRestrict, err = netutil.ParseIPs(iprestrict)
+		if err != nil {
+			Fatalf("Option %q: %v", IPrestrictFlag.Name, err)
+		}
 	}
 
 	if privatenodes := ctx.GlobalString(PrivateNodeFlag.Name); privatenodes != "" {
-		cfg.PrivateNodes = enode.ParseNodes(privatenodes)
+		cfg.PrivateNodes, err = enode.ParseNodes(privatenodes)
+		if err != nil {
+			Fatalf("Option %q: %v", PrivateNodeFlag.Name, err)
+		}
 	}
 
 	if ctx.GlobalBool(DeveloperFlag.Name) || ctx.GlobalBool(CatalystFlag.Name) {

p2p/enode/node.go

@@ -79,19 +79,21 @@ func Parse(validSchemes enr.IdentityScheme, input string) (*Node, error) {
 	return New(validSchemes, &r)
 }
 
-func ParseNodes(s string) []*Node {
+func ParseNodes(s string) ([]*Node, error) {
 	ws := strings.NewReplacer(" ", "", "\n", "", "\t", "")
 	urls := strings.Split(ws.Replace(s), ",")
 	nodes := make([]*Node, 0)
 	for _, url := range urls {
 		if url == "" {
 			continue
 		}
-		if node, err := Parse(ValidSchemes, url); err == nil {
-			nodes = append(nodes, node)
+		node, err := Parse(ValidSchemes, url)
+		if err != nil {
+			return nil, fmt.Errorf("couldn't parse enode %v: %v", url, err)
 		}
+		nodes = append(nodes, node)
 	}
-	return nodes
+	return nodes, nil
 }
 
 // ID returns the node identifier.

p2p/netutil/net.go

@@ -87,19 +87,21 @@ func ParseNetlist(s string) (*Netlist, error) {
 	return &l, nil
 }
 
-func ParseIPs(s string) []string {
+func ParseIPs(s string) ([]string, error) {
 	ws := strings.NewReplacer(" ", "", "\n", "", "\t", "")
 	ips := strings.Split(ws.Replace(s), ",")
 	l := make([]string, 0)
 	for _, ip := range ips {
 		if ip == "" {
 			continue
 		}
-		if n := net.ParseIP(ip); n != nil {
-			l = append(l, n.String())
+		n := net.ParseIP(ip)
+		if n == nil {
+			return nil, fmt.Errorf("couldn't parse IP address %v", ip)
 		}
+		l = append(l, n.String())
 	}
-	return l
+	return l, nil
 }
 
 // MarshalTOML implements toml.MarshalerRec.