Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: Safer user types

Browse Source
This commit is contained in:
James Houlahan
2022-10-12 00:20:04 +02:00
parent 4dc32dc7f2
commit fd63611b41
35 changed files with 1253 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/app/app.go
View File

@ -10,6 +10,7 @@ import (
"github.com/ProtonMail/proton-bridge/v2/internal/constants"
"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
"github.com/ProtonMail/proton-bridge/v2/internal/crash"
"github.com/ProtonMail/proton-bridge/v2/internal/events"
"github.com/ProtonMail/proton-bridge/v2/internal/focus"
bridgeCLI "github.com/ProtonMail/proton-bridge/v2/internal/frontend/cli"
"github.com/ProtonMail/proton-bridge/v2/internal/frontend/grpc"
@ -23,6 +24,7 @@ import (
"github.com/urfave/cli/v2"
)
// Visible flags
const (
flagCPUProfile = "cpu-prof"
flagCPUProfileShort = "p"
@ -40,8 +42,10 @@ const (
flagLogIMAP = "log-imap"
flagLogSMTP = "log-smtp"
)
// Hidden flags
// Hidden flags
const (
flagLauncher = "launcher"
flagNoWindow = "no-window"
)
@ -137,7 +141,7 @@ func run(c *cli.Context) error {
// Load the cookies from the vault.
return withCookieJar(vault, func(cookieJar http.CookieJar) error {
// Create a new bridge instance.
return withBridge(c, locations, identifier, reporter, vault, cookieJar, func(b *bridge.Bridge) error {
return withBridge(c, locations, identifier, reporter, vault, cookieJar, func(b *bridge.Bridge, eventCh <-chan events.Event) error {
if insecure {
logrus.Warn("The vault key could not be retrieved; the vault will not be encrypted")
b.PushError(bridge.ErrVaultInsecure)
@ -150,13 +154,13 @@ func run(c *cli.Context) error {
switch {
case c.Bool(flagCLI):
return bridgeCLI.New(b).Loop()
return bridgeCLI.New(b, eventCh).Loop()
case c.Bool(flagNonInteractive):
select {}
default:
service, err := grpc.NewService(crashHandler, restarter, locations, b, !c.Bool(flagNoWindow))
service, err := grpc.NewService(crashHandler, restarter, locations, b, eventCh, !c.Bool(flagNoWindow))
if err != nil {
return fmt.Errorf("could not create service: %w", err)
}

7
internal/app/bridge.go
View File

@ -12,6 +12,7 @@ import (
"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
"github.com/ProtonMail/proton-bridge/v2/internal/constants"
"github.com/ProtonMail/proton-bridge/v2/internal/dialer"
"github.com/ProtonMail/proton-bridge/v2/internal/events"
"github.com/ProtonMail/proton-bridge/v2/internal/locations"
"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
"github.com/ProtonMail/proton-bridge/v2/internal/updater"
@ -32,7 +33,7 @@ func withBridge(
reporter *sentry.Reporter,
vault *vault.Vault,
cookieJar http.CookieJar,
fn func(*bridge.Bridge) error,
fn func(*bridge.Bridge, <-chan events.Event) error,
) error {
// Get the current bridge version.
version, err := semver.NewVersion(constants.Version)
@ -64,7 +65,7 @@ func withBridge(
}
// Create a new bridge.
bridge, err := bridge.New(
bridge, eventCh, err := bridge.New(
// The app stuff.
locations,
vault,
@ -96,7 +97,7 @@ func withBridge(
}
}()
return fn(bridge)
return fn(bridge, eventCh)
}
func newAutostarter() (*autostart.App, error) {