From 58db517c8d79c7fd8897d8ab5d5cf9c2de67a071 Mon Sep 17 00:00:00 2001
From: Ray Ganardi <ray@ganardi.xyz>
Date: Tue, 19 May 2020 13:06:46 +0200
Subject: pgp: fail gracefully from email decryption

Aerc panics when there's an error on email decryption.
Instead, an error message should be shown.
---
 commands/account/view.go |  6 +++++-
 commands/msg/delete.go   |  6 +++++-
 commands/msgview/next.go |  6 +++++-
 lib/messageview.go       | 18 +++++++++++-------
 widgets/msglist.go       |  6 +++++-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/commands/account/view.go b/commands/account/view.go
index d1b90ce..b421666 100644
--- a/commands/account/view.go
+++ b/commands/account/view.go
@@ -39,7 +39,11 @@ func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
 		return nil
 	}
 	lib.NewMessageStoreView(msg, store, aerc.DecryptKeys,
-		func(view lib.MessageView) {
+		func(view lib.MessageView, err error) {
+			if err != nil {
+				aerc.PushError(err.Error())
+				return
+			}
 			viewer := widgets.NewMessageViewer(acct, aerc.Config(), view)
 			aerc.NewTab(viewer, msg.Envelope.Subject)
 		})
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 313e3ea..4bda8b9 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -66,7 +66,11 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
 				return nil
 			}
 			lib.NewMessageStoreView(next, store, aerc.DecryptKeys,
-				func(view lib.MessageView) {
+				func(view lib.MessageView, err error) {
+					if err != nil {
+						aerc.PushError(err.Error())
+						return
+					}
 					nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view)
 					aerc.ReplaceTab(mv, nextMv, next.Envelope.Subject)
 				})
diff --git a/commands/msgview/next.go b/commands/msgview/next.go
index c218ad5..978cf10 100644
--- a/commands/msgview/next.go
+++ b/commands/msgview/next.go
@@ -38,7 +38,11 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
 		return nil
 	}
 	lib.NewMessageStoreView(nextMsg, store, aerc.DecryptKeys,
-		func(view lib.MessageView) {
+		func(view lib.MessageView, err error) {
+			if err != nil {
+				aerc.PushError(err.Error())
+				return
+			}
 			nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view)
 			aerc.ReplaceTab(mv, nextMv, nextMsg.Envelope.Subject)
 		})
diff --git a/lib/messageview.go b/lib/messageview.go
index 59a1af6..384a947 100644
--- a/lib/messageview.go
+++ b/lib/messageview.go
@@ -59,7 +59,7 @@ type MessageStoreView struct {
 
 func NewMessageStoreView(messageInfo *models.MessageInfo,
 	store *MessageStore, decryptKeys openpgp.PromptFunction,
-	cb func(MessageView)) {
+	cb func(MessageView, error)) {
 
 	msv := &MessageStoreView{messageInfo, store,
 		nil, nil, messageInfo.BodyStructure}
@@ -69,26 +69,30 @@ func NewMessageStoreView(messageInfo *models.MessageInfo,
 			reader := fm.Content.Reader
 			pgpReader, err := pgpmail.Read(reader, Keyring, decryptKeys, nil)
 			if err != nil {
-				panic(err)
+				cb(nil, err)
+				return
 			}
 			msv.message, err = ioutil.ReadAll(pgpReader.MessageDetails.UnverifiedBody)
 			if err != nil {
-				panic(err)
+				cb(nil, err)
+				return
 			}
 			decrypted, err := message.Read(bytes.NewBuffer(msv.message))
 			if err != nil {
-				panic(err)
+				cb(nil, err)
+				return
 			}
 			bs, err := lib.ParseEntityStructure(decrypted)
 			if err != nil {
-				panic(err)
+				cb(nil, err)
+				return
 			}
 			msv.bodyStructure = bs
 			msv.details = pgpReader.MessageDetails
-			cb(msv)
+			cb(msv, nil)
 		})
 	} else {
-		cb(msv)
+		cb(msv, nil)
 	}
 	store.Read([]uint32{messageInfo.Uid}, true, nil)
 }
diff --git a/widgets/msglist.go b/widgets/msglist.go
index f36901f..5aedb44 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -166,7 +166,11 @@ func (ml *MessageList) MouseEvent(localX int, localY int, event tcell.Event) {
 					return
 				}
 				lib.NewMessageStoreView(msg, store, ml.aerc.DecryptKeys,
-					func(view lib.MessageView) {
+					func(view lib.MessageView, err error) {
+						if err != nil {
+							ml.aerc.PushError(err.Error())
+							return
+						}
 						viewer := NewMessageViewer(acct, ml.aerc.Config(), view)
 						ml.aerc.NewTab(viewer, msg.Envelope.Subject)
 					})
-- 
cgit 1.4.1-2-gfad0