From 48d6d5d227a4d55d80f9f2a74c1242cafafab7ab Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 3 Dec 2019 17:18:17 +0100
Subject: [PATCH] Add session lock

HTTP requests can be processed in parallel, but we only have one IMAP
connection per session.

Closes: https://todo.sr.ht/~sircmpwn/koushin/12
---
 conn_pool.go |  8 ++++++++
 server.go    | 45 +++++++++++++++++++++++++++++++++------------
 smtp.go      |  8 ++++----
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/conn_pool.go b/conn_pool.go
index 1ccc879..69281af 100644
--- a/conn_pool.go
+++ b/conn_pool.go
@@ -21,10 +21,18 @@ func generateToken() (string, error) {
 var ErrSessionExpired = errors.New("session expired")
 
 type Session struct {
+	locker sync.Mutex
 	imapConn           *imapclient.Client
 	username, password string
 }
 
+func (s *Session) Do(f func(*imapclient.Client) error) error {
+	s.locker.Lock()
+	defer s.locker.Unlock()
+
+	return f(s.imapConn)
+}
+
 // TODO: expiration timer
 type ConnPool struct {
 	locker   sync.Mutex
diff --git a/server.go b/server.go
index c4eb6d7..6dd7246 100644
--- a/server.go
+++ b/server.go
@@ -9,7 +9,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/emersion/go-imap"
 	imapclient "github.com/emersion/go-imap/client"
+	"github.com/emersion/go-message"
 	"github.com/emersion/go-sasl"
 	"github.com/labstack/echo/v4"
 )
@@ -95,7 +97,6 @@ type context struct {
 	echo.Context
 	server  *Server
 	session *Session
-	conn    *imapclient.Client
 }
 
 var aLongTimeAgo = time.Unix(233431200, 0)
@@ -152,7 +153,15 @@ func handleGetPart(ctx *context, raw bool) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 
-	msg, part, err := getMessagePart(ctx.conn, mboxName, uid, partPath)
+	var msg *imapMessage
+	var part *message.Entity
+	var mbox *imap.MailboxStatus
+	err = ctx.session.Do(func(c *imapclient.Client) error {
+		var err error
+		msg, part, err = getMessagePart(c, mboxName, uid, partPath)
+		mbox = c.Mailbox()
+		return err
+	})
 	if err != nil {
 		return err
 	}
@@ -192,7 +201,7 @@ func handleGetPart(ctx *context, raw bool) error {
 	}
 
 	return ctx.Render(http.StatusOK, "message.html", map[string]interface{}{
-		"Mailbox":  ctx.conn.Mailbox(),
+		"Mailbox":  mbox,
 		"Message":  msg,
 		"Body":     body,
 		"PartPath": partPathString,
@@ -290,7 +299,6 @@ func New(imapURL, smtpURL string) *echo.Echo {
 			} else if err != nil {
 				return err
 			}
-			ctx.conn = ctx.session.imapConn
 
 			return next(ctx)
 		}
@@ -304,18 +312,26 @@ func New(imapURL, smtpURL string) *echo.Echo {
 	e.GET("/mailbox/:mbox", func(ectx echo.Context) error {
 		ctx := ectx.(*context)
 
-		mailboxes, err := listMailboxes(ctx.conn)
-		if err != nil {
-			return err
-		}
-
-		msgs, err := listMessages(ctx.conn, ctx.Param("mbox"))
+		var mailboxes []*imap.MailboxInfo
+		var msgs []imapMessage
+		var mbox *imap.MailboxStatus
+		err = ctx.session.Do(func(c *imapclient.Client) error {
+			var err error
+			if mailboxes, err = listMailboxes(c); err != nil {
+				return err
+			}
+			if msgs, err = listMessages(c, ctx.Param("mbox")); err != nil {
+				return err
+			}
+			mbox = c.Mailbox()
+			return nil
+		})
 		if err != nil {
 			return err
 		}
 
 		return ctx.Render(http.StatusOK, "mailbox.html", map[string]interface{}{
-			"Mailbox":   ctx.conn.Mailbox(),
+			"Mailbox":   mbox,
 			"Mailboxes": mailboxes,
 			"Messages":  msgs,
 		})
@@ -335,9 +351,14 @@ func New(imapURL, smtpURL string) *echo.Echo {
 
 	e.GET("/logout", func(ectx echo.Context) error {
 		ctx := ectx.(*context)
-		if err := ctx.conn.Logout(); err != nil {
+
+		err := ctx.session.Do(func(c *imapclient.Client) error {
+			return c.Logout()
+		})
+		if err != nil {
 			return fmt.Errorf("failed to logout: %v", err)
 		}
+
 		ctx.setToken("")
 		return ctx.Redirect(http.StatusFound, "/login")
 	})
diff --git a/smtp.go b/smtp.go
index d1a37da..0ec1a92 100644
--- a/smtp.go
+++ b/smtp.go
@@ -2,8 +2,8 @@ package koushin
 
 import (
 	"fmt"
-	"time"
 	"io"
+	"time"
 
 	"github.com/emersion/go-message/mail"
 	"github.com/emersion/go-smtp"
@@ -34,10 +34,10 @@ func (s *Server) connectSMTP() (*smtp.Client, error) {
 }
 
 type OutgoingMessage struct {
-	From string
-	To []string
+	From    string
+	To      []string
 	Subject string
-	Text string
+	Text    string
 }
 
 func (msg *OutgoingMessage) WriteTo(w io.Writer) error {