feat: persist sessions

Author: ItsNotGoodName

config/config.go

@@ -18,6 +18,7 @@ import (
 
 type Config struct {
 	DatabasePath         string
+	SessionsPath         string
 	AttachmentsDirectory string
 	HTTPDisable          bool
 	HTTPAddress          string
@@ -47,6 +48,7 @@ func Parse(raw Raw) (Config, error) {
 	}
 
 	databasePath := path.Join(dataDirectory, "smtpbridge.db")
+	sessionsPath := path.Join(dataDirectory, "sessions.db")
 
 	attachmentsDirectory := path.Join(dataDirectory, "attachments")
 	if err := os.MkdirAll(attachmentsDirectory, 0755); err != nil {
@@ -140,6 +142,7 @@ func Parse(raw Raw) (Config, error) {
 
 	return Config{
 		DatabasePath:         databasePath,
+		SessionsPath:         sessionsPath,
 		AttachmentsDirectory: attachmentsDirectory,
 		HTTPDisable:          raw.HTTP.Disable,
 		HTTPAddress:          raw.HTTP.Host + ":" + strconv.Itoa(raw.HTTP.Port),

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
 	github.com/emersion/go-smtp v0.16.0
 	github.com/gofiber/fiber/v2 v2.48.0
+	github.com/gofiber/storage/bbolt v1.3.5
 	github.com/gofiber/template/html/v2 v2.0.4
 	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
 	github.com/jhillyerd/enmime v1.0.0
@@ -49,6 +50,7 @@ require (
 	github.com/valyala/tcplisten v1.0.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	go.etcd.io/bbolt v1.3.7 // indirect
 	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/net v0.8.0 // indirect

go.sum

@@ -285,6 +285,8 @@ github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofiber/fiber/v2 v2.48.0 h1:cRVMCb9aUJDsyHxGFLwz/sGzDggdailZZyptU9F9cU0=
 github.com/gofiber/fiber/v2 v2.48.0/go.mod h1:xqJgfqrc23FJuqGOW6DVgi3HyZEm2Mn9pRqUb2kHSX8=
+github.com/gofiber/storage/bbolt v1.3.5 h1:9ZDMTbeah5tfj3eX+hFu3F1AHiBO117ce3Gel7tkxlk=
+github.com/gofiber/storage/bbolt v1.3.5/go.mod h1:GibrOAQTFOzzzWWVCgq+V+gS8dUbaPeAMGI4FNZ32sI=
 github.com/gofiber/template v1.8.2 h1:PIv9s/7Uq6m+Fm2MDNd20pAFFKt5wWs7ZBd8iV9pWwk=
 github.com/gofiber/template v1.8.2/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8=
 github.com/gofiber/template/html/v2 v2.0.4 h1:exZDo23hrYRqxoX4vPkJj31yxXTmlFEu2aHd+XmJmLM=
@@ -637,6 +639,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=
 go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ=
 go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4=

main.go

@@ -75,7 +75,7 @@ func run(ctx context.Context, shutdown context.CancelFunc, cli config.CLI) <-cha
 
 	// HTTP
 	if !cfg.HTTPDisable {
-		http := http.New(app, shutdown, cfg.HTTPAddress, cfg.HTTPBodyLimit)
+		http := http.New(app, shutdown, cfg.HTTPAddress, cfg.HTTPBodyLimit, cfg.SessionsPath)
 		backgrounds = append(backgrounds, http)
 	}
 

web/http/http.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/fiber/v2/middleware/recover"
 	"github.com/gofiber/fiber/v2/middleware/session"
+	"github.com/gofiber/storage/bbolt"
 	"github.com/rs/zerolog/log"
 )
 
@@ -21,8 +22,12 @@ type HTTP struct {
 	address  string
 }
 
-func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit int) HTTP {
-	store := session.New()
+func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit int, sessionsPath string) HTTP {
+	store := session.New(session.Config{
+		Storage: bbolt.New(bbolt.Config{
+			Database: sessionsPath,
+		}),
+	})
 
 	// Fiber
 	views := web.Engine()

web/views/partials/header.html

@@ -10,7 +10,7 @@
     </ul>
     <ul class=" block lg:hidden">
       <li class="p-0 flex flex-items-center h-full">
-        <details role="list" dir="rtl" open>
+        <details role="list" dir="rtl">
           <summary aria-haspopup="listbox" class="block pico-no-chevron">
             <div class=" i-ri-align-justify h-6 w-6" />
           </summary>