Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Simplify retention (#2159)

Leendert de Borst2bfa705adcfc
diff --git a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
index b022b9619..e06a24a16 100644
--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
@@ -55,7 +55,6 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont
new WeeklyRetentionRule { WeeksToKeep = 1 },
new MonthlyRetentionRule { MonthsToKeep = 1 },
new DbVersionRetentionRule { VersionsToKeep = 2 },
- new LoginCredentialRetentionRule { CredentialsToKeep = 2 },
],
};
diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
index ef6fcb935..b53078c22 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
@@ -70,7 +70,6 @@ public class VaultController(
new WeeklyRetentionRule { WeeksToKeep = 1 },
new MonthlyRetentionRule { MonthsToKeep = 1 },
new DbVersionRetentionRule { VersionsToKeep = 2 },
- new LoginCredentialRetentionRule { CredentialsToKeep = 2 },
],
};
diff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs
deleted file mode 100644
index 7b6e4b7b8..000000000
--- a/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="LoginCredentialRetentionRule.cs" company="aliasvault">
-// Copyright (c) aliasvault. All rights reserved.
-// Licensed under the AGPLv3 license. See LICENSE.md file in the project root for full license information.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace AliasVault.Api.Vault.RetentionRules;
-
-using AliasServerDb;
-
-/// <summary>
-/// Credential retention rule that keeps the latest X unique login credentials and vaults associated with it. Only
-/// applies to manifest revisions (other revision types carry no credentials); it keeps nothing extra for other types.
-/// </summary>
-public class LoginCredentialRetentionRule : IRetentionRule
-{
- /// <summary>
- /// Gets or sets amount of unique login credentials to keep including the vault.
- /// </summary>
- public int CredentialsToKeep { get; set; }
-
- /// <inheritdoc cref="IRetentionRule.ApplyRule"/>
- public IEnumerable<IVaultRevision> ApplyRule(List<IVaultRevision> revisions, DateTime now)
- {
- // For the specified amount of versions, take last vault per version.
- return revisions
- .OfType<VaultManifestBase>()
- .GroupBy(x => new { x.Salt, x.Verifier })
- .Select(g => g.OrderByDescending(x => x.UpdatedAt).First())
- .OrderByDescending(x => x.UpdatedAt)
- .Take(CredentialsToKeep);
- }
-}
diff --git a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/BucketRetentionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/BucketRetentionTests.cs
index 6b938e16c..6fb4cc2cf 100644
--- a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/BucketRetentionTests.cs
+++ b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/BucketRetentionTests.cs
@@ -91,20 +91,14 @@ public class BucketRetentionTests
}
/// <summary>
- /// Test that manifest-specific rules keep nothing extra for bucket revisions, as buckets carry no db version or
- /// login credentials.
+ /// Test that manifest-specific rules keep nothing extra for bucket revisions, as buckets carry no db version.
/// </summary>
[Test]
public void ManifestOnlyRulesIgnoreBucketRevisionsTest()
{
var versionRule = new DbVersionRetentionRule { VersionsToKeep = 5 };
- var credentialRule = new LoginCredentialRetentionRule { CredentialsToKeep = 5 };
- Assert.Multiple(() =>
- {
- Assert.That(versionRule.ApplyRule([.. testRevisions], now), Is.Empty);
- Assert.That(credentialRule.ApplyRule([.. testRevisions], now), Is.Empty);
- });
+ Assert.That(versionRule.ApplyRule([.. testRevisions], now), Is.Empty);
}
/// <summary>
diff --git a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs
index 5280ec8c1..2b09e7ffb 100644
--- a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs
+++ b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs
@@ -143,28 +143,6 @@ public class GeneralRetentionTests
});
}
- /// <summary>
- /// Test the LoginCredentialRetentionRule.
- /// </summary>
- [Test]
- public void CredentialRetentionRuleTest()
- {
- // Keep the latest 2 unique credentials.
- var rule = new LoginCredentialRetentionRule { CredentialsToKeep = 2 };
- var result = rule.ApplyRule([.. testVaults], now).ToList();
-
- // Expecting two vaults to be kept:
- // - the latest
- // - the one from 2 weeks ago
- // The oldest vault should be excluded as that is the 3rd unique credential.
- Assert.Multiple(() =>
- {
- Assert.That(result, Has.Count.EqualTo(2));
- Assert.That(result[0].UpdatedAt, Is.EqualTo(new DateTime(2023, 5, 31, 12, 0, 0)));
- Assert.That(result[1].UpdatedAt, Is.EqualTo(new DateTime(2023, 5, 18, 12, 0, 0)));
- });
- }
-
/// <summary>
/// Test the RevisionRetentionRule.
/// </summary>