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

GODT-2023: Revert to v2 bridge password encoming format

Browse Source 
v2 used base64.RawURLEncoding rather than hex to encode the bridge
password. We should use that in v3 as well.
This commit is contained in:
James Houlahan
2022-11-02 14:23:55 +01:00
parent 4ded8784fc
commit 039d1b7f99
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/user/user.go
View File

@ -351,7 +351,7 @@ func (user *User) GluonKey() []byte {
// BridgePass returns the user's bridge password, used for authentication over SMTP and IMAP.
func (user *User) BridgePass() []byte {
return hexEncode(user.vault.BridgePass())
return b64Encode(user.vault.BridgePass())
}
// UsedSpace returns the total space used by the user on the API.
@ -526,7 +526,7 @@ func (user *User) SendMail(authID string, from string, to []string, r io.Reader)
// CheckAuth returns whether the given email and password can be used to authenticate over IMAP or SMTP with this user.
// It returns the address ID of the authenticated address.
func (user *User) CheckAuth(email string, password []byte) (string, error) {
dec, err := hexDecode(password)
dec, err := b64Decode(password)
if err != nil {
return "", fmt.Errorf("failed to decode password: %w", err)
}