π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Prepare cast payloads in Rust
Manav Rathi2cec561f7b03
diff --git a/mobile/apps/photos/lib/service_locator.dart b/mobile/apps/photos/lib/service_locator.dartindex b809a4d03d..98e4241951 100644--- a/mobile/apps/photos/lib/service_locator.dart+++ b/mobile/apps/photos/lib/service_locator.dart@@ -111,7 +111,7 @@ AutoCastService get autoCastService {_autoCastService ??= AutoCastService(transport: castService,gateway: CastGateway(ServiceLocator.instance.enteDio),- encodePayload: collectionsService.getCastData,+ encodePayload: collectionsService.prepareCastPayloadForCollection,);return _autoCastService!;}diff --git a/mobile/apps/photos/lib/services/auto_cast_service.dart b/mobile/apps/photos/lib/services/auto_cast_service.dartindex d0c0eb9c4d..e5fd02c73d 100644--- a/mobile/apps/photos/lib/services/auto_cast_service.dart+++ b/mobile/apps/photos/lib/services/auto_cast_service.dart@@ -2,10 +2,10 @@ import "package:ente_cast/ente_cast.dart";import "package:logging/logging.dart";import "package:photos/gateways/cast/cast_gateway.dart";import "package:photos/models/collection/collection.dart";-import "package:uuid/uuid.dart";+import "package:photos/src/rust/api/cast_api.dart";typedef CastPayloadEncoder =- String Function(String castToken, Collection collection, String publicKey);+ PreparedCastPayload Function(Collection collection, String publicKey);class AutoCastDeviceNotFoundException implements Exception {const AutoCastDeviceNotFoundException();@@ -40,13 +40,12 @@ class AutoCastService {if (publicKey == null) {throw const AutoCastDeviceNotFoundException();}- final castToken = const Uuid().v4();- final castPayload = _encodePayload(castToken, collection, publicKey);+ final prepared = _encodePayload(collection, publicKey);final deviceID = await _gateway.publishCastPayload(code,- castPayload,+ prepared.encryptedPayload,collection.id,- castToken,+ prepared.castToken,);if (deviceID == null) {_logger.warning(diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dartindex c36ab82f31..451b56573b 100644--- a/mobile/apps/photos/lib/services/collections_service.dart+++ b/mobile/apps/photos/lib/services/collections_service.dart@@ -821,15 +821,13 @@ class CollectionsService {unawaited(_db.insert([updatedCollection]));}- String getCastData(- String castToken,+ PreparedCastPayload prepareCastPayloadForCollection(Collection collection,String publicKey,) {- return sealCastPayload(+ return prepareCastPayload(publicKey: publicKey,collectionId: collection.id,- castToken: castToken,collectionKey: CryptoUtil.bin2base64(getCollectionKey(collection.id)),);}diff --git a/mobile/apps/photos/lib/ui/cast/pair_with_code.dart b/mobile/apps/photos/lib/ui/cast/pair_with_code.dartindex df4465daf2..2ed4ef8194 100644--- a/mobile/apps/photos/lib/ui/cast/pair_with_code.dart+++ b/mobile/apps/photos/lib/ui/cast/pair_with_code.dart@@ -9,7 +9,6 @@ import "package:photos/service_locator.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/notification/toast.dart";import "package:photos/utils/dialog_util.dart";-import "package:uuid/uuid.dart";class _DeviceNotFoundException implements Exception {const _DeviceNotFoundException();@@ -28,13 +27,16 @@ Future<void> _pairWithCode(if (publicKey == null) {throw const _DeviceNotFoundException();}- final castToken = const Uuid().v4();- final castData = collectionsService.getCastData(- castToken,+ final prepared = collectionsService.prepareCastPayloadForCollection(collection,publicKey,);- await gw.publishCastPayload(code, castData, collection.id, castToken);+ await gw.publishCastPayload(+ code,+ prepared.encryptedPayload,+ collection.id,+ prepared.castToken,+ );}Future<bool?> showPairWithCodeSheet(diff --git a/mobile/apps/photos/test/services/auto_cast_service_test.dart b/mobile/apps/photos/test/services/auto_cast_service_test.dartindex 294d8ae6e0..4064b05606 100644--- a/mobile/apps/photos/test/services/auto_cast_service_test.dart+++ b/mobile/apps/photos/test/services/auto_cast_service_test.dart@@ -5,6 +5,7 @@ import "package:flutter_test/flutter_test.dart";import "package:photos/gateways/cast/cast_gateway.dart";import "package:photos/models/collection/collection.dart";import "package:photos/services/auto_cast_service.dart";+import "package:photos/src/rust/api/cast_api.dart";void main() {test("server session stop disconnects before revocation completes", () async {@@ -13,7 +14,10 @@ void main() {final service = AutoCastService(transport: transport,gateway: gateway,- encodePayload: (_, _, _) => "encrypted-payload",+ encodePayload: (_, _) => const PreparedCastPayload(+ castToken: "cast-token",+ encryptedPayload: "encrypted-payload",+ ),);final device = Object();await service.connect(device, _FakeCollection());diff --git a/mobile/native/apple/apps/cast/Cast/ViewModels/SlideshowService.swift b/mobile/native/apple/apps/cast/Cast/ViewModels/SlideshowService.swiftindex 324bb46725..f95428198c 100644--- a/mobile/native/apple/apps/cast/Cast/ViewModels/SlideshowService.swift+++ b/mobile/native/apple/apps/cast/Cast/ViewModels/SlideshowService.swift@@ -343,13 +343,11 @@ class RealSlideshowService: ObservableObject {}private func fetchFilesBatch(castPayload: CastPayload, sinceTime: Int64) async throws -> (files: [[String: Any]], hasMore: Bool, latestUpdateTime: Int64) {- let url = URL(string: "\(baseURL)/cast/diff?collectionID=\(castPayload.collectionId)&sinceTime=\(sinceTime)")!+ let url = URL(string: "\(baseURL)/cast/diff?sinceTime=\(sinceTime)")!var request = URLRequest(url: url)request.setValue(castPayload.castToken, forHTTPHeaderField: "X-Cast-Access-Token")- // Include collection key in headers for server-side decryption if needed- request.setValue(castPayload.collectionKey, forHTTPHeaderField: "X-Collection-Key")let (data, response) = try await URLSession.shared.data(for: request)@@ -957,9 +955,7 @@ class RealSlideshowService: ObservableObject {let url = URL(string: "\(castDownloadURL)/?fileID=\(fileID)")!var request = URLRequest(url: url)- // Use cast-specific headers like in the diff endpointrequest.setValue(castPayload.castToken, forHTTPHeaderField: "X-Cast-Access-Token")- request.setValue(castPayload.collectionKey, forHTTPHeaderField: "X-Collection-Key")let (data, response) = try await URLSession.shared.data(for: request)diff --git a/rust/bindings/frb/photos/src/api/cast_api.rs b/rust/bindings/frb/photos/src/api/cast_api.rsindex 028818f745..a1e0e0f103 100644--- a/rust/bindings/frb/photos/src/api/cast_api.rs+++ b/rust/bindings/frb/photos/src/api/cast_api.rs@@ -1,17 +1,19 @@+#[derive(Clone, Debug)]+pub struct PreparedCastPayload {+ pub cast_token: String,+ pub encrypted_payload: String,+}+#[flutter_rust_bridge::frb(sync)]-pub fn seal_cast_payload(+pub fn prepare_cast_payload(public_key: String,collection_id: i64,- cast_token: String,collection_key: String,-) -> Result<String, String> {- ente_cast::seal_payload(- &public_key,- &ente_cast::CastPayload {- collection_id,- cast_token,- collection_key,- },- )- .map_err(|error| error.to_string())+) -> Result<PreparedCastPayload, String> {+ let prepared = ente_cast::prepare_payload(&public_key, collection_id, &collection_key)+ .map_err(|error| error.to_string())?;+ Ok(PreparedCastPayload {+ cast_token: prepared.cast_token,+ encrypted_payload: prepared.encrypted_payload,+ })}diff --git a/rust/bindings/wasm/cast/src/lib.rs b/rust/bindings/wasm/cast/src/lib.rsindex 10eb1ecab7..f4f033287a 100644--- a/rust/bindings/wasm/cast/src/lib.rs+++ b/rust/bindings/wasm/cast/src/lib.rs@@ -63,19 +63,35 @@ impl CastPayload {}}-#[wasm_bindgen(js_name = sealPayload)]-pub fn seal_payload(+#[wasm_bindgen]+pub struct PreparedCastPayload {+ inner: ente_cast::PreparedCastPayload,+}++impl From<ente_cast::PreparedCastPayload> for PreparedCastPayload {+ fn from(inner: ente_cast::PreparedCastPayload) -> Self {+ Self { inner }+ }+}++#[wasm_bindgen]+impl PreparedCastPayload {+ #[wasm_bindgen(getter, js_name = castToken)]+ pub fn cast_token(&self) -> String {+ self.inner.cast_token.clone()+ }++ #[wasm_bindgen(getter, js_name = encryptedPayload)]+ pub fn encrypted_payload(&self) -> String {+ self.inner.encrypted_payload.clone()+ }+}++#[wasm_bindgen(js_name = preparePayload)]+pub fn prepare_payload(public_key: &str,collection_id: i64,- cast_token: String,- collection_key: String,-) -> Result<String, JsError> {- Ok(ente_cast::seal_payload(- public_key,- &ente_cast::CastPayload {- collection_id,- cast_token,- collection_key,- },- )?)+ collection_key: &str,+) -> Result<PreparedCastPayload, JsError> {+ Ok(ente_cast::prepare_payload(public_key, collection_id, collection_key)?.into())}diff --git a/rust/crates/cast/src/lib.rs b/rust/crates/cast/src/lib.rsindex 7b883dbb80..817129590f 100644--- a/rust/crates/cast/src/lib.rs+++ b/rust/crates/cast/src/lib.rs@@ -26,6 +26,12 @@ pub struct CastPayload {pub collection_key: String,}+#[derive(Clone, Debug, Eq, PartialEq)]+pub struct PreparedCastPayload {+ pub cast_token: String,+ pub encrypted_payload: String,+}+pub struct ReceiverCredentials {secret_key: SecretKey,}@@ -49,7 +55,30 @@ impl ReceiverCredentials {}}-pub fn seal_payload(public_key: &str, payload: &CastPayload) -> Result<String> {+pub fn prepare_payload(+ public_key: &str,+ collection_id: i64,+ collection_key: &str,+) -> Result<PreparedCastPayload> {+ let cast_token = format!(+ "cast_{}",+ b64::encode_url_safe_no_padding(&crypto::random_bytes(16))+ );+ let encrypted_payload = seal_payload(+ public_key,+ &CastPayload {+ collection_id,+ cast_token: cast_token.clone(),+ collection_key: collection_key.to_owned(),+ },+ )?;+ Ok(PreparedCastPayload {+ cast_token,+ encrypted_payload,+ })+}++fn seal_payload(public_key: &str, payload: &CastPayload) -> Result<String> {let public_key = PublicKey::try_from_slice(&b64::decode(public_key)?)?;let plaintext = serde_json::to_vec(payload)?;Ok(b64::encode(&crypto::sealed::seal(&plaintext, &public_key)?))@@ -70,8 +99,19 @@ mod tests {#[test]fn round_trip() {let receiver = ReceiverCredentials::generate();- let encrypted = seal_payload(&receiver.public_key(), &payload()).unwrap();- assert_eq!(receiver.open_payload(&encrypted).unwrap(), payload());+ let prepared = prepare_payload(+ &receiver.public_key(),+ payload().collection_id,+ &payload().collection_key,+ )+ .unwrap();+ assert_eq!(+ receiver.open_payload(&prepared.encrypted_payload).unwrap(),+ CastPayload {+ cast_token: prepared.cast_token,+ ..payload()+ }+ );}#[test]@@ -99,10 +139,21 @@ mod tests {#[test]fn rejects_invalid_inputs() {- assert!(seal_payload("not base64", &payload()).is_err());+ assert!(prepare_payload("not base64", 42, "collection_key").is_err());let receiver = ReceiverCredentials::generate();assert!(receiver.open_payload("not base64").is_err());assert!(receiver.open_payload(&b64::encode(&[0; 48])).is_err());}++ #[test]+ fn generates_cast_token() {+ let receiver = ReceiverCredentials::generate();+ let first = prepare_payload(&receiver.public_key(), 42, "collection_key").unwrap();+ let second = prepare_payload(&receiver.public_key(), 42, "collection_key").unwrap();++ assert_eq!(first.cast_token.len(), 27);+ assert!(first.cast_token.starts_with("cast_"));+ assert_ne!(first.cast_token, second.cast_token);+ }}diff --git a/web/apps/photos/src/services/cast.ts b/web/apps/photos/src/services/cast.tsindex fdb6085dce..d2e2bbc174 100644--- a/web/apps/photos/src/services/cast.ts+++ b/web/apps/photos/src/services/cast.ts@@ -1,5 +1,4 @@import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";-import { newID } from "ente-base/id";import { apiURL } from "ente-base/origins";import type { Collection } from "ente-media/collection";import { z } from "zod";@@ -32,13 +31,10 @@ export const publishCastPayload = async (const publicKey = await publicKeyForPairingCode(deviceCode);if (!publicKey) throw new Error(unknownDeviceCodeErrorMessage);- const castToken = newID("cast_");-- const { sealPayload } = await import("ente-cast-wasm");- const encryptedPayload = sealPayload(+ const { preparePayload } = await import("ente-cast-wasm");+ const { castToken, encryptedPayload } = preparePayload(publicKey,BigInt(collection.id),- castToken,collection.key,);const res = await fetch(await apiURL("/cast/cast-data"), {