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

chore(GODT-2799): Move SMTP backend to SMTP service module

Browse Source
This commit is contained in:
Leander Beernaert
2023-07-18 15:19:34 +02:00
parent 8d028966c7
commit bc66841cdc
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/bridge/imap.go
View File

@ -50,16 +50,6 @@ func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
return bridge.serverManager.AddIMAPUser(ctx, user) return bridge.serverManager.AddIMAPUser(ctx, user)
} }
// addSMTPUser connects the given user to gluon.
func (bridge *Bridge) addSMTPUser(ctx context.Context, user *user.User) error {
return bridge.serverManager.AddSMTPAccount(ctx, user.GetSMTPService())
}
// removeSMTPUser connects the given user to gluon.
func (bridge *Bridge) removeSMTPUser(ctx context.Context, user *user.User) error {
return bridge.serverManager.RemoveSMTPAccount(ctx, user.GetSMTPService())
}
// removeIMAPUser disconnects the given user from gluon, optionally also removing its files. // removeIMAPUser disconnects the given user from gluon, optionally also removing its files.
func (bridge *Bridge) removeIMAPUser(ctx context.Context, user *user.User, withData bool) error { func (bridge *Bridge) removeIMAPUser(ctx context.Context, user *user.User, withData bool) error {
return bridge.serverManager.RemoveIMAPUser(ctx, user, withData) return bridge.serverManager.RemoveIMAPUser(ctx, user, withData)

17
internal/bridge/smtp.go
View File

@ -23,7 +23,8 @@ import (
"github.com/ProtonMail/proton-bridge/v3/internal/constants" "github.com/ProtonMail/proton-bridge/v3/internal/constants"
"github.com/ProtonMail/proton-bridge/v3/internal/logging" "github.com/ProtonMail/proton-bridge/v3/internal/logging"
bridgesmtp "github.com/ProtonMail/proton-bridge/v3/internal/services/smtp" smtpservice "github.com/ProtonMail/proton-bridge/v3/internal/services/smtp"
"github.com/ProtonMail/proton-bridge/v3/internal/user"
"github.com/emersion/go-sasl" "github.com/emersion/go-sasl"
"github.com/emersion/go-smtp" "github.com/emersion/go-smtp"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -33,10 +34,10 @@ func (bridge *Bridge) restartSMTP(ctx context.Context) error {
return bridge.serverManager.RestartSMTP(ctx) return bridge.serverManager.RestartSMTP(ctx)
} }
func newSMTPServer(bridge *Bridge, accounts *bridgesmtp.Accounts, tlsConfig *tls.Config, logSMTP bool) *smtp.Server { func newSMTPServer(bridge *Bridge, accounts *smtpservice.Accounts, tlsConfig *tls.Config, logSMTP bool) *smtp.Server {
logrus.WithField("logSMTP", logSMTP).Info("Creating SMTP server") logrus.WithField("logSMTP", logSMTP).Info("Creating SMTP server")
smtpServer := smtp.NewServer(&smtpBackend{userAgent: &bridgeUserAgentUpdater{Bridge: bridge}, accounts: accounts}) smtpServer := smtp.NewServer(smtpservice.NewBackend(accounts, &bridgeUserAgentUpdater{Bridge: bridge}))
smtpServer.TLSConfig = tlsConfig smtpServer.TLSConfig = tlsConfig
smtpServer.Domain = constants.Host smtpServer.Domain = constants.Host
@ -62,3 +63,13 @@ func newSMTPServer(bridge *Bridge, accounts *bridgesmtp.Accounts, tlsConfig *tls
return smtpServer return smtpServer
} }
// addSMTPUser connects the given user to the smtp server.
func (bridge *Bridge) addSMTPUser(ctx context.Context, user *user.User) error {
return bridge.serverManager.AddSMTPAccount(ctx, user.GetSMTPService())
}
// removeSMTPUser disconnects the given user from the smtp server.
func (bridge *Bridge) removeSMTPUser(ctx context.Context, user *user.User) error {
return bridge.serverManager.RemoveSMTPAccount(ctx, user.GetSMTPService())
}

20
internal/bridge/smtp_backend.go → internal/services/smtp/smtp_backend.go
View File

@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>. // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
package bridge package smtp
import ( import (
"context" "context"
@ -25,19 +25,25 @@ import (
"strings" "strings"
"github.com/ProtonMail/proton-bridge/v3/internal/identifier" "github.com/ProtonMail/proton-bridge/v3/internal/identifier"
smtpservice "github.com/ProtonMail/proton-bridge/v3/internal/services/smtp"
"github.com/ProtonMail/proton-bridge/v3/internal/useragent" "github.com/ProtonMail/proton-bridge/v3/internal/useragent"
"github.com/emersion/go-smtp" "github.com/emersion/go-smtp"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type smtpBackend struct { type Backend struct {
accounts *smtpservice.Accounts accounts *Accounts
userAgent identifier.UserAgentUpdater userAgent identifier.UserAgentUpdater
} }
func NewBackend(accounts *Accounts, userAgent identifier.UserAgentUpdater) *Backend {
return &Backend{
accounts: accounts,
userAgent: userAgent,
}
}
type smtpSession struct { type smtpSession struct {
accounts *smtpservice.Accounts accounts *Accounts
userAgent identifier.UserAgentUpdater userAgent identifier.UserAgentUpdater
userID string userID string
@ -47,14 +53,14 @@ type smtpSession struct {
to []string to []string
} }
func (be *smtpBackend) NewSession(*smtp.Conn) (smtp.Session, error) { func (be *Backend) NewSession(*smtp.Conn) (smtp.Session, error) {
return &smtpSession{accounts: be.accounts, userAgent: be.userAgent}, nil return &smtpSession{accounts: be.accounts, userAgent: be.userAgent}, nil
} }
func (s *smtpSession) AuthPlain(username, password string) error { func (s *smtpSession) AuthPlain(username, password string) error {
userID, authID, err := s.accounts.CheckAuth(username, []byte(password)) userID, authID, err := s.accounts.CheckAuth(username, []byte(password))
if err != nil { if err != nil {
if !errors.Is(err, smtpservice.ErrNoSuchUser) { if !errors.Is(err, ErrNoSuchUser) {
return fmt.Errorf("unknown error") return fmt.Errorf("unknown error")
} }
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{