From 4f464d5d297d13103df7cde288606dafb366319d Mon Sep 17 00:00:00 2001
From: James O'Beirne <james.obeirne@pm.me>
Date: Sat, 16 Sep 2023 08:52:07 -0400
Subject: [PATCH] trim keys before attempting import

When pasting from e.g. signal-desktop, private keys can have a trailing
newline that isn't readily visible. As a result the import mysteriously
fails with a "Private key is not recognized" message.

This is fixed by trimming whitespace from the ends of keys before
attempting to add them.
---
 src/overlord/mod.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/overlord/mod.rs b/src/overlord/mod.rs
index af5acfc5..824e11d9 100644
--- a/src/overlord/mod.rs
+++ b/src/overlord/mod.rs
@@ -614,7 +614,7 @@ impl Overlord {
                 }));
             }
             ToOverlordMessage::FollowNprofile(nprofile) => {
-                match Profile::try_from_bech32_string(&nprofile, true) {
+                match Profile::try_from_bech32_string(&nprofile.trim(), true) {
                     Ok(np) => self.follow_nprofile(np).await?,
                     Err(e) => GLOBALS.status_queue.write().write(format!("{}", e)),
                 }
@@ -638,8 +638,8 @@ impl Overlord {
                     password.zeroize();
                     GLOBALS.signer.save().await?;
                 } else {
-                    let maybe_pk1 = PrivateKey::try_from_bech32_string(&import_priv);
-                    let maybe_pk2 = PrivateKey::try_from_hex_string(&import_priv);
+                    let maybe_pk1 = PrivateKey::try_from_bech32_string(&import_priv.trim());
+                    let maybe_pk2 = PrivateKey::try_from_hex_string(&import_priv.trim());
                     import_priv.zeroize();
                     if maybe_pk1.is_err() && maybe_pk2.is_err() {
                         password.zeroize();
@@ -656,8 +656,8 @@ impl Overlord {
                 }
             }
             ToOverlordMessage::ImportPub(pubstr) => {
-                let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr, true);
-                let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr, true);
+                let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr.trim(), true);
+                let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr.trim(), true);
                 if maybe_pk1.is_err() && maybe_pk2.is_err() {
                     GLOBALS
                         .status_queue
@@ -939,7 +939,7 @@ impl Overlord {
         pubkeystr: String,
         relay: RelayUrl,
     ) -> Result<(), Error> {
-        let pubkey = match PublicKey::try_from_bech32_string(&pubkeystr, true) {
+        let pubkey = match PublicKey::try_from_bech32_string(&pubkeystr.trim(), true) {
             Ok(pk) => pk,
             Err(_) => PublicKey::try_from_hex_string(&pubkeystr, true)?,
         };