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

GODT-1609: Fix bridge password encoding

Browse Source
This commit is contained in:
James Houlahan
2022-10-04 17:50:44 +02:00
parent 51633e000b
commit 6ac68984f2
9 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/vault/token.go
View File

@ -1,6 +1,8 @@
package vault
import (
"encoding/hex"
"github.com/ProtonMail/gopenpgp/v2/crypto"
)
@ -16,3 +18,12 @@ func newRandomToken(size int) []byte {
return token
}
func newRandomString(size int) []byte {
token, err := RandomToken(size)
if err != nil {
panic(err)
}
return []byte(hex.EncodeToString(token))
}

4
internal/vault/vault.go
View File

@ -91,7 +91,7 @@ func (vault *Vault) ForUser(fn func(*User) error) error {
}
// AddUser creates a new user in the vault with the given ID and username.
// A bridge password is generated using the package's token generator.
// A bridge password and gluon key are generated using the package's token generator.
func (vault *Vault) AddUser(userID, username, authUID, authRef string, keyPass []byte) (*User, error) {
if idx := xslices.IndexFunc(vault.get().Users, func(user UserData) bool {
return user.UserID == userID
@ -107,7 +107,7 @@ func (vault *Vault) AddUser(userID, username, authUID, authRef string, keyPass [
GluonKey: newRandomToken(32),
GluonIDs: make(map[string]string),
UIDValidity: make(map[string]imap.UID),
BridgePass: newRandomToken(16),
BridgePass: newRandomString(16),
AddressMode: CombinedMode,
AuthUID: authUID,