GODT-1650: Send extras

internal/bridge/bridge_test.go

@@ -2,6 +2,7 @@ package bridge_test
 
 import (
 	"context"
+	"net/http"
 	"os"
 	"testing"
 	"time"
@@ -127,7 +128,7 @@ func TestBridge_UserAgent(t *testing.T) {
 			require.NoError(t, err)
 
 			// Assert that the user agent was sent to the API.
-			require.Contains(t, calls[len(calls)-1].Request.Header.Get("User-Agent"), bridge.GetCurrentUserAgent())
+			require.Contains(t, calls[len(calls)-1].Header.Get("User-Agent"), bridge.GetCurrentUserAgent())
 		})
 	})
 }
@@ -147,7 +148,7 @@ func TestBridge_Cookies(t *testing.T) {
 			_, err := bridge.LoginUser(context.Background(), username, password, nil, nil)
 			require.NoError(t, err)
 
-			cookie, err := calls[len(calls)-1].Request.Cookie("Session-Id")
+			cookie, err := (&http.Request{Header: calls[len(calls)-1].Header}).Cookie("Session-Id")
 			require.NoError(t, err)
 
 			sessionID = cookie.Value
@@ -155,7 +156,7 @@ func TestBridge_Cookies(t *testing.T) {
 
 		// Start bridge again and check that it uses the same session ID.
 		withBridge(t, ctx, s.GetHostURL(), dialer, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
-			cookie, err := calls[len(calls)-1].Request.Cookie("Session-Id")
+			cookie, err := (&http.Request{Header: calls[len(calls)-1].Header}).Cookie("Session-Id")
 			require.NoError(t, err)
 
 			require.Equal(t, sessionID, cookie.Value)
@@ -340,7 +341,7 @@ func withEnv(t *testing.T, tests func(ctx context.Context, server *server.Server
 	defer server.Close()
 
 	// Add test user.
-	_, _, err := server.AddUser(username, string(password), username+"@pm.me")
+	_, _, err := server.CreateUser(username, string(password), username+"@pm.me")
 	require.NoError(t, err)
 
 	// Generate a random vault key.

internal/bridge/smtp_backend.go

@@ -2,30 +2,36 @@ package bridge
 
 import (
 	"crypto/subtle"
+	"strings"
 	"sync"
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/bradenaw/juniper/xslices"
 	"github.com/emersion/go-smtp"
 	"golang.org/x/exp/slices"
 )
 
 type smtpBackend struct {
-	users     []*user.User
+	users     map[string]*user.User
 	usersLock sync.RWMutex
 }
 
 func newSMTPBackend() (*smtpBackend, error) {
-	return &smtpBackend{}, nil
+	return &smtpBackend{
+		users: make(map[string]*user.User),
+	}, nil
 }
 
-func (backend *smtpBackend) Login(state *smtp.ConnectionState, username, password string) (smtp.Session, error) {
+func (backend *smtpBackend) Login(state *smtp.ConnectionState, email, password string) (smtp.Session, error) {
 	backend.usersLock.RLock()
 	defer backend.usersLock.RUnlock()
 
 	for _, user := range backend.users {
-		if slices.Contains(user.Emails(), username) && subtle.ConstantTimeCompare(user.BridgePass(), []byte(password)) == 1 {
-			return user.NewSMTPSession(username), nil
+		if subtle.ConstantTimeCompare(user.BridgePass(), []byte(password)) != 1 {
+			continue
+		}
+
+		if email := strings.ToLower(email); slices.Contains(user.Emails(), email) {
+			return user.NewSMTPSession(email)
 		}
 	}
 
@@ -38,17 +44,15 @@ func (backend *smtpBackend) AnonymousLogin(state *smtp.ConnectionState) (smtp.Se
 
 // addUser adds the given user to the backend.
 // It returns an error if a user with the same ID already exists.
-func (backend *smtpBackend) addUser(user *user.User) error {
+func (backend *smtpBackend) addUser(newUser *user.User) error {
 	backend.usersLock.Lock()
 	defer backend.usersLock.Unlock()
 
-	for _, u := range backend.users {
-		if u.ID() == user.ID() {
-			return ErrUserAlreadyExists
-		}
+	if _, ok := backend.users[newUser.ID()]; ok {
+		return ErrUserAlreadyExists
 	}
 
-	backend.users = append(backend.users, user)
+	backend.users[newUser.ID()] = newUser
 
 	return nil
 }
@@ -59,13 +63,11 @@ func (backend *smtpBackend) removeUser(user *user.User) error {
 	backend.usersLock.Lock()
 	defer backend.usersLock.Unlock()
 
-	idx := xslices.Index(backend.users, user)
-
-	if idx < 0 {
+	if _, ok := backend.users[user.ID()]; !ok {
 		return ErrNoSuchUser
 	}
 
-	backend.users = append(backend.users[:idx], backend.users[idx+1:]...)
+	delete(backend.users, user.ID())
 
 	return nil
 }