From f3e6af557103f8bdaa7eb9ab9b83efa997051af9 Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Tue, 16 Jun 2020 10:11:24 +0200
Subject: [PATCH] feat: clear keys after unmarshaling

---
 pkg/pmapi/keyring.go | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkg/pmapi/keyring.go b/pkg/pmapi/keyring.go
index 3cad0e0a..72b9d51a 100644
--- a/pkg/pmapi/keyring.go
+++ b/pkg/pmapi/keyring.go
@@ -39,21 +39,39 @@ type PMKey struct {
 	Signature   *string `json:",omitempty"`
 }
 
+type clearable []byte
+
+func (c *clearable) UnmarshalJSON(b []byte) error {
+	b = bytes.Trim(b, "\"")
+	b = bytes.ReplaceAll(b, []byte("\\n"), []byte("\n"))
+	b = bytes.ReplaceAll(b, []byte("\\r"), []byte("\r"))
+	*c = b
+	return nil
+}
+
+func (c *clearable) clear() {
+	for i := range *c {
+		(*c)[i] = 0
+	}
+}
+
 func (key *PMKey) UnmarshalJSON(b []byte) (err error) {
 	type _PMKey PMKey
 
 	rawKey := struct {
 		_PMKey
-		PrivateKey string
+		PrivateKey clearable
 	}{}
 
+	defer rawKey.PrivateKey.clear()
+
 	if err = json.Unmarshal(b, &rawKey); err != nil {
 		return
 	}
 
 	*key = PMKey(rawKey._PMKey)
 
-	if key.PrivateKey, err = crypto.NewKeyFromArmored(rawKey.PrivateKey); err != nil {
+	if key.PrivateKey, err = crypto.NewKeyFromArmoredReader(bytes.NewReader(rawKey.PrivateKey)); err != nil {
 		return errors.Wrap(err, "failed to create crypto key from armored private key")
 	}