Skip to content

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

Merge branch 'main' into 2159-transform-core-data-storage-model-prerequisite-for-familyvault-sharing

Leendert de Borst36012a18dca1
diff --cc apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
index fee8ad2da,6efd11c8e..0ed4e2d94
--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs
@@@ -17,9 -18,10 +18,10 @@@ using AliasVault.Auth
using AliasVault.Cryptography.Client;
using AliasVault.Shared.Models.Enums;
using AliasVault.Shared.Models.WebApi;
-using AliasVault.Shared.Models.WebApi.PasswordChange;
-using AliasVault.Shared.Models.WebApi.Vault;
+using AliasVault.Shared.Models.WebApi.V1.PasswordChange;
+using AliasVault.Shared.Models.WebApi.V1.Vault;
using AliasVault.Shared.Providers.Time;
+ using AliasVault.Shared.Server.Models;
using AliasVault.Shared.Server.Services;
using Asp.Versioning;
using Microsoft.AspNetCore.Identity;
@@@ -165,7 -155,11 +167,11 @@@ public class VaultController(ILogger<Va
}
// Retrieve latest vault of user which contains the current encryption settings.
- var latestVault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version, x.ManifestId }).First();
+ var latestVault = await context.Vaults
+ .Where(x => x.UserId == user.Id)
+ .OrderByDescending(x => x.RevisionNumber)
- .Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version })
++ .Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version, x.ManifestId })
+ .FirstAsync();
// Reject vaults with a version that is lower than the last vault version.
if (VersionHelper.IsVersionOlder(model.Version, latestVault.Version))
diff --cc apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
index 2d7e1bc42,9c09c508c..ae7cf5d26
--- a/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
+++ b/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
@@@ -148,21 -147,11 +148,26 @@@ public class AliasServerDbContext : Wor
/// </summary>
public DbSet<BlockedIpRange> BlockedIpRanges { get; set; }
+ /// <summary>
+ /// Gets or sets the VaultDataBuckets DbSet. These represent separately-syncable per-user, per-kind sync buckets. Separate from main manifest.
+ /// </summary>
+ public DbSet<VaultDataBucket> VaultDataBuckets { get; set; }
+
+ /// <summary>
+ /// Gets or sets the VaultBlobObjects DbSet. These represent encrypted blobs referenced by one or more vault revisions.
+ /// </summary>
+ public DbSet<VaultBlobObject> VaultBlobObjects { get; set; }
+
+ /// <summary>
+ /// Gets or sets the VaultBlobReferences DbSet. These represent references from vaults to encrypted blobs.
+ /// </summary>
+ public DbSet<VaultBlobReference> VaultBlobReferences { get; set; }
+
+ /// <summary>
+ /// Gets or sets the RateLimits DbSet.
+ /// </summary>
+ public DbSet<RateLimit> RateLimits { get; set; }
+
/// <summary>
/// Sets up the connection string if it is not already configured.
/// </summary>
@@@ -308,37 -291,11 +313,44 @@@
.HasForeignKey(m => m.UserId)
.OnDelete(DeleteBehavior.Cascade);
+ // Configure VaultDataBucket - Id PK with a revision history per (UserId, Kind).
+ modelBuilder.Entity<VaultDataBucket>(builder =>
+ {
+ builder.HasKey(e => e.RevisionId);
+ builder.Property(e => e.Category).HasConversion<string>().HasMaxLength(50);
+ builder.HasIndex(e => new { e.OwnerUserId, e.Category, e.RevisionNumber }).IsUnique();
+ builder.HasOne(e => e.User)
+ .WithMany()
+ .HasForeignKey(e => e.OwnerUserId)
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ // Configure VaultBlobObject - composite key (Hash, UserId).
+ modelBuilder.Entity<VaultBlobObject>(builder =>
+ {
+ builder.HasKey(e => new { e.Hash, e.OwnerUserId });
+ builder.HasIndex(e => new { e.OwnerUserId, e.Category });
+ builder.HasOne(e => e.User)
+ .WithMany()
+ .HasForeignKey(e => e.OwnerUserId)
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ // Configure VaultBlobReference - composite key (VaultId, BlobHash).
+ modelBuilder.Entity<VaultBlobReference>(builder =>
+ {
+ builder.HasKey(e => new { e.ManifestRevisionId, e.BlobHash });
+ builder.HasOne(e => e.ManifestRevision)
+ .WithMany()
+ .HasForeignKey(e => e.ManifestRevisionId)
+ .OnDelete(DeleteBehavior.Cascade);
+ });
++
+ // Configure RateLimit - AliasVaultUser relationship
+ modelBuilder.Entity<RateLimit>()
+ .HasOne(r => r.User)
+ .WithMany()
+ .HasForeignKey(r => r.UserId)
+ .OnDelete(DeleteBehavior.Cascade);
}
}