From 96646c8324783c9e07135f4e556c746645205f40 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 3 Dec 2019 14:48:11 +0100
Subject: [PATCH] Add context to errors

---
 imap.go   | 18 +++++++++---------
 server.go | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/imap.go b/imap.go
index e2ca338..8688604 100644
--- a/imap.go
+++ b/imap.go
@@ -19,17 +19,17 @@ func (s *Server) connectIMAP() (*imapclient.Client, error) {
 	if s.imap.tls {
 		c, err = imapclient.DialTLS(s.imap.host, nil)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to connect to IMAPS server: ^v", err)
 		}
 	} else {
 		c, err = imapclient.Dial(s.imap.host)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to connect to IMAP server: %v", err)
 		}
 		if !s.imap.insecure {
 			if err := c.StartTLS(nil); err != nil {
 				c.Close()
-				return nil, err
+				return nil, fmt.Errorf("STARTTLS failed: %v", err)
 			}
 		}
 	}
@@ -50,7 +50,7 @@ func listMailboxes(conn *imapclient.Client) ([]*imap.MailboxInfo, error) {
 	}
 
 	if err := <-done; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to list mailboxes: %v", err)
 	}
 
 	sort.Slice(mailboxes, func(i, j int) bool {
@@ -63,7 +63,7 @@ func ensureMailboxSelected(conn *imapclient.Client, mboxName string) error {
 	mbox := conn.Mailbox()
 	if mbox == nil || mbox.Name != mboxName {
 		if _, err := conn.Select(mboxName, false); err != nil {
-			return err
+			return fmt.Errorf("failed to select mailbox: %v", err)
 		}
 	}
 	return nil
@@ -231,7 +231,7 @@ func listMessages(conn *imapclient.Client, mboxName string) ([]imapMessage, erro
 	}
 
 	if err := <-done; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to fetch message list: %v", err)
 	}
 
 	// Reverse list of messages
@@ -271,7 +271,7 @@ func getMessagePart(conn *imapclient.Client, mboxName string, uid uint32, partPa
 
 	ch := make(chan *imap.Message, 1)
 	if err := conn.UidFetch(seqSet, fetch, ch); err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to fetch message: %v", err)
 	}
 
 	msg := <-ch
@@ -282,12 +282,12 @@ func getMessagePart(conn *imapclient.Client, mboxName string, uid uint32, partPa
 	headerReader := bufio.NewReader(msg.GetBody(&partHeaderSection))
 	h, err := textproto.ReadHeader(headerReader)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to read part header: %v", err)
 	}
 
 	part, err := message.New(message.Header{h}, msg.GetBody(&partBodySection))
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to create message reader: %v", err)
 	}
 
 	return &imapMessage{msg}, part, nil
diff --git a/server.go b/server.go
index 4156724..1519ee6 100644
--- a/server.go
+++ b/server.go
@@ -28,7 +28,7 @@ type Server struct {
 func NewServer(imapURL string) (*Server, error) {
 	u, err := url.Parse(imapURL)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to parse IMAP server URL: %v", err)
 	}
 
 	s := &Server{}
@@ -87,7 +87,7 @@ func handleLogin(ectx echo.Context) error {
 
 		token, err := ctx.server.imap.pool.Put(conn)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to put connection in pool: %v", err)
 		}
 		ctx.setToken(token)
 
@@ -116,7 +116,7 @@ func handleGetPart(ctx *context, raw bool) error {
 
 	mimeType, _, err := part.Header.ContentType()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to parse part Content-Type: %v", err)
 	}
 	if len(partPath) == 0 {
 		mimeType = "message/rfc822"
@@ -141,7 +141,7 @@ func handleGetPart(ctx *context, raw bool) error {
 	if strings.HasPrefix(strings.ToLower(mimeType), "text/") {
 		b, err := ioutil.ReadAll(part.Body)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to read part body: %v", err)
 		}
 		body = string(b)
 	}
@@ -246,7 +246,7 @@ func New(imapURL string) *echo.Echo {
 	e.GET("/logout", func(ectx echo.Context) error {
 		ctx := ectx.(*context)
 		if err := ctx.conn.Logout(); err != nil {
-			return err
+			return fmt.Errorf("failed to logout: %v", err)
 		}
 		ctx.setToken("")
 		return ctx.Redirect(http.StatusFound, "/login")