yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Other: Fix IMAP/SMTP/Login leaks/race conditions

Browse Source 
Depending on the timing of bridge closure, it was possible for the 
IMAP/SMTP servers to not have started serving yet. By grouping this in
a cancelable goroutine group (*xsync.Group), we mitigate this issue.

Further, depending on internet disconnection timing during user login,
it was possible for a user to be improperly logged in. This change 
fixes this and adds test coverage for it.

Lastly, depending on timing, certain background tasks (updates check,
connectivity ping) could be improperly started or closed. This change
groups them in the *xsync.Group as well to be closed properly.
This commit is contained in:
James Houlahan
2022-10-24 13:25:11 +02:00
parent 828385b049
commit 6fbf6d90dc
13 changed files with 518 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/bridge/smtp_backend.go
View File

@ -21,16 +21,17 @@ import (
"fmt"
"io"
"github.com/ProtonMail/proton-bridge/v2/internal/safe"
"github.com/ProtonMail/proton-bridge/v2/internal/user"
"github.com/emersion/go-smtp"
)
type smtpBackend struct {
bridge *Bridge
users *safe.Map[string, *user.User]
}
type smtpSession struct {
bridge *Bridge
users *safe.Map[string, *user.User]
userID string
authID string
@ -41,12 +42,12 @@ type smtpSession struct {
func (be *smtpBackend) NewSession(_ *smtp.Conn) (smtp.Session, error) {
return &smtpSession{
bridge: be.bridge,
users: be.users,
}, nil
}
func (s *smtpSession) AuthPlain(username, password string) error {
return s.bridge.users.ValuesErr(func(users []*user.User) error {
return s.users.ValuesErr(func(users []*user.User) error {
for _, user := range users {
addrID, err := user.CheckAuth(username, []byte(password))
if err != nil {
@ -87,7 +88,7 @@ func (s *smtpSession) Rcpt(to string) error {
}
func (s *smtpSession) Data(r io.Reader) error {
if ok, err := s.bridge.users.GetErr(s.userID, func(user *user.User) error {
if ok, err := s.users.GetErr(s.userID, func(user *user.User) error {
return user.SendMail(s.authID, s.from, s.to, r)
}); !ok {
return fmt.Errorf("no such user %q", s.userID)