yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Consider vault corrupt if it cannot be unmarshaled

Browse Source
This commit is contained in:
James Houlahan
2022-10-27 13:12:57 +02:00
parent b1ce2dd73f
commit d4c1016e55
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/vault/vault.go
View File

@ -223,9 +223,13 @@ func newVault(path, gluonDir string, gcm cipher.AEAD) (*Vault, bool, error) {
var corrupt bool
if _, err := decrypt(gcm, enc); err != nil {
if dec, err := decrypt(gcm, enc); err != nil {
corrupt = true
} else if err := msgpack.Unmarshal(dec, new(Data)); err != nil {
corrupt = true
}
if corrupt {
newEnc, err := initVault(path, gluonDir, gcm)
if err != nil {
return nil, false, err

33
internal/vault/vault_test.go
View File

@ -18,13 +18,15 @@
package vault_test
import (
"os"
"path/filepath"
"testing"
"github.com/ProtonMail/proton-bridge/v2/internal/vault"
"github.com/stretchr/testify/require"
)
func TestVaultCorrupt(t *testing.T) {
func TestVault_Corrupt(t *testing.T) {
vaultDir, gluonDir := t.TempDir(), t.TempDir()
{
@ -46,6 +48,35 @@ func TestVaultCorrupt(t *testing.T) {
}
}
func TestVault_Corrupt_JunkData(t *testing.T) {
vaultDir, gluonDir := t.TempDir(), t.TempDir()
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"))
require.NoError(t, err)
require.False(t, corrupt)
}
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"))
require.NoError(t, err)
require.False(t, corrupt)
}
{
f, err := os.OpenFile(filepath.Join(vaultDir, "vault.enc"), os.O_WRONLY, 0o600)
require.NoError(t, err)
defer f.Close() //nolint:errcheck
_, err = f.Write([]byte("junk data"))
require.NoError(t, err)
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"))
require.NoError(t, err)
require.True(t, corrupt)
}
}
func newVault(t *testing.T) *vault.Vault {
t.Helper()