Skip to content

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

Refresh email domains via API status endpoint instead of vault pull

Leendert de Borst5eb1adc9ee05
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
index db1df1312..34bf4331d 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
@@ -201,7 +201,7 @@ class VaultSync(
/**
* Persist what the engine reported: server version and capabilities, offline mode, session values it changed,
- * and the email routing a pulled vault came with.
+ * and the server's email domains.
*/
private fun persistSyncResult(result: JSONObject) {
result.optString("serverVersion").takeIf { it.isNotEmpty() }?.let { vaultStore.metadata.setServerVersion(it) }
@@ -209,11 +209,11 @@ class VaultSync(
if (result.has("isOfflineMode")) {
vaultStore.metadata.setOfflineMode(result.optBoolean("isOfflineMode", false))
}
- result.optJSONObject("emailRouting")?.let { routing ->
+ result.optJSONObject("emailDomains")?.let { domains ->
val metadata = VaultMetadata(
- publicEmailDomains = routing.optJSONArray("publicEmailDomainList").toStringList(),
- privateEmailDomains = routing.optJSONArray("privateEmailDomainList").toStringList(),
- hiddenPrivateEmailDomains = routing.optJSONArray("hiddenPrivateEmailDomainList").toStringList(),
+ publicEmailDomains = domains.optJSONArray("publicEmailDomainList").toStringList(),
+ privateEmailDomains = domains.optJSONArray("privateEmailDomainList").toStringList(),
+ hiddenPrivateEmailDomains = domains.optJSONArray("hiddenPrivateEmailDomainList").toStringList(),
vaultRevisionNumber = if (result.has("pulledRevision")) result.optInt("pulledRevision") else vaultStore.metadata.getVaultRevisionNumber(),
)
vaultStore.metadata.storeMetadata(
diff --git a/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift b/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
index d31a781f1..b7b6b9721 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
@@ -164,7 +164,7 @@ internal final class VaultSync {
}
/// Persist what the engine reported: server version and capabilities, offline mode, session values it changed,
- /// and the email routing a pulled vault came with.
+ /// and the server's email domains.
private func persistSyncResult(_ result: [String: Any]) {
if let serverVersion = result["serverVersion"] as? String, !serverVersion.isEmpty {
vaultStore.setServerVersion(serverVersion)
@@ -175,11 +175,11 @@ internal final class VaultSync {
if let offline = result["isOfflineMode"] as? Bool {
vaultStore.setOfflineMode(offline)
}
- if let routing = result["emailRouting"] as? [String: Any] {
+ if let domains = result["emailDomains"] as? [String: Any] {
let metadata = VaultMetadata(
- publicEmailDomains: routing["publicEmailDomainList"] as? [String] ?? [],
- privateEmailDomains: routing["privateEmailDomainList"] as? [String] ?? [],
- hiddenPrivateEmailDomains: routing["hiddenPrivateEmailDomainList"] as? [String] ?? [],
+ publicEmailDomains: domains["publicEmailDomainList"] as? [String] ?? [],
+ privateEmailDomains: domains["privateEmailDomainList"] as? [String] ?? [],
+ hiddenPrivateEmailDomains: domains["hiddenPrivateEmailDomainList"] as? [String] ?? [],
vaultRevisionNumber: result["pulledRevision"] as? Int ?? vaultStore.getCurrentVaultRevisionNumber()
)
if let data = try? JSONEncoder().encode(metadata), let json = String(data: data, encoding: .utf8) {
diff --git a/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs b/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs
index 19dbc649c..4d3f46667 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/StatusController.cs
@@ -29,8 +29,9 @@ using StatusModels = AliasVault.Shared.Models.WebApi.V2.Status;
/// <param name="dbContextFactory">DbContext factory.</param>
/// <param name="userManager">UserManager.</param>
/// <param name="capabilityService">Resolves which capabilities the caller may use.</param>
+/// <param name="config">Config instance.</param>
[ApiVersion("2")]
-public class StatusController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, CapabilityService capabilityService) : AuthenticatedRequestController(userManager)
+public class StatusController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, CapabilityService capabilityService, Config config) : AuthenticatedRequestController(userManager)
{
/// <summary>
/// Status endpoint called by the client to get the full sync status in one call.
@@ -82,6 +83,7 @@ public class StatusController(IAliasServerDbContextFactory dbContextFactory, Use
BucketRevisions = bucketRevisions,
Capabilities = await capabilityService.GetCapabilitiesAsync(user.Id, ClientHeader),
PendingActions = await ClientActionHelper.GetPendingActionsAsync(context, user.Id),
+ EmailDomains = EmailDomainHelper.GetEmailDomains(config),
});
}
}
diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
index 9dde6527b..377f84e2b 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs
@@ -85,7 +85,6 @@ public class VaultController(
}
var accessScope = await ManifestAccessHelper.ResolveScopeAsync(context, user.Id, user.PersonalGroupId);
- var emailRouting = await BuildEmailRoutingAsync(context, accessScope);
// Every manifest the caller can open.
var latestManifests = await AccessibleManifests(context, accessScope)
@@ -107,7 +106,6 @@ public class VaultController(
Version = legacy?.Version ?? string.Empty,
LegacyRevision = legacy?.RevisionNumber ?? 0,
PersonalManifestId = legacy?.ManifestId,
- EmailRouting = emailRouting,
};
return File(BinaryFrame.Write(legacyResponse), BinaryFrame.ContentType);
}
@@ -167,7 +165,6 @@ public class VaultController(
Manifests = manifests,
PersonalManifestId = latestManifests.First(m => m.OwnerGroupId == user.PersonalGroupId).ManifestId,
Buckets = buckets,
- EmailRouting = emailRouting,
};
return File(BinaryFrame.Write(response), BinaryFrame.ContentType);
}
@@ -1119,33 +1116,6 @@ public class VaultController(
return true;
}
- /// <summary>
- /// Builds the email routing DTO for a user, listing the live aliases of the manifests they can open.
- /// </summary>
- /// <param name="context">Database context.</param>
- /// <param name="scope">The caller's manifest access scope.</param>
- /// <returns>The email routing DTO.</returns>
- private async Task<EmailRouting> BuildEmailRoutingAsync(AliasServerDbContext context, ManifestAccessScope scope)
- {
- var accessible = ManifestAccessHelper.AccessibleManifests(context, scope);
- var claims = await context.EmailClaims
- .Where(c => c.State != EmailClaimState.Removed && accessible.Any(m => m.ManifestId == c.VaultManifestId))
- .Select(c => c.Address)
- .ToListAsync();
-
- return new EmailRouting
- {
- EmailAddressList = claims,
- PrivateEmailDomainList = config.PrivateEmailDomains,
- HiddenPrivateEmailDomainList = config.HiddenPrivateEmailDomains,
- PublicEmailDomainList = new List<string>
- {
- "spamok.com", "solarflarecorp.com", "spamok.nl", "3060.nl", "landmail.nl",
- "asdasd.nl", "spamok.de", "spamok.com.ua", "spamok.es", "spamok.fr",
- },
- };
- }
-
/// <summary>
/// Applies the retention policy to the history revisions of a manifest and removes the pruned revisions and
/// their blob references. Runs after the previous current revision has been archived (passed as
diff --git a/apps/server/AliasVault.Api/Helpers/EmailDomainHelper.cs b/apps/server/AliasVault.Api/Helpers/EmailDomainHelper.cs
new file mode 100644
index 000000000..625749413
--- /dev/null
+++ b/apps/server/AliasVault.Api/Helpers/EmailDomainHelper.cs
@@ -0,0 +1,36 @@
+//-----------------------------------------------------------------------
+// <copyright file="EmailDomainHelper.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.Helpers;
+
+using AliasVault.Shared.Models.WebApi.V2.Vault;
+
+/// <summary>
+/// Builds the email domain lists the status endpoint reports.
+/// </summary>
+public static class EmailDomainHelper
+{
+ /// <summary>
+ /// The public (SpamOK) email domains available to every client.
+ /// </summary>
+ private static readonly string[] PublicEmailDomains = ["spamok.com", "solarflarecorp.com", "spamok.nl", "3060.nl", "landmail.nl", "asdasd.nl", "spamok.de", "spamok.com.ua", "spamok.es", "spamok.fr"];
+
+ /// <summary>
+ /// Gets the email domains this server serves.
+ /// </summary>
+ /// <param name="config">The API config.</param>
+ /// <returns>The email domain lists.</returns>
+ public static EmailDomains GetEmailDomains(Config config)
+ {
+ return new EmailDomains
+ {
+ PrivateEmailDomainList = config.PrivateEmailDomains,
+ HiddenPrivateEmailDomainList = config.HiddenPrivateEmailDomains,
+ PublicEmailDomainList = [.. PublicEmailDomains],
+ };
+ }
+}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Status/StatusResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Status/StatusResponse.cs
index 4361538b4..2d57175e4 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Status/StatusResponse.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Status/StatusResponse.cs
@@ -59,4 +59,9 @@ public class StatusResponse
/// vault content, a vault key, a private key. This primarily affects vault sharing and revocation actions.
/// </summary>
public List<PendingClientAction> PendingActions { get; set; } = [];
+
+ /// <summary>
+ /// Gets or sets the email domains this server serves, so clients pick up a domain change without a vault pull.
+ /// </summary>
+ public EmailDomains EmailDomains { get; set; } = new();
}
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRouting.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailDomains.cs
similarity index 65%
rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRouting.cs
rename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailDomains.cs
index d127d431e..766a730ca 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailRouting.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/EmailDomains.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-// <copyright file="EmailRouting.cs" company="aliasvault">
+// <copyright file="EmailDomains.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>
@@ -8,15 +8,11 @@
namespace AliasVault.Shared.Models.WebApi.V2.Vault;
/// <summary>
-/// Email-routing plaintext data returned on a vault read. The push direction has its own model,
-/// <see cref="EmailRoutingPush"/>, which carries the owning manifest of every address.
+/// The email domains this server serves.
/// </summary>
-public class EmailRouting
+public class EmailDomains
{
- /// <summary>Gets or sets the user's claimed email addresses (forwarded inbound).</summary>
- public List<string> EmailAddressList { get; set; } = [];
-
- /// <summary>Gets or sets the private email domains available to this user.</summary>
+ /// <summary>Gets or sets the private email domains available to this user, hidden ones included.</summary>
public List<string> PrivateEmailDomainList { get; set; } = [];
/// <summary>Gets or sets the private email domains hidden in UI but still functional.</summary>
diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/GetResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/GetResponse.cs
index 4d49e5ef3..b4a9ef1e5 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/GetResponse.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V2/Vault/GetResponse.cs
@@ -42,9 +42,6 @@ public class GetResponse : IFrameBody
/// <summary>Gets or sets the data buckets (e.g. settings) for this user, each with its own kind + revision.</summary>
public List<Bucket> Buckets { get; set; } = [];
- /// <summary>Gets or sets the plaintext email routing data (private/public domains + claimed addresses).</summary>
- public EmailRouting EmailRouting { get; set; } = new();
-
/// <inheritdoc/>
[JsonIgnore]
public IEnumerable<IFramePart> FrameParts => Manifests.Cast<IFramePart>().Concat(Buckets);
diff --git a/apps/web/src/components/forms/EmailDomainField.tsx b/apps/web/src/components/forms/EmailDomainField.tsx
index d1348ee68..b74c4417b 100644
--- a/apps/web/src/components/forms/EmailDomainField.tsx
+++ b/apps/web/src/components/forms/EmailDomainField.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
import Icon from '@/components/shared/Icon';
import ToggleChip from '@/components/shared/ToggleChip';
-import { getAppConfig } from '@/config/AppConfig';
import { useDb } from '@/context/DbContext';
import { vaultStore } from '@/vault/VaultStore';
@@ -43,9 +42,9 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange
if (cancelled) {
return;
}
- const hidden = metadata?.hiddenPrivateEmailDomains ?? getAppConfig().hiddenPrivateEmailDomains;
+ const hidden = metadata?.hiddenPrivateEmailDomains ?? [];
setHiddenPrivateDomains(hidden);
- setPrivateDomains((metadata?.privateEmailDomains ?? getAppConfig().privateEmailDomains).filter(d => !hidden.includes(d)));
+ setPrivateDomains((metadata?.privateEmailDomains ?? []).filter(d => !hidden.includes(d)));
setPublicDomains(metadata?.publicEmailDomains ?? []);
});
return (): void => {
diff --git a/apps/web/src/config/AppConfig.ts b/apps/web/src/config/AppConfig.ts
index 41e2fe91e..9a8a40d91 100644
--- a/apps/web/src/config/AppConfig.ts
+++ b/apps/web/src/config/AppConfig.ts
@@ -11,9 +11,6 @@ import { getPlatform } from '@aliasvault/client/platform';
*/
type AppSettingsFile = {
ApiUrl?: string;
- PrivateEmailDomains?: string[];
- HiddenPrivateEmailDomains?: string[];
- PublicEmailDomains?: string[];
SupportEmail?: string;
PublicRegistrationEnabled?: string | boolean;
DeploymentMode?: string;
@@ -25,8 +22,6 @@ type AppSettingsFile = {
*/
export type AppConfig = {
apiUrl: string;
- privateEmailDomains: string[];
- hiddenPrivateEmailDomains: string[];
supportEmail: string;
publicRegistrationEnabled: boolean;
deploymentMode: string;
@@ -69,8 +64,6 @@ export async function loadAppConfig(): Promise<AppConfig> {
current = {
apiUrl,
- privateEmailDomains: (file.PrivateEmailDomains ?? []).map(domain => domain.trim().toLowerCase()),
- hiddenPrivateEmailDomains: (file.HiddenPrivateEmailDomains ?? []).map(domain => domain.trim().toLowerCase()),
supportEmail: file.SupportEmail ?? '',
publicRegistrationEnabled: String(file.PublicRegistrationEnabled ?? 'true').toLowerCase() === 'true',
deploymentMode: file.DeploymentMode ?? '',
diff --git a/apps/web/src/pages/emails/Home.tsx b/apps/web/src/pages/emails/Home.tsx
index f15d944d1..080fe8ad9 100644
--- a/apps/web/src/pages/emails/Home.tsx
+++ b/apps/web/src/pages/emails/Home.tsx
@@ -18,7 +18,6 @@ import PageHeader from '@/components/shared/PageHeader';
import RefreshButton from '@/components/shared/RefreshButton';
import ResponsivePaginator from '@/components/shared/ResponsivePaginator';
import Text from '@/components/shared/Text';
-import { getAppConfig } from '@/config/AppConfig';
import { useConfirmModal } from '@/context/ConfirmModalContext';
import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
@@ -96,7 +95,7 @@ const EmailsHome: React.FC = () => {
const getEmailClaimList = useCallback(async (): Promise<string[]> => {
const routable = dbContext.sqliteClient?.items.getRoutableEmailAddresses() ?? [];
const storedDomains = await getPlatform().storage.get<string[]>(StorageKeys.PRIVATE_EMAIL_DOMAINS);
- const privateDomains = (storedDomains && storedDomains.length > 0 ? storedDomains : getAppConfig().privateEmailDomains).filter(d => d.trim().length > 0);
+ const privateDomains = (storedDomains ?? []).filter(d => d.trim().length > 0);
if (privateDomains.length === 0) {
return [];
}
diff --git a/apps/web/src/pages/settings/General.tsx b/apps/web/src/pages/settings/General.tsx
index 0040d8068..820b65abd 100644
--- a/apps/web/src/pages/settings/General.tsx
+++ b/apps/web/src/pages/settings/General.tsx
@@ -7,7 +7,6 @@ import FormLabel from '@/components/shared/FormLabel';
import PageContent from '@/components/shared/PageContent';
import SectionTitle from '@/components/shared/SectionTitle';
import Select from '@/components/shared/Select';
-import { getAppConfig } from '@/config/AppConfig';
import { useDb } from '@/context/DbContext';
import { usePageTitle } from '@/hooks/usePageTitle';
import { useVaultMutate } from '@/hooks/useVaultMutate';
@@ -57,8 +56,8 @@ const GeneralSettings: React.FC = () => {
*/
const load = async (): Promise<void> => {
const metadata = await vaultStore.getVaultMetadata();
- const hidden = metadata?.hiddenPrivateEmailDomains ?? getAppConfig().hiddenPrivateEmailDomains;
- const privateList = (metadata?.privateEmailDomains ?? getAppConfig().privateEmailDomains).filter(d => !hidden.includes(d));
+ const hidden = metadata?.hiddenPrivateEmailDomains ?? [];
+ const privateList = (metadata?.privateEmailDomains ?? []).filter(d => !hidden.includes(d));
const publicList = metadata?.publicEmailDomains ?? [];
if (cancelled) {
return;
diff --git a/apps/web/tests/fixtures/fixtures.ts b/apps/web/tests/fixtures/fixtures.ts
index 45a6a936c..9d7568857 100644
--- a/apps/web/tests/fixtures/fixtures.ts
+++ b/apps/web/tests/fixtures/fixtures.ts
@@ -95,8 +95,6 @@ async function prepareContext(context: BrowserContext, apiUrl: string, publicReg
contentType: 'application/json',
body: JSON.stringify({
ApiUrl: apiUrl,
- PrivateEmailDomains: ['example.tld', 'example2.tld'],
- HiddenPrivateEmailDomains: [],
SupportEmail: '[email protected]',
PublicRegistrationEnabled: String(publicRegistrationEnabled),
DeploymentMode: 'e2e',
diff --git a/core/client/src/sync/VaultSync.ts b/core/client/src/sync/VaultSync.ts
index 96010385f..7cc1bda62 100644
--- a/core/client/src/sync/VaultSync.ts
+++ b/core/client/src/sync/VaultSync.ts
@@ -20,7 +20,7 @@ import { devError, devLog, devWarn } from '../platform/Logger';
import { VaultMigrationKind } from './VaultManifestMigration';
import { buildVaultSyncRequest, runVaultSyncEngine } from './VaultSyncEngine';
-import type { IVaultSyncEngineHost, LogoutReason, VaultSyncEmailRouting, VaultSyncEngineRequest, VaultSyncEngineResult, VaultSyncEngineResultBase, VaultSyncMigrateManifestResult, VaultSyncMigrationStatusResult, VaultSyncOperation, VaultSyncOptions, VaultSyncSharingParams, VaultSyncSharingResult } from './VaultSyncEngine';
+import type { IVaultSyncEngineHost, LogoutReason, VaultSyncEmailDomains, VaultSyncEngineRequest, VaultSyncEngineResult, VaultSyncEngineResultBase, VaultSyncMigrateManifestResult, VaultSyncMigrationStatusResult, VaultSyncOperation, VaultSyncOptions, VaultSyncSharingParams, VaultSyncSharingResult } from './VaultSyncEngine';
import type { SqliteClient } from '../database/SqliteClient';
import type { TranslationKey } from '@aliasvault/i18n';
@@ -79,7 +79,7 @@ type PersistableSyncResult = VaultSyncEngineResultBase & {
serverVersion?: string;
capabilities?: Record<string, string>;
isOfflineMode?: boolean;
- emailRouting?: VaultSyncEmailRouting;
+ emailDomains?: VaultSyncEmailDomains;
};
/** The engine's failure fields. */
@@ -263,7 +263,7 @@ export class VaultSync {
/**
* Persist what the engine reported: server version and capabilities, offline mode, session values it changed, and
- * the email routing a pulled vault came with.
+ * the server's email domains.
* @param result - the engine's outcome
*/
private async persistSyncResult(result: PersistableSyncResult): Promise<void> {
@@ -277,11 +277,11 @@ export class VaultSync {
if (result.isOfflineMode !== undefined) {
await storage.set(StorageKeys.IS_OFFLINE_MODE, result.isOfflineMode);
}
- if (result.emailRouting) {
+ if (result.emailDomains) {
await storage.setMany([
- { key: StorageKeys.PUBLIC_EMAIL_DOMAINS, value: result.emailRouting.publicEmailDomainList },
- { key: StorageKeys.PRIVATE_EMAIL_DOMAINS, value: result.emailRouting.privateEmailDomainList },
- { key: StorageKeys.HIDDEN_PRIVATE_EMAIL_DOMAINS, value: result.emailRouting.hiddenPrivateEmailDomainList },
+ { key: StorageKeys.PUBLIC_EMAIL_DOMAINS, value: result.emailDomains.publicEmailDomainList },
+ { key: StorageKeys.PRIVATE_EMAIL_DOMAINS, value: result.emailDomains.privateEmailDomainList },
+ { key: StorageKeys.HIDDEN_PRIVATE_EMAIL_DOMAINS, value: result.emailDomains.hiddenPrivateEmailDomainList },
]);
}
}
diff --git a/core/client/src/sync/VaultSyncEngine.ts b/core/client/src/sync/VaultSyncEngine.ts
index 64d287a72..6a482640e 100644
--- a/core/client/src/sync/VaultSyncEngine.ts
+++ b/core/client/src/sync/VaultSyncEngine.ts
@@ -50,9 +50,8 @@ export type VaultSyncEngineRequest = {
sharing?: VaultSyncSharingParams;
};
-/** The email routing a pulled vault came with. */
-export type VaultSyncEmailRouting = {
- emailAddressList: string[];
+/** The email domains the server serves; hidden private domains are also in the private list. */
+export type VaultSyncEmailDomains = {
privateEmailDomainList: string[];
hiddenPrivateEmailDomainList: string[];
publicEmailDomainList: string[];
@@ -82,7 +81,7 @@ export type VaultSyncEngineResult = VaultSyncEngineResultBase & {
capabilities?: Record<string, string>;
isOfflineMode: boolean;
pulledRevision?: number;
- emailRouting?: VaultSyncEmailRouting;
+ emailDomains?: VaultSyncEmailDomains;
};
/** Outcome of the migration classification. */
diff --git a/core/models/src/webapi/StatusResponseV2.ts b/core/models/src/webapi/StatusResponseV2.ts
index f0d867730..63bfd301a 100644
--- a/core/models/src/webapi/StatusResponseV2.ts
+++ b/core/models/src/webapi/StatusResponseV2.ts
@@ -28,6 +28,15 @@ export type PendingClientAction = {
payload?: string | null;
}
+/**
+ * The email domains a server serves; hidden private domains are also in the private list.
+ */
+export type EmailDomains = {
+ privateEmailDomainList: string[];
+ hiddenPrivateEmailDomainList: string[];
+ publicEmailDomainList: string[];
+}
+
/**
* Status response type (v2).
*/
@@ -40,4 +49,5 @@ export type StatusResponseV2 = {
capabilities?: Record<string, string>;
bucketRevisions?: BucketRevision[];
pendingActions?: PendingClientAction[];
+ emailDomains?: EmailDomains;
}
diff --git a/core/rust/src/vault_sync/engine.rs b/core/rust/src/vault_sync/engine.rs
index c7ced40f3..2f66c49b3 100644
--- a/core/rust/src/vault_sync/engine.rs
+++ b/core/rust/src/vault_sync/engine.rs
@@ -117,6 +117,9 @@ async fn full_sync_once(ctx: &mut Ctx) -> SyncResult<Flow> {
Ok(status) => status,
Err(result) => return Ok(Flow::Done(result)),
};
+ if let Some(domains) = &status.email_domains {
+ ctx.request.private_email_domains = domains.private_email_domain_list.clone();
+ }
let mut needs_pull = ctx.request.force_pull || server_state_needs_pull(ctx, &status).await?;
ctx.log(format!("[Sync] Status received (needsPull {}, isDirty {})", needs_pull, ctx.is_dirty)).await;
@@ -162,6 +165,7 @@ async fn full_sync_once(ctx: &mut Ctx) -> SyncResult<Flow> {
Flow::Done(mut result) => {
result.server_version = Some(status.server_version.clone());
result.capabilities = status.capabilities.clone();
+ result.email_domains = status.email_domains.clone();
ctx.log("[Sync] Sync finished").await;
Flow::Done(result)
}
@@ -381,7 +385,7 @@ async fn apply_server_directed_changes(ctx: &mut Ctx, status: &StatusResponse) -
async fn materialized_vault_result(ctx: &mut Ctx, pulled: &PulledVault) -> SyncResult<FullSyncResult> {
let migration_required = migration::vault_requires_manifest_migration(ctx).await?;
let legacy_chain = migration::schema_state(ctx).await? == db::SchemaState::LegacyChain;
- Ok(FullSyncResult { success: true, has_new_vault: true, sqlite_blob_upgrade_required: legacy_chain, manifest_migration_required: migration_required, pulled_revision: Some(pulled.personal_revision), email_routing: Some(pulled.email_routing.clone()), ..Default::default() })
+ Ok(FullSyncResult { success: true, has_new_vault: true, sqlite_blob_upgrade_required: legacy_chain, manifest_migration_required: migration_required, pulled_revision: Some(pulled.personal_revision), ..Default::default() })
}
/// Store a pulled vault, then commit its revisions; a refused store (a mutation raced the pull) returns a resync.
@@ -486,7 +490,7 @@ async fn status_check(ctx: &mut Ctx) -> StatusCheckResult {
}
assert_salt_unchanged(ctx, status.srp_salt.as_deref()).await?;
let has_newer_vault = server_state_needs_pull(ctx, &status).await?;
- Ok(StatusCheckResult { success: true, has_newer_vault, has_dirty_changes: ctx.is_dirty, server_version: Some(status.server_version), capabilities: status.capabilities, ..Default::default() })
+ Ok(StatusCheckResult { success: true, has_newer_vault, has_dirty_changes: ctx.is_dirty, server_version: Some(status.server_version), capabilities: status.capabilities, email_domains: status.email_domains, ..Default::default() })
}
.await;
match checked {
diff --git a/core/rust/src/vault_sync/legacy.rs b/core/rust/src/vault_sync/legacy.rs
index f76474272..0af006de9 100644
--- a/core/rust/src/vault_sync/legacy.rs
+++ b/core/rust/src/vault_sync/legacy.rs
@@ -33,7 +33,7 @@ pub(crate) async fn open_legacy_snapshot(ctx: &Ctx, snapshot: &GetResponse) -> S
manifest_revisions.insert(personal.clone(), revision);
}
ctx.log("[Pull] Legacy sqlite-blob pass-through (user not yet migrated), returning the blob as-is.").await;
- Ok(PulledVault { encrypted_vault: snapshot.legacy_vault_blob.clone().unwrap_or_default(), personal_revision: revision, email_routing: snapshot.email_routing.clone().unwrap_or_default(), manifest_revisions, bucket_revisions: HashMap::new(), needs_first_write: false })
+ Ok(PulledVault { encrypted_vault: snapshot.legacy_vault_blob.clone().unwrap_or_default(), personal_revision: revision, manifest_revisions, bucket_revisions: HashMap::new(), needs_first_write: false })
}
/*
diff --git a/core/rust/src/vault_sync/merge.rs b/core/rust/src/vault_sync/merge.rs
index 2992fce70..102ecf45d 100644
--- a/core/rust/src/vault_sync/merge.rs
+++ b/core/rust/src/vault_sync/merge.rs
@@ -37,7 +37,6 @@ pub(crate) async fn pull_and_merge(ctx: &mut Ctx) -> SyncResult<PullAndMergeOutc
}
Snapshot::Manifest(snapshot) => snapshot,
};
- let email_routing = snapshot.email_routing.clone().unwrap_or_default();
let opened = pull::open_manifests_and_record_sync_state(ctx, &snapshot, &vek).await?;
let local_side = canonicalize_vault(ctx, None).await?;
@@ -49,13 +48,13 @@ pub(crate) async fn pull_and_merge(ctx: &mut Ctx) -> SyncResult<PullAndMergeOutc
}
};
- match merge_onto_opened_manifests(ctx, &opened, local_side, &vek, email_routing.clone()).await {
+ match merge_onto_opened_manifests(ctx, &opened, local_side, &vek).await {
Ok(outcome) => Ok(outcome),
Err(merge_error) => {
// The merge-failure fallback, from the same snapshot: the server vault stands, local changes are dropped.
ctx.warn(format!("[Merge] Canonical merge failed, falling back to the server vault: {}", merge_error)).await;
let sqlite_bytes = pull::materialize_to_sqlite(ctx, &opened.manifests(), &opened.data_buckets, &opened.blob_map, &opened.manifest_names).await?;
- Ok(PullAndMergeOutcome::ServerOnly(opened.pulled_vault(state::encrypt_vault_blob(&sqlite_bytes, &vek)?, email_routing)))
+ Ok(PullAndMergeOutcome::ServerOnly(opened.pulled_vault(state::encrypt_vault_blob(&sqlite_bytes, &vek)?)))
}
}
}
@@ -80,7 +79,7 @@ fn ground_moved_under_canonicalize(records: &[ManifestRecord], opened: &OpenedMa
}
/// Merge the local side against the opened manifests, validate per manifest, and materialize.
-async fn merge_onto_opened_manifests(ctx: &mut Ctx, opened: &OpenedManifestSet, local_side: CanonicalizedSet, vek: &str, email_routing: super::types::EmailRoutingDto) -> SyncResult<PullAndMergeOutcome> {
+async fn merge_onto_opened_manifests(ctx: &mut Ctx, opened: &OpenedManifestSet, local_side: CanonicalizedSet, vek: &str) -> SyncResult<PullAndMergeOutcome> {
let schema = ctx.schema().await?;
ctx.log(format!("[Merge] Merging {} local manifest(s) onto {} server manifest(s)...", local_side.canonicalized.manifests.len(), opened.resolved.len())).await;
let merge_output = merge_canonical(CanonicalMergeInput {
@@ -142,7 +141,7 @@ async fn merge_onto_opened_manifests(ctx: &mut Ctx, opened: &OpenedManifestSet,
ctx.log(format!("[Merge] Canonical merge complete: {} local row(s) won, {} local-only row(s) kept, {} validation fallback(s), {} dropped local manifest(s).", stats.incoming_won, stats.incoming_only, fallbacks, merge_output.dropped_local_manifest_ids.len())).await;
let push_canonical = if fallbacks == 0 { merge_output_for_push(&manifests, &data_buckets, merged_blobs, &local_side.manifest_records) } else { None };
- Ok(PullAndMergeOutcome::Merged { pulled: opened.pulled_vault(encrypted_vault, email_routing), push_canonical })
+ Ok(PullAndMergeOutcome::Merged { pulled: opened.pulled_vault(encrypted_vault), push_canonical })
}
/// The merged vault in the shape the push writes from, when it covers exactly the manifests this session writes.
diff --git a/core/rust/src/vault_sync/pull.rs b/core/rust/src/vault_sync/pull.rs
index 65e78dc34..e685cf8e5 100644
--- a/core/rust/src/vault_sync/pull.rs
+++ b/core/rust/src/vault_sync/pull.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
use crate::vault_model::{id_key, ids_equal};
use super::errors::{SyncError, SyncResult};
use super::state::{self, Ctx};
-use super::types::{self, BlobDownloadResponse, BlobHashesRequest, Db, EmailRoutingDto, GetResponse, ManifestDto, SharedManifestDto, StoredBlobRef};
+use super::types::{self, BlobDownloadResponse, BlobHashesRequest, Db, GetResponse, ManifestDto, SharedManifestDto, StoredBlobRef};
use super::blob_keys::{self, EncryptedBlob};
use super::{db, http, keys, legacy};
use crate::crypto;
@@ -45,8 +45,8 @@ impl OpenedManifestSet {
}
/// The opened set as a vault ready to become the local one.
- pub fn pulled_vault(&self, encrypted_vault: String, email_routing: EmailRoutingDto) -> PulledVault {
- PulledVault { encrypted_vault, personal_revision: self.personal_revision, email_routing, manifest_revisions: self.manifest_revisions.clone(), bucket_revisions: self.bucket_revisions.clone(), needs_first_write: self.personal_needs_first_write }
+ pub fn pulled_vault(&self, encrypted_vault: String) -> PulledVault {
+ PulledVault { encrypted_vault, personal_revision: self.personal_revision, manifest_revisions: self.manifest_revisions.clone(), bucket_revisions: self.bucket_revisions.clone(), needs_first_write: self.personal_needs_first_write }
}
}
@@ -54,7 +54,6 @@ impl OpenedManifestSet {
pub(crate) struct PulledVault {
pub encrypted_vault: String,
pub personal_revision: i64,
- pub email_routing: EmailRoutingDto,
pub manifest_revisions: HashMap<String, i64>,
pub bucket_revisions: HashMap<String, i64>,
/// The vault is new and has never been written to the server; it is stored dirty and pushed by the same sync.
@@ -135,7 +134,7 @@ pub(crate) async fn pull(ctx: &mut Ctx) -> SyncResult<PulledVault> {
let opened = open_manifests_and_record_sync_state(ctx, &snapshot, &vek).await?;
let sqlite_bytes = materialize_to_sqlite(ctx, &opened.manifests(), &opened.data_buckets, &opened.blob_map, &opened.manifest_names).await?;
ctx.log(format!("[Pull] Materialized SQLite ({} bytes); re-encrypting for local storage...", sqlite_bytes.len())).await;
- Ok(opened.pulled_vault(state::encrypt_vault_blob(&sqlite_bytes, &vek)?, snapshot.email_routing.clone().unwrap_or_default()))
+ Ok(opened.pulled_vault(state::encrypt_vault_blob(&sqlite_bytes, &vek)?))
}
/// Open every manifest a snapshot carries, personal first, and record the snapshot as this device's sync state.
diff --git a/core/rust/src/vault_sync/types.rs b/core/rust/src/vault_sync/types.rs
index 56c2bdbb3..945660736 100644
--- a/core/rust/src/vault_sync/types.rs
+++ b/core/rust/src/vault_sync/types.rs
@@ -131,7 +131,7 @@ pub struct FullSyncResult {
#[serde(skip_serializing_if = "Option::is_none")]
pub pulled_revision: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
- pub email_routing: Option<EmailRoutingDto>,
+ pub email_domains: Option<EmailDomainsDto>,
}
/// The pending local migration, as the upgrade gate classifies it.
@@ -208,6 +208,8 @@ pub struct StatusCheckResult {
pub server_version: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub capabilities: Option<HashMap<String, String>>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub email_domains: Option<EmailDomainsDto>,
}
/*
@@ -409,6 +411,8 @@ pub struct StatusResponse {
pub capabilities: Option<HashMap<String, String>>,
#[serde(default)]
pub pending_actions: Vec<PendingAction>,
+ #[serde(default)]
+ pub email_domains: Option<EmailDomainsDto>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -455,8 +459,6 @@ pub struct GetResponse {
pub manifests: Vec<ManifestDto>,
#[serde(default)]
pub buckets: Vec<BucketDto>,
- #[serde(default)]
- pub email_routing: Option<EmailRoutingDto>,
}
impl FrameBody for GetResponse {
@@ -527,11 +529,10 @@ pub struct StoredBlobRef {
pub size_bytes: i64,
}
+/// The email domains a server serves.
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
-pub struct EmailRoutingDto {
- #[serde(default)]
- pub email_address_list: Vec<String>,
+pub struct EmailDomainsDto {
#[serde(default)]
pub private_email_domain_list: Vec<String>,
#[serde(default)]