Skip to content

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

Add algorithm key to object creation (#2159)

Leendert de Borst48b87f6b57b9
diff --git a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
index bf1954057..b022b9619 100644
--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
@@ -591,6 +591,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont
var newPublicKeyEntry = new VaultManifestDeliveryKey
{
VaultManifestId = personalManifestId,
+ Algorithm = VaultKeyAlgorithm.RsaOaepSha256,
PublicKey = newPublicKey,
IsPrimary = true,
CreatedAt = timeProvider.UtcNow,
diff --git a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs
index 9f0ffcb99..5d9f9485c 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs
@@ -507,6 +507,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
{
Id = Guid.NewGuid(),
UserId = user.Id,
+ Algorithm = VaultKeyAlgorithm.RsaOaepSha256,
PublicKey = model.AccountPublicKey!,
EncryptedPrivateKey = model.EncryptedAccountPrivateKey!,
IsPrimary = true,
diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
index a1867ba8a..f201d887d 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
@@ -478,6 +478,7 @@ public class VaultController(
{
Id = Guid.NewGuid(),
UserId = user.Id,
+ Algorithm = VaultKeyAlgorithm.RsaOaepSha256,
PublicKey = accountKeys.AccountPublicKey!,
EncryptedPrivateKey = accountKeys.EncryptedAccountPrivateKey!,
IsPrimary = true,
@@ -1299,6 +1300,7 @@ public class VaultController(
context.VaultManifestDeliveryKeys.Add(new VaultManifestDeliveryKey
{
VaultManifestId = vaultManifestId,
+ Algorithm = VaultKeyAlgorithm.RsaOaepSha256,
PublicKey = newPublicKey,
IsPrimary = true,
CreatedAt = timeProvider.UtcNow,
diff --git a/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs b/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
index 72b96d8f6..f6e13be2c 100644
--- a/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
+++ b/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
@@ -470,6 +470,7 @@ public class AliasServerDbContext : WorkerStatusDbContext, IDataProtectionKeyCon
.OnDelete(DeleteBehavior.Cascade);
builder.HasIndex(e => e.UserId).IsUnique().HasFilter("\"IsPrimary\"").HasDatabaseName("UX_UserGrantKeys_User_Primary");
+ builder.Property(e => e.Algorithm).HasConversion(v => VaultKeyAlgorithms.ToToken(v), v => VaultKeyAlgorithms.Parse(v));
});
/*
@@ -533,14 +534,19 @@ public class AliasServerDbContext : WorkerStatusDbContext, IDataProtectionKeyCon
// One active delivery key per manifest.
builder.HasIndex(k => k.VaultManifestId).IsUnique().HasFilter("\"IsPrimary\"").HasDatabaseName("UX_VaultManifestDeliveryKeys_Manifest_Primary");
+ builder.Property(k => k.Algorithm).HasConversion(v => VaultKeyAlgorithms.ToToken(v), v => VaultKeyAlgorithms.Parse(v));
});
// Configure MobileLoginRequest - AliasVaultUser relationship
- modelBuilder.Entity<MobileLoginRequest>()
- .HasOne(m => m.User)
- .WithMany()
- .HasForeignKey(m => m.UserId)
- .OnDelete(DeleteBehavior.Cascade);
+ modelBuilder.Entity<MobileLoginRequest>(builder =>
+ {
+ builder.HasOne(m => m.User)
+ .WithMany()
+ .HasForeignKey(m => m.UserId)
+ .OnDelete(DeleteBehavior.Cascade);
+
+ builder.Property(m => m.Algorithm).HasConversion(v => VaultKeyAlgorithms.ToToken(v), v => VaultKeyAlgorithms.Parse(v));
+ });
// Configure VaultDataBucket.
modelBuilder.Entity<VaultDataBucket>(builder =>
diff --git a/apps/server/Databases/AliasServerDb/Migrations/AliasServerDbContextModelSnapshot.cs b/apps/server/Databases/AliasServerDb/Migrations/AliasServerDbContextModelSnapshot.cs
index c3aa31ed2..d9607aecc 100644
--- a/apps/server/Databases/AliasServerDb/Migrations/AliasServerDbContextModelSnapshot.cs
+++ b/apps/server/Databases/AliasServerDb/Migrations/AliasServerDbContextModelSnapshot.cs
@@ -878,6 +878,11 @@ namespace AliasServerDb.Migrations
b.Property<string>("Id")
.HasColumnType("text");
+ b.Property<string>("Algorithm")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)");
+
b.Property<DateTime?>("ClearedAt")
.HasColumnType("timestamp with time zone");
@@ -1044,6 +1049,11 @@ namespace AliasServerDb.Migrations
b.Property<int>("AccountKeyVersion")
.HasColumnType("integer");
+ b.Property<string>("Algorithm")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)");
+
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
@@ -1398,6 +1408,11 @@ namespace AliasServerDb.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
+ b.Property<string>("Algorithm")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)");
+
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
diff --git a/apps/server/Databases/AliasServerDb/MobileLoginRequest.cs b/apps/server/Databases/AliasServerDb/MobileLoginRequest.cs
index dfe34dbac..386e835e2 100644
--- a/apps/server/Databases/AliasServerDb/MobileLoginRequest.cs
+++ b/apps/server/Databases/AliasServerDb/MobileLoginRequest.cs
@@ -7,6 +7,8 @@
namespace AliasServerDb;
+using System.ComponentModel.DataAnnotations;
+using AliasVault.Shared.Models.Enums;
using Microsoft.EntityFrameworkCore;
/// <summary>
@@ -24,6 +26,13 @@ public class MobileLoginRequest
/// </summary>
public string Id { get; set; } = string.Empty;
+ /// <summary>
+ /// Gets or sets the algorithm <see cref="ClientPublicKey"/> is for, which is what the mobile app must
+ /// encrypt <see cref="EncryptedDecryptionKey"/> with.
+ /// </summary>
+ [StringLength(30)]
+ public VaultKeyAlgorithm Algorithm { get; set; } = VaultKeyAlgorithm.RsaOaepSha256;
+
/// <summary>
/// Gets or sets the public key from the client (base64 encoded).
/// </summary>
diff --git a/apps/server/Databases/AliasServerDb/UserGrantKey.cs b/apps/server/Databases/AliasServerDb/UserGrantKey.cs
index 6d7eba9c2..b38a9353d 100644
--- a/apps/server/Databases/AliasServerDb/UserGrantKey.cs
+++ b/apps/server/Databases/AliasServerDb/UserGrantKey.cs
@@ -8,6 +8,7 @@ namespace AliasServerDb;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+using AliasVault.Shared.Models.Enums;
/// <summary>
/// A user's account-level asymmetric keypair, used exclusively for encrypting shared-manifest VEK
@@ -34,6 +35,12 @@ public class UserGrantKey
[ForeignKey("UserId")]
public virtual AliasVaultUser User { get; set; } = null!;
+ /// <summary>
+ /// Gets or sets the algorithm this keypair is for, which is what a sharer must encrypt a VEK with.
+ /// </summary>
+ [StringLength(30)]
+ public required VaultKeyAlgorithm Algorithm { get; set; }
+
/// <summary>
/// Gets or sets the public half (JWK).
/// </summary>
diff --git a/apps/server/Databases/AliasServerDb/VaultManifestDeliveryKey.cs b/apps/server/Databases/AliasServerDb/VaultManifestDeliveryKey.cs
index 7e2fdbb07..7dd076178 100644
--- a/apps/server/Databases/AliasServerDb/VaultManifestDeliveryKey.cs
+++ b/apps/server/Databases/AliasServerDb/VaultManifestDeliveryKey.cs
@@ -8,6 +8,7 @@ namespace AliasServerDb;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+using AliasVault.Shared.Models.Enums;
/// <summary>
/// VaultManifestDeliveryKey object: the published public half of a manifest's asymmetric keypair.
@@ -31,6 +32,12 @@ public class VaultManifestDeliveryKey
[ForeignKey("VaultManifestId")]
public virtual VaultManifest VaultManifest { get; set; } = null!;
+ /// <summary>
+ /// Gets or sets the algorithm this key is for, which is what a sender must encrypt to it with.
+ /// </summary>
+ [StringLength(30)]
+ public required VaultKeyAlgorithm Algorithm { get; set; }
+
/// <summary>
/// Gets or sets the public key.
/// </summary>
diff --git a/apps/server/Tests/AliasVault.IntegrationTests/TestUserSeeder.cs b/apps/server/Tests/AliasVault.IntegrationTests/TestUserSeeder.cs
index ef49bd94f..04b0efe84 100644
--- a/apps/server/Tests/AliasVault.IntegrationTests/TestUserSeeder.cs
+++ b/apps/server/Tests/AliasVault.IntegrationTests/TestUserSeeder.cs
@@ -8,6 +8,7 @@
namespace AliasVault.IntegrationTests;
using AliasServerDb;
+using AliasVault.Shared.Models.Enums;
/// <summary>
/// Helper that seeds a test user with their personal group, owner membership, vault manifest and primary delivery key.
@@ -52,7 +53,7 @@ public static class TestUserSeeder
dbContext.VaultManifests.Add(manifest);
// At most one primary delivery key exists per manifest (unique filtered index).
- var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = manifest.ManifestId, PublicKey = publicKey, IsPrimary = true, CreatedAt = now, UpdatedAt = now };
+ var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = manifest.ManifestId, Algorithm = VaultKeyAlgorithm.RsaOaepSha256, PublicKey = publicKey, IsPrimary = true, CreatedAt = now, UpdatedAt = now };
dbContext.VaultManifestDeliveryKeys.Add(deliveryKey);
await dbContext.SaveChangesAsync();
diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs
index cb64390f1..43f35d78a 100644
--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs
+++ b/apps/server/Tests/AliasVault.UnitTests/Utilities/EmailEncryptionTests.cs
@@ -11,6 +11,7 @@ using System.IO.Compression;
using System.Text;
using AliasServerDb;
using AliasVault.Cryptography.Server;
+using AliasVault.Shared.Models.Enums;
/// <summary>
/// Tests for the EmailEncryption class, covering the source-only storage format (gzipped MessageSourceBytes)
@@ -31,7 +32,7 @@ public class EmailEncryptionTests
email.MessageSourceBytes = gzippedSource;
email.AttachmentCount = 1;
- var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = Guid.NewGuid(), PublicKey = RsaEncryptionTests.PublicKey, IsPrimary = true };
+ var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = Guid.NewGuid(), Algorithm = VaultKeyAlgorithm.RsaOaepSha256, PublicKey = RsaEncryptionTests.PublicKey, IsPrimary = true };
var encrypted = EmailEncryption.EncryptEmail(email, [deliveryKey]);
Assert.Multiple(() =>
{
@@ -68,7 +69,7 @@ public class EmailEncryptionTests
email.MessagePlain = "Legacy plain body";
email.MessageHtml = "<p>Legacy html body</p>";
- var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = Guid.NewGuid(), PublicKey = RsaEncryptionTests.PublicKey, IsPrimary = true };
+ var deliveryKey = new VaultManifestDeliveryKey { Id = Guid.NewGuid(), VaultManifestId = Guid.NewGuid(), Algorithm = VaultKeyAlgorithm.RsaOaepSha256, PublicKey = RsaEncryptionTests.PublicKey, IsPrimary = true };
var encrypted = EmailEncryption.EncryptEmail(email, [deliveryKey]);
Assert.Multiple(() =>
{