Skip to content

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

Add email routing manifest revision field, so server can check for outdatedness (#2469)

Leendert de Borst8a9463afc5b1
diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
index dd194fd8c..889b4a0a3 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
@@ -308,6 +308,17 @@ public class VaultController(
return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.VAULT_NOT_UP_TO_DATE, 400));
}
+ // A routing push names the revision it was built from for every manifest it speaks for, once each.
+ if (model.EmailRouting is { } routing)
+ {
+ var baseIds = routing.BaseRevisions.Select(r => r.ManifestId).ToList();
+ var spokenFor = routing.CoveredManifestIds.Concat(routing.EmailAddressList.Select(a => a.ManifestId));
+ if (baseIds.Distinct().Count() != baseIds.Count || spokenFor.Any(id => !baseIds.Contains(id)))
+ {
+ return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.VAULT_ERROR, 400));
+ }
+ }
+
// Decode base64-encoded ciphertexts into raw bytes.
var manifestBlobs = new Dictionary<Guid, byte[]>();
foreach (var mw in model.Manifests)
@@ -400,12 +411,24 @@ public class VaultController(
var manifestStale = resolved.Any(r => r.Row.RevisionNumber >= r.Write.CurrentRevision + 1);
var bucketStale = model.Buckets.Any(b => bucketCurrentRevisions[(b.ManifestId, b.Category)] >= b.CurrentRevision + 1);
- if (manifestStale || bucketStale)
+
+ // The routing set is built from the manifests the client read, so it is stale when any of them moved on since.
+ List<ManifestRevision> routingBaseRevisions = model.EmailRouting?.BaseRevisions ?? [];
+ var routingBaseIds = routingBaseRevisions.Select(r => r.ManifestId).Distinct().ToList();
+ var routingCurrentRevisions = routingBaseIds.Count == 0 ? new Dictionary<Guid, long>() : await ManifestAccessHelper.AccessibleManifests(context, accessScope)
+ .Where(x => routingBaseIds.Contains(x.ManifestId))
+ .ToDictionaryAsync(x => x.ManifestId, x => x.RevisionNumber);
+ var routingStale = routingBaseRevisions.Where(r => routingCurrentRevisions.TryGetValue(r.ManifestId, out var current) && current > r.Revision).Select(r => r.ManifestId).Distinct().ToList();
+
+ if (manifestStale || bucketStale || routingStale.Count > 0)
{
+ var staleRoutingOnly = routingStale.Where(id => resolved.All(r => r.Row.ManifestId != id));
return Ok(new VaultWriteResponse
{
Status = VaultStatus.Outdated,
- ManifestRevisions = resolved.Select(r => new ManifestWriteResult { ManifestId = r.Write.ManifestId, Revision = r.Row.RevisionNumber }).ToList(),
+ ManifestRevisions = resolved.Select(r => new ManifestWriteResult { ManifestId = r.Write.ManifestId, Revision = r.Row.RevisionNumber })
+ .Concat(staleRoutingOnly.Select(id => new ManifestWriteResult { ManifestId = id, Revision = routingCurrentRevisions[id] }))
+ .ToList(),
BucketRevisions = model.Buckets.Select(b => new BucketRevision { ManifestId = b.ManifestId, Category = b.Category, Revision = bucketCurrentRevisions[(b.ManifestId, b.Category)] }).ToList(),
});
}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRoutingPush.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRoutingPush.cs
index 7ecd1b441..8b2946d4e 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRoutingPush.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRoutingPush.cs
@@ -25,4 +25,10 @@ public class EmailRoutingPush
/// above, whether or not it holds any alias.
/// </summary>
public List<Guid> CoveredManifestIds { get; set; } = [];
+
+ /// <summary>
+ /// Gets or sets the revision of each covered manifest the address list was built from. The write is rejected as
+ /// outdated when any of them is behind the server.
+ /// </summary>
+ public required List<ManifestRevision> BaseRevisions { get; set; }
}
diff --git a/core/models/src/webapi/Login.ts b/core/models/src/webapi/Login.ts
index 8c00de2a4..91f89435e 100644
--- a/core/models/src/webapi/Login.ts
+++ b/core/models/src/webapi/Login.ts
@@ -14,4 +14,5 @@ export type LoginResponse = {
encryptionType: string;
encryptionSettings: string;
srpIdentity?: string;
+ loginSessionId: string;
}
diff --git a/core/models/src/webapi/ValidateLogin.ts b/core/models/src/webapi/ValidateLogin.ts
index f36a65422..10b737821 100644
--- a/core/models/src/webapi/ValidateLogin.ts
+++ b/core/models/src/webapi/ValidateLogin.ts
@@ -15,6 +15,7 @@ export type ValidateLoginRequest = {
rememberMe: boolean;
clientPublicEphemeral: string;
clientSessionProof: string;
+ loginSessionId: string;
legacyVerifierUpgrade?: LegacySrpVerifierUpgrade;
}
@@ -27,6 +28,7 @@ export type ValidateLoginRequest2Fa = {
rememberMe: boolean;
clientPublicEphemeral: string;
clientSessionProof: string;
+ loginSessionId: string;
legacyVerifierUpgrade?: LegacySrpVerifierUpgrade;
}
diff --git a/core/rust/src/vault_sync/email_routing.rs b/core/rust/src/vault_sync/email_routing.rs
index aa34f4228..ba173bcc4 100644
--- a/core/rust/src/vault_sync/email_routing.rs
+++ b/core/rust/src/vault_sync/email_routing.rs
@@ -4,7 +4,7 @@ use std::collections::{HashMap, HashSet};
use serde_json::Value;
-use super::types::{ClaimedEmailAddress, EmailRoutingPush};
+use super::types::{ClaimedEmailAddress, EmailRoutingPush, ManifestRevision};
use super::db::value_string;
use crate::vault_codec::row::{is_deleted, rows_of, str_col, truthy};
use crate::vault_codec::Manifest;
@@ -13,8 +13,8 @@ use crate::vault_model::names::{DELETED_AT_COL, FIELD_KEY_COL, FIELD_VALUES_TABL
/// The field key of an item's login email.
const FIELD_KEY_LOGIN_EMAIL: &str = "login.email";
-/// Build the routing set from the canonicalized manifests, the user's own included.
-pub(crate) fn build_email_routing(manifests: &[Manifest], private_email_domains: &[String]) -> EmailRoutingPush {
+/// Build the routing set from the canonicalized manifests, the user's own included, read at `manifest_revisions`.
+pub(crate) fn build_email_routing(manifests: &[Manifest], private_email_domains: &[String], manifest_revisions: &HashMap<String, i64>) -> EmailRoutingPush {
let mut by_pair: HashMap<String, ClaimedEmailAddress> = HashMap::new();
let mut order: Vec<String> = Vec::new();
@@ -59,6 +59,10 @@ pub(crate) fn build_email_routing(manifests: &[Manifest], private_email_domains:
EmailRoutingPush {
email_address_list: order.into_iter().filter_map(|key| by_pair.remove(&key)).collect(),
covered_manifest_ids: manifests.iter().map(|manifest| manifest.manifest_id.clone()).collect(),
+ base_revisions: manifests
+ .iter()
+ .map(|manifest| ManifestRevision { manifest_id: manifest.manifest_id.clone(), revision: manifest_revisions.get(&manifest.manifest_id).copied().unwrap_or(0), encrypted_name: None })
+ .collect(),
}
}
@@ -86,10 +90,12 @@ mod tests {
serde_json::json!({"ItemId": "i1", "FieldKey": "login.email", "Value": "[email protected]", "IsDeleted": 0}),
],
);
- let routing = build_email_routing(&[m], &["private.io".to_string()]);
+ let routing = build_email_routing(&[m], &["private.io".to_string()], &HashMap::from([("m1".to_string(), 7)]));
assert_eq!(routing.email_address_list.len(), 1);
assert_eq!(routing.email_address_list[0].address, "[email protected]");
assert!(!routing.email_address_list[0].paused);
assert_eq!(routing.covered_manifest_ids, vec!["m1"]);
+ assert_eq!(routing.base_revisions.len(), 1);
+ assert_eq!(routing.base_revisions[0].revision, 7);
}
}
diff --git a/core/rust/src/vault_sync/push.rs b/core/rust/src/vault_sync/push.rs
index c437d19a3..9ab107ae0 100644
--- a/core/rust/src/vault_sync/push.rs
+++ b/core/rust/src/vault_sync/push.rs
@@ -481,7 +481,8 @@ async fn push_internal(ctx: &mut Ctx, cached: Option<CanonicalizedSet>, create_v
}
let mut uploaded = upload_missing_blobs(ctx, &blobs, &baselines, gate).await?;
- let email_routing = build_email_routing(&canonicalized.manifests.iter().map(|m| m.manifest.clone()).collect::<Vec<_>>(), &ctx.request.private_email_domains);
+ let routed_manifests: Vec<_> = canonicalized.manifests.iter().map(|m| m.manifest.clone()).collect();
+ let email_routing = build_email_routing(&routed_manifests, &ctx.request.private_email_domains, &baselines.manifest_revisions);
let payload = VaultWriteRequest { username: ctx.request.username.clone(), manifests: manifest_writes, buckets: bucket_writes, email_routing: Some(email_routing), migration: migration.as_ref().map(|m| VaultWriteMigration { account_keys: Some(m.account_keys.clone()) }) };
let response = write_vault(ctx, &payload, &blobs, gate, &mut uploaded).await?;
diff --git a/core/rust/src/vault_sync/tests/mod.rs b/core/rust/src/vault_sync/tests/mod.rs
index 6be6be85d..9d20ccd10 100644
--- a/core/rust/src/vault_sync/tests/mod.rs
+++ b/core/rust/src/vault_sync/tests/mod.rs
@@ -4,6 +4,7 @@ mod item_move;
mod merge_edge_cases;
mod test_host;
mod unloaded_blobs;
+mod unsupported_grant;
use std::collections::HashMap;
@@ -309,6 +310,7 @@ fn dirty_client_pushes_only_what_changed() {
assert_eq!(body["manifests"][0]["credentialsCount"], 2);
assert_eq!(body["buckets"].as_array().unwrap().len(), 0, "unchanged buckets stay out of the write");
assert_eq!(body["emailRouting"]["coveredManifestIds"][0], PERSONAL_MANIFEST_ID);
+ assert_eq!(body["emailRouting"]["baseRevisions"][0]["revision"], 7, "routing carries the revision it was built from");
assert_eq!(host.state[state::SERVER_MANIFEST_REVISIONS][PERSONAL_MANIFEST_ID], 8);
assert_eq!(host.mark_clean_calls, vec![1]);
assert!(!host.is_dirty);
diff --git a/core/rust/src/vault_sync/types.rs b/core/rust/src/vault_sync/types.rs
index 562e60086..9069def4a 100644
--- a/core/rust/src/vault_sync/types.rs
+++ b/core/rust/src/vault_sync/types.rs
@@ -667,6 +667,7 @@ pub struct ClaimedEmailAddress {
pub struct EmailRoutingPush {
pub email_address_list: Vec<ClaimedEmailAddress>,
pub covered_manifest_ids: Vec<String>,
+ pub base_revisions: Vec<ManifestRevision>,
}
#[derive(Debug, Clone, Serialize)]