π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use named errors for account failures
Manav Rathifcf435a2cc1e
diff --git a/web/apps/accounts/src/pages/passkeys/verify.tsx b/web/apps/accounts/src/pages/passkeys/verify.tsxindex a857d9a343..bf4492f896 100644--- a/web/apps/accounts/src/pages/passkeys/verify.tsx+++ b/web/apps/accounts/src/pages/passkeys/verify.tsx@@ -4,7 +4,7 @@ import {isWebAuthnSupported,parseRedirectURLParam,passkeyAuthenticationSuccessRedirectURL,- passkeySessionAlreadyClaimedErrorMessage,+ passkeySessionAlreadyClaimedErrorName,redirectToPasskeyRecoverPage,signChallenge,type BeginPasskeyAuthenticationResponse,@@ -99,7 +99,7 @@ const Page = () => {log.error("Failed to begin passkey authentication", e);setStatus(e instanceof Error &&- e.message == passkeySessionAlreadyClaimedErrorMessage+ e.name == passkeySessionAlreadyClaimedErrorName? "sessionAlreadyClaimed": "failed",);diff --git a/web/apps/accounts/src/services/passkey.ts b/web/apps/accounts/src/services/passkey.tsindex 7645717d90..49d2cb58f4 100644--- a/web/apps/accounts/src/services/passkey.ts+++ b/web/apps/accounts/src/services/passkey.ts@@ -5,7 +5,12 @@ import {toB64URLSafeNoPadding,} from "ente-base/crypto";import { isDevBuild } from "ente-base/env";-import { ensureOk, HTTPError, publicRequestHeaders } from "ente-base/http";+import {+ ensureOk,+ HTTPError,+ isMuseumHTTPError,+ publicRequestHeaders,+} from "ente-base/http";import { apiURL } from "ente-base/origins";import { nullToUndefined } from "ente-utils/transform";import { z } from "zod";@@ -230,8 +235,8 @@ export interface BeginPasskeyAuthenticationResponse {options: { publicKey: PublicKeyCredentialRequestOptions };}-export const passkeySessionAlreadyClaimedErrorMessage =- "Passkey session already claimed";+export const passkeySessionAlreadyClaimedErrorName =+ "passkey_session_already_claimed";export const beginPasskeyAuthentication = async (passkeySessionID: string,@@ -243,9 +248,13 @@ export const beginPasskeyAuthentication = async (body: JSON.stringify({ sessionID: passkeySessionID }),});if (!res.ok) {- if (res.status == 409)- throw new Error(passkeySessionAlreadyClaimedErrorMessage);- throw new HTTPError(res);+ const error = new HTTPError(res);+ if (+ await isMuseumHTTPError(error, 409, "SESSION_ALREADY_CLAIMED")+ ) {+ error.name = passkeySessionAlreadyClaimedErrorName;+ }+ throw error;}const { ceremonySessionID, options } =diff --git a/web/packages/accounts/components/SignUpContents.tsx b/web/packages/accounts/components/SignUpContents.tsxindex 82af5a3ce2..ad108d97d3 100644--- a/web/packages/accounts/components/SignUpContents.tsx+++ b/web/packages/accounts/components/SignUpContents.tsx@@ -20,7 +20,7 @@ import {stashReferralSource,stashSRPSetupAttributes,} from "ente-accounts/services/accounts-db";-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";+import { deriveKeyInsufficientMemoryErrorName } from "ente-accounts/services/crypto";import { saveMasterKeyInSessionAndSafeStore } from "ente-accounts/services/session-storage";import { generateSRPSetupAttributes } from "ente-accounts/services/srp";import {@@ -174,7 +174,7 @@ export const SignUpContents: React.FC<SignUpContentsProps> = ({} catch (e) {if (e instanceof Error &&- e.message == deriveKeyInsufficientMemoryErrorMessage+ e.name == deriveKeyInsufficientMemoryErrorName) {setFieldError("confirmPassword",diff --git a/web/packages/accounts/pages/change-password.tsx b/web/packages/accounts/pages/change-password.tsxindex 826d556184..8884520436 100644--- a/web/packages/accounts/pages/change-password.tsx+++ b/web/packages/accounts/pages/change-password.tsx@@ -4,7 +4,7 @@ import {AccountsPageFooter,AccountsPageTitle,} from "ente-accounts/components/layouts/centered-paper";-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";+import { deriveKeyInsufficientMemoryErrorName } from "ente-accounts/services/crypto";import { appHomeRoute, stashRedirect } from "ente-accounts/services/redirect";import { changePassword, type LocalUser } from "ente-accounts/services/user";import { LinkButton } from "ente-base/components/LinkButton";@@ -76,7 +76,7 @@ const PageContents: React.FC<PageContentsProps> = ({log.error("Could not change password", e);setPasswordsFieldError(e instanceof Error &&- e.message == deriveKeyInsufficientMemoryErrorMessage+ e.name == deriveKeyInsufficientMemoryErrorName? t("password_generation_failed"): t("generic_error"),);diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsxindex 64346b28ba..50f3b571a1 100644--- a/web/packages/accounts/pages/generate.tsx+++ b/web/packages/accounts/pages/generate.tsx@@ -15,7 +15,7 @@ import {savedPartialLocalUser,saveJustSignedUp,} from "ente-accounts/services/accounts-db";-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";+import { deriveKeyInsufficientMemoryErrorName } from "ente-accounts/services/crypto";import { appHomeRoute } from "ente-accounts/services/redirect";import {haveMasterKeyInSession,@@ -97,7 +97,7 @@ const Page: React.FC<GeneratePageProps> = ({log.error("Could not generate key attributes from password", e);setPasswordsFieldError(e instanceof Error &&- e.message == deriveKeyInsufficientMemoryErrorMessage+ e.name == deriveKeyInsufficientMemoryErrorName? t("password_generation_failed"): t("generic_error"),);diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.tsindex 6ac296b0cc..152efa6f3e 100644--- a/web/packages/accounts/services/crypto/index.ts+++ b/web/packages/accounts/services/crypto/index.ts@@ -5,7 +5,7 @@ import type { DerivedKey } from "./kdf";import * as kdf from "./kdf";import type { KDFWorker } from "./kdf.worker";-export { deriveKeyInsufficientMemoryErrorMessage } from "./kdf";+export { deriveKeyInsufficientMemoryErrorName } from "./kdf";export type { DerivedKey } from "./kdf";export interface EncryptedBox {diff --git a/web/packages/accounts/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.tsindex 20cda3a2a4..93efd916dd 100644--- a/web/packages/accounts/services/crypto/kdf.ts+++ b/web/packages/accounts/services/crypto/kdf.ts@@ -1,5 +1,4 @@-export const deriveKeyInsufficientMemoryErrorMessage =- "Failed to derive key (insufficient memory)";+export const deriveKeyInsufficientMemoryErrorName = "insufficient_memory";export interface DerivedKey {key: string;@@ -15,20 +14,6 @@ interface WasmDerivedKey {mem_limit: number;}-const normalizeDerivedKeyError = (error: unknown): Error => {- if (error instanceof Error) {- if (error.name === "insufficient_memory") {- const normalized = new Error(- deriveKeyInsufficientMemoryErrorMessage,- );- normalized.name = error.name;- return normalized;- }- return error;- }- return new Error(String(error));-};-export const deriveKey = async (password: string,saltB64: string,@@ -50,22 +35,12 @@ export const deriveSensitiveKey = async (password: string,): Promise<DerivedKey> => {const wasm = await import("ente-core-wasm");- try {- return normalizeDerivedKey(wasm.auth_generate_sensitive_kek(password));- } catch (error) {- throw normalizeDerivedKeyError(error);- }+ return normalizeDerivedKey(wasm.auth_generate_sensitive_kek(password));};export const deriveInteractiveKey = async (password: string,): Promise<DerivedKey> => {const wasm = await import("ente-core-wasm");- try {- return normalizeDerivedKey(- wasm.auth_generate_interactive_kek(password),- );- } catch (error) {- throw normalizeDerivedKeyError(error);- }+ return normalizeDerivedKey(wasm.auth_generate_interactive_kek(password));};