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: 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

8
internal/bridge/user.go
View File

@ -32,7 +32,7 @@ type UserInfo struct {
AddressMode vault.AddressMode
// BridgePass is the user's bridge password.
BridgePass string
BridgePass []byte
// UsedSpace is the amount of space used by the user.
UsedSpace int
@ -76,11 +76,11 @@ func (bridge *Bridge) QueryUserInfo(query string) (UserInfo, error) {
// If necessary, a TOTP and mailbox password are requested via the callbacks.
func (bridge *Bridge) LoginUser(
ctx context.Context,
username, password string,
username string, password []byte,
getTOTP func() (string, error),
getKeyPass func() ([]byte, error),
) (string, error) {
client, auth, err := bridge.api.NewClientWithLogin(ctx, username, password)
client, auth, err := bridge.api.NewClientWithLogin(ctx, username, string(password))
if err != nil {
return "", err
}
@ -106,7 +106,7 @@ func (bridge *Bridge) LoginUser(
keyPass = pass
} else {
keyPass = []byte(password)
keyPass = password
}
apiUser, apiAddrs, userKR, addrKRs, saltedKeyPass, err := client.Unlock(ctx, keyPass)