Don't write temp file

.gitignore

@@ -1,4 +1,5 @@
 **/*.sh
 **/data
 **/data/*.json
-**/test
+**/test
+**/releases/*

path_trustee.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -25,6 +26,7 @@ import (
 	"time"
 
 	jwt "github.com/dgrijalva/jwt-go"
+
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -364,7 +366,7 @@ func (b *backend) pathCreateJWT(ctx context.Context, req *logical.Request, data
 	}
 	claims["exp"] = fmt.Sprintf("%d", timeStart.Add(timeExpiry).Unix())
 
-	key, err := b.getTrusteePrivateKey(prunedPath, *trustee)
+	key, err := b.getTrusteePrivateKey(*trustee)
 	if err != nil {
 		return nil, err
 	}
@@ -450,3 +452,11 @@ func (b *backend) verifyClaim(ctx context.Context, rawToken string) (jwt.MapClai
 	}
 	return nil, fmt.Errorf("Error verifying token")
 }
+
+// PrettyPrint prints an indented JSON payload. This is used for development debugging.
+func PrettyPrint(v interface{}) string {
+	jsonString, _ := json.Marshal(v)
+	var out bytes.Buffer
+	json.Indent(&out, jsonString, "", "  ")
+	return out.String()
+}

util.go

@@ -157,6 +157,7 @@ func (b *backend) readJSONKeystore(keystorePath string) ([]byte, error) {
 	var jsonKeystore []byte
 	file, err := os.Open(keystorePath)
 	defer file.Close()
+	defer b.removeTemporaryKeystore(keystorePath)
 	stat, err := file.Stat()
 	if err != nil {
 		return nil, err
@@ -174,22 +175,13 @@ func (b *backend) readJSONKeystore(keystorePath string) ([]byte, error) {
 
 }
 
-func (b *backend) getTrusteePrivateKey(path string, trustee Trustee) (*keystore.Key, error) {
-	tmpDir, err := b.createTemporaryKeystoreDirectory()
-	if err != nil {
-		return nil, err
-	}
+func (b *backend) getTrusteePrivateKey(trustee Trustee) (*keystore.Key, error) {
+	key, _ := keystore.DecryptKey(trustee.JSONKeystore, trustee.Passphrase)
 
-	keystorePath, err := b.writeTemporaryKeystoreFile(tmpDir, trustee.KeystoreName, trustee.JSONKeystore)
-	if err != nil {
-		return nil, err
-	}
-	key, err := b.readKeyFromJSONKeystore(keystorePath, trustee.Passphrase)
-	if err != nil {
-		return nil, err
+	if key != nil && key.PrivateKey != nil {
+		return key, nil
 	}
-	err = b.removeTemporaryKeystore(tmpDir)
-	return key, err
+	return nil, fmt.Errorf("failed to read key from keystore")
 }
 
 func (b *backend) exportKeystore(path string, trustee *Trustee) (string, error) {