Other(refactor): Move TLS to Bridge

test/context/bridge.go

@@ -23,6 +23,7 @@ import (
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
@@ -41,17 +42,18 @@ func (ctx *TestContext) GetBridge() *bridge.Bridge {
 // withBridgeInstance creates a bridge instance for use in the test.
 // TestContext has this by default once called with env variable TEST_APP=bridge.
 func (ctx *TestContext) withBridgeInstance() {
-	ctx.bridge = newBridgeInstance(ctx.t, ctx.locations, ctx.cache, ctx.settings, ctx.credStore, ctx.listener, ctx.clientManager)
+	ctx.bridge = newBridgeInstance(ctx.t, ctx.locations, ctx.cache, ctx.settings, ctx.tls, ctx.credStore, ctx.listener, ctx.clientManager)
 	ctx.users = ctx.bridge.Users
 	ctx.addCleanupChecked(ctx.bridge.ClearData, "Cleaning bridge data")
 }
 
 // RestartBridge closes store for each user and recreates a bridge instance the same way as `withBridgeInstance`.
 // NOTE: This is a very problematic method. It doesn't stop the goroutines doing the event loop and the sync.
-//       These goroutines can continue to run and can cause problems or unexpected behaviour (especially
-//       regarding authorization, because if an auth fails, it will log out the user).
-//       To truly emulate bridge restart, we need a way to immediately stop those goroutines.
-//       I have added a channel that waits up to one second for the event loop to stop, but that isn't great.
+//
+//	These goroutines can continue to run and can cause problems or unexpected behaviour (especially
+//	regarding authorization, because if an auth fails, it will log out the user).
+//	To truly emulate bridge restart, we need a way to immediately stop those goroutines.
+//	I have added a channel that waits up to one second for the event loop to stop, but that isn't great.
 func (ctx *TestContext) RestartBridge() error {
 	for _, user := range ctx.bridge.GetUsers() {
 		_ = user.GetStore().Close()
@@ -71,6 +73,7 @@ func newBridgeInstance(
 	locations bridge.Locator,
 	cacheProvider bridge.CacheProvider,
 	fakeSettings *fakeSettings,
+	tls *tls.TLS,
 	credStore users.CredentialsStorer,
 	eventListener listener.Listener,
 	clientManager pmapi.Manager,
@@ -82,6 +85,7 @@ func newBridgeInstance(
 		sentry.NewReporter("bridge", constants.Version, useragent.New()),
 		&panicHandler{t: t},
 		eventListener,
+		tls,
 		cache.NewInMemoryCache(100*(1<<20)),
 		message.NewBuilder(fakeSettings.GetInt(settings.FetchWorkers), fakeSettings.GetInt(settings.AttachmentWorkers)),
 		clientManager,

test/context/context.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/v2/internal/users"
 	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
@@ -43,6 +44,7 @@ type TestContext struct {
 	cache        *fakeCache
 	locations    *fakeLocations
 	settings     *fakeSettings
+	tls          *tls.TLS
 	listener     listener.Listener
 	userAgent    *useragent.UserAgent
 	testAccounts *accounts.TestAccounts
@@ -89,11 +91,15 @@ func New() *TestContext {
 	listener := listener.New()
 	pmapiController, clientManager := newPMAPIController(listener)
 
+	locations := newFakeLocations()
+	settingsPath, _ := locations.ProvideSettingsPath()
+
 	ctx := &TestContext{
 		t:                     &bddT{},
 		cache:                 newFakeCache(),
-		locations:             newFakeLocations(),
+		locations:             locations,
 		settings:              newFakeSettings(),
+		tls:                   tls.New(settingsPath),
 		listener:              listener,
 		userAgent:             useragent.New(),
 		pmapiController:       pmapiController,

test/context/imap.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
 	"github.com/ProtonMail/proton-bridge/v2/internal/imap"
 	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/stretchr/testify/require"
@@ -53,10 +52,9 @@ func (ctx *TestContext) withIMAPServer() {
 		return
 	}
 
-	settingsPath, _ := ctx.locations.ProvideSettingsPath()
 	ph := newPanicHandler(ctx.t)
 	port := ctx.settings.GetInt(settings.IMAPPortKey)
-	tls, _ := tls.New(settingsPath).GetConfig()
+	tls, _ := ctx.tls.GetConfig()
 
 	backend := imap.NewIMAPBackend(ph, ctx.listener, ctx.cache, ctx.settings, ctx.bridge)
 	server := imap.NewIMAPServer(ph, true, true, port, tls, backend, ctx.userAgent, ctx.listener)

test/context/smtp.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
 	"github.com/ProtonMail/proton-bridge/v2/internal/smtp"
 	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/stretchr/testify/require"
@@ -53,9 +52,8 @@ func (ctx *TestContext) withSMTPServer() {
 		return
 	}
 
-	settingsPath, _ := ctx.locations.ProvideSettingsPath()
 	ph := newPanicHandler(ctx.t)
-	tls, _ := tls.New(settingsPath).GetConfig()
+	tls, _ := ctx.tls.GetConfig()
 	port := ctx.settings.GetInt(settings.SMTPPortKey)
 	useSSL := ctx.settings.GetBool(settings.SMTPSSLKey)