π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Return Locker file-link payloads as plain WASM values
Manav Rathi25dab435b048
diff --git a/rust/bindings/wasm/lib/src/locker.rs b/rust/bindings/wasm/lib/src/locker.rsindex dffbb6edf6..70827d8b86 100644--- a/rust/bindings/wasm/lib/src/locker.rs+++ b/rust/bindings/wasm/lib/src/locker.rs@@ -1,4 +1,7 @@use ente_core::{b64, crypto::Key};+use serde::Serialize;+use serde_wasm_bindgen as swb;+use tsify::Tsify;use wasm_bindgen::prelude::*;use crate::session::Session;@@ -11,6 +14,8 @@ pub enum Error {Crypto(#[from] ente_core::crypto::Error),#[error(transparent)]Locker(#[from] ente_locker::Error),+ #[error(transparent)]+ Serde(#[from] swb::Error),}impl From<Error> for JsValue {@@ -19,34 +24,33 @@ impl From<Error> for JsValue {}}-#[wasm_bindgen(getter_with_clone)]+#[derive(Serialize, Tsify)]+#[serde(rename_all = "camelCase")]pub struct PreparedFileLinkPayload {- #[wasm_bindgen(readonly)]- pub fragment: String,- #[wasm_bindgen(readonly, js_name = encryptedFileKey)]- pub encrypted_file_key: String,- #[wasm_bindgen(readonly, js_name = encryptedFileKeyNonce)]- pub encrypted_file_key_nonce: String,- #[wasm_bindgen(readonly, js_name = kdfNonce)]- pub kdf_nonce: String,- #[wasm_bindgen(readonly, js_name = kdfMemLimit)]- pub kdf_mem_limit: u32,- #[wasm_bindgen(readonly, js_name = kdfOpsLimit)]- pub kdf_ops_limit: u32,+ fragment: String,+ encrypted_file_key: String,+ encrypted_file_key_nonce: String,+ kdf_nonce: String,+ kdf_mem_limit: u32,+ kdf_ops_limit: u32,}#[wasm_bindgen(js_name = lockerPrepareFileLinkPayload)]-pub fn prepare_file_link_payload(file_key_b64: &str) -> Result<PreparedFileLinkPayload, Error> {+pub fn prepare_file_link_payload(+ file_key_b64: &str,+) -> Result<<PreparedFileLinkPayload as Tsify>::JsType, Error> {let file_key = Key::try_from_slice(&b64::decode(file_key_b64)?)?;let (fragment, payload) = ente_locker::prepare_file_link_payload(&file_key)?;- Ok(PreparedFileLinkPayload {+ PreparedFileLinkPayload {fragment,encrypted_file_key: payload.encrypted_file_key,encrypted_file_key_nonce: payload.encrypted_file_key_nonce,kdf_nonce: payload.kdf_nonce,kdf_mem_limit: payload.kdf_mem_limit,kdf_ops_limit: payload.kdf_ops_limit,- })+ }+ .into_js()+ .map_err(Into::into)}#[wasm_bindgen(js_name = lockerSealFileLinkSecret)]diff --git a/web/packages/wasm/locker/file-link.worker.ts b/web/packages/wasm/locker/file-link.worker.tsindex 04842868e0..10e4c5f4b7 100644--- a/web/packages/wasm/locker/file-link.worker.ts+++ b/web/packages/wasm/locker/file-link.worker.ts@@ -1,20 +1,9 @@import { expose } from "comlink";-import { readAndFree } from "ente-utils/wasm";export class FileLinkWorker {async prepareFileLinkPayload(fileKeyB64: string) {const wasm = await import("./pkg/ente_locker_wasm");- return readAndFree(- wasm.lockerPrepareFileLinkPayload(fileKeyB64),- (payload) => ({- fragment: payload.fragment,- encryptedFileKey: payload.encryptedFileKey,- encryptedFileKeyNonce: payload.encryptedFileKeyNonce,- kdfNonce: payload.kdfNonce,- kdfMemLimit: payload.kdfMemLimit,- kdfOpsLimit: payload.kdfOpsLimit,- }),- );+ return wasm.lockerPrepareFileLinkPayload(fileKeyB64);}}diff --git a/web/packages/wasm/tests/bindings.test.ts b/web/packages/wasm/tests/bindings.test.tsindex c38c75e852..b685188983 100644--- a/web/packages/wasm/tests/bindings.test.ts+++ b/web/packages/wasm/tests/bindings.test.ts@@ -3,11 +3,13 @@ import * as locker from "ente-locker-wasm";import * as photos from "ente-photos-wasm";import {boxSealOpenBytes,+ deriveKey,encryptBox,generateKey,generateKeyPair,} from "ente-prelogin-wasm";import { afterEach, describe, expect, test, vi } from "vitest";+import { lockerPrepareFileLinkPayload } from "../locker/pkg/ente_locker_wasm";afterEach(() => vi.unstubAllGlobals());@@ -132,6 +134,29 @@ for (const [name, api] of [});}+test("Locker file-link payload survives cloning and unlocks its file key", async () => {+ const fileKey = await generateKey();+ const prepared = lockerPrepareFileLinkPayload(fileKey);+ const payload = structuredClone(prepared);+ expect(payload).toStrictEqual(prepared);++ const key = await deriveKey(+ payload.fragment,+ payload.kdfNonce,+ payload.kdfOpsLimit,+ payload.kdfMemLimit,+ );+ expect(+ await locker.decryptBox(+ {+ encryptedData: payload.encryptedFileKey,+ nonce: payload.encryptedFileKeyNonce,+ },+ key,+ ),+ ).toBe(fileKey);+});+describe("Legacy", () => {test("returns plain information and sends typed updates through a reused session", async () => {const user = { id: 42, email: "[email protected]" };