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

GODT-1609: Fix tests

Browse Source
This commit is contained in:
James Houlahan
2022-10-04 18:15:12 +02:00
parent 6ac68984f2
commit 120ac6c480
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/smtp_backend.go
View File

@ -24,7 +24,7 @@ func (backend *smtpBackend) Login(state *smtp.ConnectionState, username, passwor
defer backend.usersLock.RUnlock() defer backend.usersLock.RUnlock()
for _, user := range backend.users { for _, user := range backend.users {
if slices.Contains(user.Emails(), username) && subtle.ConstantTimeCompare(user.BridgePass(), []byte(password)) != 1 { if slices.Contains(user.Emails(), username) && subtle.ConstantTimeCompare(user.BridgePass(), []byte(password)) == 1 {
return user.NewSMTPSession(username), nil return user.NewSMTPSession(username), nil
} }
} }

5
internal/vault/user_test.go
View File

@ -1,6 +1,7 @@
package vault_test package vault_test
import ( import (
"encoding/hex"
"testing" "testing"
"github.com/ProtonMail/gluon/imap" "github.com/ProtonMail/gluon/imap"
@ -52,7 +53,7 @@ func TestUser(t *testing.T) {
// Get auth information for user 1. // Get auth information for user 1.
require.Equal(t, "userID1", user1.UserID()) require.Equal(t, "userID1", user1.UserID())
require.Equal(t, "user1", user1.Username()) require.Equal(t, "user1", user1.Username())
require.Equal(t, []byte("token"), user1.BridgePass()) require.Equal(t, hex.EncodeToString([]byte("token")), string(user1.BridgePass()))
require.Equal(t, vault.CombinedMode, user1.AddressMode()) require.Equal(t, vault.CombinedMode, user1.AddressMode())
require.Equal(t, "authUID1", user1.AuthUID()) require.Equal(t, "authUID1", user1.AuthUID())
require.Equal(t, "authRef1", user1.AuthRef()) require.Equal(t, "authRef1", user1.AuthRef())
@ -72,7 +73,7 @@ func TestUser(t *testing.T) {
// Get auth information for user 2. // Get auth information for user 2.
require.Equal(t, "userID2", user2.UserID()) require.Equal(t, "userID2", user2.UserID())
require.Equal(t, "user2", user2.Username()) require.Equal(t, "user2", user2.Username())
require.Equal(t, []byte("token"), user2.BridgePass()) require.Equal(t, hex.EncodeToString([]byte("token")), string(user2.BridgePass()))
require.Equal(t, vault.CombinedMode, user2.AddressMode()) require.Equal(t, vault.CombinedMode, user2.AddressMode())
require.Equal(t, "authUID2", user2.AuthUID()) require.Equal(t, "authUID2", user2.AuthUID())
require.Equal(t, "authRef2", user2.AuthRef()) require.Equal(t, "authRef2", user2.AuthRef())

8
tests/ctx_test.go
View File

@ -49,7 +49,7 @@ type testCtx struct {
userIDByName map[string]string userIDByName map[string]string
userAddrByEmail map[string]map[string]string userAddrByEmail map[string]map[string]string
userPassByID map[string]string userPassByID map[string]string
userBridgePassByID map[string]string userBridgePassByID map[string][]byte
// These are the IMAP and SMTP clients used to connect to bridge. // These are the IMAP and SMTP clients used to connect to bridge.
imapClients map[string]*imapClient imapClients map[string]*imapClient
@ -89,7 +89,7 @@ func newTestCtx(tb testing.TB) *testCtx {
userIDByName: make(map[string]string), userIDByName: make(map[string]string),
userAddrByEmail: make(map[string]map[string]string), userAddrByEmail: make(map[string]map[string]string),
userPassByID: make(map[string]string), userPassByID: make(map[string]string),
userBridgePassByID: make(map[string]string), userBridgePassByID: make(map[string][]byte),
imapClients: make(map[string]*imapClient), imapClients: make(map[string]*imapClient),
smtpClients: make(map[string]*smtpClient), smtpClients: make(map[string]*smtpClient),
@ -148,10 +148,10 @@ func (t *testCtx) setUserPass(userID, pass string) {
} }
func (t *testCtx) getUserBridgePass(userID string) string { func (t *testCtx) getUserBridgePass(userID string) string {
return t.userBridgePassByID[userID] return string(t.userBridgePassByID[userID])
} }
func (t *testCtx) setUserBridgePass(userID, pass string) { func (t *testCtx) setUserBridgePass(userID string, pass []byte) {
t.userBridgePassByID[userID] = pass t.userBridgePassByID[userID] = pass
} }

2
tests/user_test.go
View File

@ -162,7 +162,7 @@ func (s *scenario) theAddressOfAccountHasMessagesInMailbox(address, username str
} }
func (s *scenario) userLogsInWithUsernameAndPassword(username, password string) error { func (s *scenario) userLogsInWithUsernameAndPassword(username, password string) error {
userID, err := s.t.bridge.LoginUser(context.Background(), username, password, nil, nil) userID, err := s.t.bridge.LoginUser(context.Background(), username, []byte(password), nil, nil)
if err != nil { if err != nil {
s.t.pushError(err) s.t.pushError(err)
} else { } else {