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

GODT-1609: use byte array for password

Browse Source
This commit is contained in:
Romain LE JEUNE
2022-10-03 21:12:00 +02:00
committed by James Houlahan
parent 3b5f931f06
commit b536b8707e
20 changed files with 64 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/vault/user.go
View File

@ -1,8 +1,6 @@
package vault
import (
"encoding/hex"
"github.com/ProtonMail/gluon/imap"
)
@ -52,8 +50,8 @@ func (user *User) AddressMode() AddressMode {
return user.vault.getUser(user.userID).AddressMode
}
func (user *User) BridgePass() string {
return hex.EncodeToString(user.vault.getUser(user.userID).BridgePass)
func (user *User) BridgePass() []byte {
return user.vault.getUser(user.userID).BridgePass
}
func (user *User) AuthUID() string {

5
internal/vault/user_test.go
View File

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