yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1816: Fix variable case conflict

Browse Source
This commit is contained in:
James Houlahan
2022-10-11 16:24:40 +02:00
parent 0f81286ff5
commit 245f2afeac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/bridge/imap.go
View File

@ -5,13 +5,14 @@ import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt" "fmt"
"github.com/ProtonMail/proton-bridge/v2/internal/logging"
"io" "io"
"io/fs" "io/fs"
"net" "net"
"os" "os"
"strconv" "strconv"
"github.com/ProtonMail/proton-bridge/v2/internal/logging"
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gluon" "github.com/ProtonMail/gluon"
imapEvents "github.com/ProtonMail/gluon/events" imapEvents "github.com/ProtonMail/gluon/events"
@ -113,11 +114,11 @@ func getGluonDir(encVault *vault.Vault) (string, error) {
return encVault.GetGluonDir(), nil return encVault.GetGluonDir(), nil
} }
func newIMAPServer(gluonDir string, version *semver.Version, tlsConfig *tls.Config, logIMAPCommandsClient, logImapCommandsServer bool) (*gluon.Server, error) { func newIMAPServer(gluonDir string, version *semver.Version, tlsConfig *tls.Config, logIMAPCommandsClient, logIMAPCommandsServer bool) (*gluon.Server, error) {
var imapClientLog io.Writer var imapClientLog io.Writer
var imapServerLog io.Writer var imapServerLog io.Writer
if logIMAPCommandsClient || logImapCommandsServer { if logIMAPCommandsClient || logIMAPCommandsServer {
log := logrus.WithField("protocol", "IMAP") log := logrus.WithField("protocol", "IMAP")
log.Warning("================================================") log.Warning("================================================")
log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA") log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")
@ -130,7 +131,7 @@ func newIMAPServer(gluonDir string, version *semver.Version, tlsConfig *tls.Conf
imapClientLog = io.Discard imapClientLog = io.Discard
} }
if logImapCommandsServer { if logIMAPCommandsServer {
imapServerLog = logging.NewIMAPLogger() imapServerLog = logging.NewIMAPLogger()
} else { } else {
imapClientLog = io.Discard imapClientLog = io.Discard