fixup! go/common/crypto/signature/signers/remote: Initial import

oasisprotocol · Feb 26, 2020 · 540fe9b · 540fe9b
1 parent 49bbf38
commit 540fe9b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/go/common/crypto/signature/signers/remote/grpc.go b/go/common/crypto/signature/signers/remote/grpc.go
@@ -155,7 +155,7 @@ type remoteFactory struct {
 }
 
 func (rf *remoteFactory) EnsureRole(role signature.SignerRole) error {
-	if rf.signers[role] != nil {
+	if rf.signers[role] == nil {
 		return signature.ErrNotExist
 	}
 	return nil
@@ -246,7 +246,7 @@ func NewFactory(config interface{}, roles ...signature.SignerRole) (signature.Si
 			*cfg.ClientCertificate,
 		},
 		RootCAs:    certPool,
-		ServerName: "remote-signer-client",
+		ServerName: "remote-signer-server",
 	})
 
 	conn, err := cmnGrpc.Dial(cfg.Address, grpc.WithTransportCredentials(creds))

diff --git a/go/oasis-remote-signer/cmd/root.go b/go/oasis-remote-signer/cmd/root.go
@@ -2,6 +2,7 @@
 package cmd
 
 import (
+	"crypto/rand"
 	goTls "crypto/tls"
 	"crypto/x509"
 	"fmt"
@@ -69,15 +70,15 @@ func ensureDataDir() (string, error) {
 }
 
 func doServerInit(cmd *cobra.Command, args []string) {
-	if _, _, err := serverInit(); err != nil {
+	if _, _, err := serverInit(true); err != nil {
 		logger.Error("failed to initialize server keys",
 			"err", err,
 		)
 		os.Exit(1)
 	}
 }
 
-func serverInit() (signature.SignerFactory, *goTls.Certificate, error) {
+func serverInit(provisionKeys bool) (signature.SignerFactory, *goTls.Certificate, error) {
 	dataDir, err := ensureDataDir()
 	if err != nil {
 		return nil, nil, err
@@ -90,6 +91,18 @@ func serverInit() (signature.SignerFactory, *goTls.Certificate, error) {
 		)
 		return nil, nil, fmt.Errorf("remote-signer: failed to create signer: %w", err)
 	}
+	for _, v := range signature.SignerRoles {
+		switch provisionKeys {
+		case true:
+			if _, err = sf.Generate(v, rand.Reader); err != nil {
+				return nil, nil, fmt.Errorf("remote-signer: failed to provision key (%v): %w", v, err)
+			}
+		case false:
+			if _, err = sf.Load(v); err != nil {
+				return nil, nil, fmt.Errorf("remote-signer: failed to load key (%v): %w", v, err)
+			}
+		}
+	}
 
 	// Load the server certificate, provisioning if required.
 	cert, err := tls.LoadOrGenerate(
@@ -130,7 +143,7 @@ func doClientInit(cmd *cobra.Command, args []string) {
 
 func runRoot(cmd *cobra.Command, args []string) error {
 	// Initialize all of the server keys.
-	sf, cert, err := serverInit()
+	sf, cert, err := serverInit(false)
 	if err != nil {
 		logger.Error("failed to initialize server keys",
 			"err", err,