Merge pull request #985 from glouvigny/glouvigny/cmd-daemon-apns-dev-…

…voip-certs fix: Force dev mode force APNs VoIP certificates
berty · Feb 1, 2019 · c7314ad · c7314ad
2 parents 543344a + 16f9670
commit c7314ad
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/core/cmd/berty/daemon.go b/core/cmd/berty/daemon.go
@@ -23,16 +23,17 @@ import (
 type daemonOptions struct {
 	sql sqlOptions `mapstructure:"sql"`
 
-	grpcBind       string   `mapstructure:"grpc-bind"`
-	gqlBind        string   `mapstructure:"gql-bind"`
-	hideBanner     bool     `mapstructure:"hide-banner"`
-	dropDatabase   bool     `mapstructure:"drop-database"`
-	initOnly       bool     `mapstructure:"init-only"`
-	withBot        bool     `mapstructure:"with-bot"`
-	notification   bool     `mapstructure:"notification"`
-	apnsCerts      []string `mapstructure:"apns-certs"`
-	fcmAPIKeys     []string `mapstructure:"fcm-api-keys"`
-	privateKeyFile string   `mapstructure:"private-key-file"`
+	grpcBind         string   `mapstructure:"grpc-bind"`
+	gqlBind          string   `mapstructure:"gql-bind"`
+	hideBanner       bool     `mapstructure:"hide-banner"`
+	dropDatabase     bool     `mapstructure:"drop-database"`
+	initOnly         bool     `mapstructure:"init-only"`
+	withBot          bool     `mapstructure:"with-bot"`
+	notification     bool     `mapstructure:"notification"`
+	apnsCerts        []string `mapstructure:"apns-certs"`
+	apnsDevVoipCerts []string `mapstructure:"apns-dev-voip-certs"`
+	fcmAPIKeys       []string `mapstructure:"fcm-api-keys"`
+	privateKeyFile   string   `mapstructure:"private-key-file"`
 
 	// p2p
 	identity       string   `mapstructure:"identity"`
@@ -66,6 +67,7 @@ func daemonSetupFlags(flags *pflag.FlagSet, opts *daemonOptions) {
 	flags.StringSliceVar(&opts.bootstrap, "bootstrap", p2p.DefaultBootstrap, "boostrap peers")
 	flags.StringSliceVar(&opts.bindP2P, "bind-p2p", []string{"/ip4/0.0.0.0/tcp/0", "/ip4/0.0.0.0/udp/0/quic", "/ble/00000000-0000-0000-0000-000000000000"}, "p2p listening address")
 	flags.StringSliceVar(&opts.apnsCerts, "apns-certs", []string{}, "Path of APNs certificates, delimited by commas")
+	flags.StringSliceVar(&opts.apnsDevVoipCerts, "apns-dev-voip-certs", []string{}, "Path of APNs VoIP development certificates, delimited by commas")
 	flags.StringSliceVar(&opts.fcmAPIKeys, "fcm-api-keys", []string{}, "API keys for Firebase Cloud Messaging, in the form packageid:token, delimited by commas")
 	flags.StringVar(&opts.privateKeyFile, "private-key-file", "", "set private key file for node")
 	// flags.StringSliceVar(&opts.bindP2P, "bind-p2p", []string{"/ip4/0.0.0.0/tcp/0"}, "p2p listening address")
@@ -164,23 +166,9 @@ func daemon(opts *daemonOptions) error {
 		accountOptions = append(accountOptions, account.WithNotificationDriver(notificationDriver))
 	}
 
-	var pushDispatchers []push.Dispatcher
-	for _, cert := range opts.apnsCerts {
-		dispatcher, err := push.NewAPNSDispatcher(cert)
-		if err != nil {
-			return err
-		}
-
-		pushDispatchers = append(pushDispatchers, dispatcher)
-	}
-
-	for _, apiKey := range opts.fcmAPIKeys {
-		dispatcher, err := push.NewFCMDispatcher(apiKey)
-		if err != nil {
-			return err
-		}
-
-		pushDispatchers = append(pushDispatchers, dispatcher)
+	pushDispatchers, err := listPushDispatchers(opts)
+	if err != nil {
+		return err
 	}
 
 	accountOptions = append(accountOptions, account.WithPushManager(push.New(pushDispatchers...)))
@@ -205,3 +193,34 @@ func daemon(opts *daemonOptions) error {
 
 	return <-a.ErrChan()
 }
+
+func listPushDispatchers(opts *daemonOptions) ([]push.Dispatcher, error) {
+	var pushDispatchers []push.Dispatcher
+	for _, certs := range []struct {
+		Certs    []string
+		ForceDev bool
+	}{
+		{Certs: opts.apnsCerts, ForceDev: false},
+		{Certs: opts.apnsDevVoipCerts, ForceDev: true},
+	} {
+		for _, cert := range certs.Certs {
+			dispatcher, err := push.NewAPNSDispatcher(cert, certs.ForceDev)
+			if err != nil {
+				return nil, err
+			}
+
+			pushDispatchers = append(pushDispatchers, dispatcher)
+		}
+	}
+
+	for _, apiKey := range opts.fcmAPIKeys {
+		dispatcher, err := push.NewFCMDispatcher(apiKey)
+		if err != nil {
+			return nil, err
+		}
+
+		pushDispatchers = append(pushDispatchers, dispatcher)
+	}
+
+	return pushDispatchers, nil
+}
diff --git a/core/push/apns.go b/core/push/apns.go
@@ -23,7 +23,7 @@ type APNSDispatcher struct {
 
 var _ Dispatcher = &APNSDispatcher{}
 
-func NewAPNSDispatcher(path string) (Dispatcher, error) {
+func NewAPNSDispatcher(path string, forceDev bool) (Dispatcher, error) {
 	cert, err := certificate.FromP12File(path, "")
 
 	if err != nil {
@@ -47,7 +47,7 @@ func NewAPNSDispatcher(path string) (Dispatcher, error) {
 
 	client := apns2.NewClient(cert)
 
-	if production {
+	if !forceDev && production {
 		client = client.Production()
 	} else {
 		client = client.Development()