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

fix(GODT-3102): Distinguish Vault Decryption from Serialization Errors

Browse Source 
Rather than returning whether the vault was corrupt or not return the
error which caused the vault to be considered as corrupt.
This commit is contained in:
Leander Beernaert
2023-11-30 08:31:14 +01:00
parent 7a1c7e8743
commit 1b22c32ef9
10 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/vault/vault_test.go
View File

@ -34,19 +34,19 @@ func TestVault_Corrupt(t *testing.T) {
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.False(t, corrupt)
require.NoError(t, corrupt)
}
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.False(t, corrupt)
require.NoError(t, corrupt)
}
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("bad key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.True(t, corrupt)
require.ErrorIs(t, corrupt, vault.ErrDecryptFailed)
}
}
@ -56,13 +56,13 @@ func TestVault_Corrupt_JunkData(t *testing.T) {
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.False(t, corrupt)
require.NoError(t, corrupt)
}
{
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.False(t, corrupt)
require.NoError(t, corrupt)
}
{
@ -75,7 +75,7 @@ func TestVault_Corrupt_JunkData(t *testing.T) {
_, corrupt, err := vault.New(vaultDir, gluonDir, []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.True(t, corrupt)
require.ErrorIs(t, corrupt, vault.ErrUnmarshal)
}
}
@ -103,7 +103,7 @@ func newVault(t *testing.T) *vault.Vault {
s, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
require.NoError(t, err)
require.False(t, corrupt)
require.NoError(t, corrupt)
return s
}