Merge lp:~pedronis/ubuntu-push/acceptanceclient-flags into lp:ubuntu-push

[Samuele Pedroni]

-insecure (don't check certs) -reportPings=f (don't report pings) flags for acceptanceclient

lets control in acceptanceclient whether to

- check certs
- report Pings

using flags

[John Lenton (chipaca)]

review: Approve

=== modified file 'server/acceptance/acceptanceclient.go'
--- server/acceptance/acceptanceclient.go	2014-01-13 15:21:11 +0000
+++ server/acceptance/acceptanceclient.go	2014-01-14 19:06:14 +0000
@@ -39,6 +39,7 @@
 	CertPEMBlock    []byte
 	ReportPings     bool
 	Levels          map[string]int64
+	Insecure        bool // don't verify certs
 	// connection
 	Connection net.Conn
 }
@@ -59,6 +60,7 @@
 		}
 		tlsConfig.RootCAs = cp
 	}
+	tlsConfig.InsecureSkipVerify = sess.Insecure
 	sess.Connection = tls.Client(conn, tlsConfig)
 	return nil
 }

=== modified file 'server/acceptance/cmd/acceptanceclient.go'
--- server/acceptance/cmd/acceptanceclient.go	2014-01-13 15:21:11 +0000
+++ server/acceptance/cmd/acceptanceclient.go	2014-01-14 19:06:14 +0000
@@ -18,6 +18,7 @@
 package main
 
 import (
+	"flag"
 	"launchpad.net/ubuntu-push/config"
 	"launchpad.net/ubuntu-push/server/acceptance"
 	"log"
@@ -25,6 +26,11 @@
 	"path/filepath"
 )
 
+var (
+	insecureFlag    = flag.Bool("insecure", false, "disable checking of server certificate and hostname")
+	reportPingsFlag = flag.Bool("reportPings", true, "report each Ping from the server")
+)
+
 type configuration struct {
 	// session configuration
 	PingInterval    config.ConfigTimeDuration `json:"ping_interval"`
@@ -35,14 +41,15 @@
 }
 
 func main() {
-	// xxx configure logging
+	flag.Parse()
+	narg := flag.NArg()
 	switch {
-	case len(os.Args) < 2:
+	case narg < 1:
 		log.Fatal("missing config file")
-	case len(os.Args) < 3:
+	case narg < 2:
 		log.Fatal("missing device-id")
 	}
-	configFName := os.Args[1]
+	configFName := flag.Arg(0)
 	f, err := os.Open(configFName)
 	if err != nil {
 		log.Fatalf("reading config: %v", err)
@@ -56,7 +63,10 @@
 		ExchangeTimeout: cfg.ExchangeTimeout.TimeDuration(),
 		PingInterval:    cfg.PingInterval.TimeDuration(),
 		ServerAddr:      cfg.Addr.HostPort(),
-		DeviceId:        os.Args[2],
+		DeviceId:        flag.Arg(1),
+		// flags
+		ReportPings: *reportPingsFlag,
+		Insecure:    *insecureFlag,
 	}
 	session.CertPEMBlock, err = config.LoadFile(cfg.CertPEMFile, filepath.Dir(configFName))
 	if err != nil {