Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-22 10:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other(refactor): Move TLS to Bridge

Browse Source
This commit is contained in:
James Houlahan
2022-08-18 15:34:27 +02:00
committed by Jakub
parent 743a2f8dac
commit 2aaec3b6bd
10 changed files with 101 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/context/bridge.go
View File

@ -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,