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

Other: Don't encrypt vault version

Browse Source
This commit is contained in:
James Houlahan
2022-11-21 02:15:56 +01:00
parent 9868fae735
commit e6a780ebd4
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/vault/migrate_test.go
View File

@ -83,14 +83,17 @@ func newLegacyVault[T any](t *testing.T, key []byte, version Version, data T) []
gcm, err := cipher.NewGCM(aes) gcm, err := cipher.NewGCM(aes)
require.NoError(t, err) require.NoError(t, err)
b, err := msgpack.Marshal(data)
require.NoError(t, err)
dec, err := msgpack.Marshal(File{Version: version, Data: b})
require.NoError(t, err)
nonce, err := crypto.RandomToken(gcm.NonceSize()) nonce, err := crypto.RandomToken(gcm.NonceSize())
require.NoError(t, err) require.NoError(t, err)
return gcm.Seal(nonce, nonce, dec, nil) dec, err := msgpack.Marshal(data)
require.NoError(t, err)
res, err := msgpack.Marshal(File{
Version: version,
Data: gcm.Seal(nonce, nonce, dec, nil),
})
require.NoError(t, err)
return res
} }

31
internal/vault/types_file.go
View File

@ -30,28 +30,25 @@ type File struct {
Data []byte Data []byte
} }
func unmarshalFile[T any](gcm cipher.AEAD, enc []byte, data *T) error { func unmarshalFile[T any](gcm cipher.AEAD, b []byte, data *T) error {
dec, err := gcm.Open(nil, enc[:gcm.NonceSize()], enc[gcm.NonceSize():], nil) var f File
if err != nil {
if err := msgpack.Unmarshal(b, &f); err != nil {
return err return err
} }
var f File dec, err := gcm.Open(nil, f.Data[:gcm.NonceSize()], f.Data[gcm.NonceSize():], nil)
if err != nil {
if err := msgpack.Unmarshal(dec, &f); err != nil {
return err return err
} }
for v := f.Version; v < Current; v++ { for v := f.Version; v < Current; v++ {
b, err := upgrade(v, f.Data) if dec, err = upgrade(v, dec); err != nil {
if err != nil {
return err return err
} }
f.Data = b
} }
if err := msgpack.Unmarshal(f.Data, data); err != nil { if err := msgpack.Unmarshal(dec, data); err != nil {
return err return err
} }
@ -59,12 +56,7 @@ func unmarshalFile[T any](gcm cipher.AEAD, enc []byte, data *T) error {
} }
func marshalFile[T any](gcm cipher.AEAD, t T) ([]byte, error) { func marshalFile[T any](gcm cipher.AEAD, t T) ([]byte, error) {
b, err := msgpack.Marshal(t) dec, err := msgpack.Marshal(t)
if err != nil {
return nil, err
}
dec, err := msgpack.Marshal(File{Version: Current, Data: b})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -74,5 +66,8 @@ func marshalFile[T any](gcm cipher.AEAD, t T) ([]byte, error) {
return nil, err return nil, err
} }
return gcm.Seal(nonce, nonce, dec, nil), nil return msgpack.Marshal(File{
Version: Current,
Data: gcm.Seal(nonce, nonce, dec, nil),
})
} }