Page MenuHomePhabricator
Differential D13415

[lib] Establish holders for DM multimedia
ClosedPublic
Actions

Authored by bartek on Sep 20 2024, 7:39 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 11:57 AM
Unknown Object (File)
Thu, Apr 3, 4:18 PM
Unknown Object (File)
Thu, Apr 3, 3:36 PM
Unknown Object (File)
Thu, Apr 3, 9:57 AM
Unknown Object (File)
Thu, Apr 3, 9:30 AM
Unknown Object (File)
Wed, Apr 2, 4:32 AM
Unknown Object (File)
Fri, Mar 28, 3:05 PM
Unknown Object (File)
Sun, Mar 16, 12:12 AM
View All 59 Files
Subscribers
ashoat

Details

Reviewers
kamil
tomek
Commits
rCOMM46dbd248a088: [lib] Establish holders for DM multimedia
Summary

When receiving DM multimedia message (inbound), we should establish holders for the media.
Sender (outbound) has them already established during media upload.

Depends on D13413

Test Plan

Created DM thread with two users. Sent a photo and a video. No holders were established for sender.
Recipients established 3 holders: photo, video and video thumbnail.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
shared/
dm-ops/
41 lines

Diff 44389

View Options

lib/shared/dm-ops/send-multimedia-message-spec.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines RUNTIME.spawn(async move {
return; return;
} }
trigger_backup_file_upload(); trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded // The promise will be resolved when the backup is uploaded
}); });
} }
pub fn retrieve_backup_keys( pub fn get_backup_user_keys(
user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String, backup_id: String,
promise_id: u32, promise_id: u32,
) { ) {
RUNTIME.spawn(async move { RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret) let result =
download_backup_keys(user_identifier, backup_secret, backup_id)
.await .await
.map_err(|err| err.to_string()); .map_err(|err| err.to_string());
let result = match result { let result = match result {
Ok(result) => result, Ok(result) => result,
Err(error) => { Err(error) => {
string_callback(error, promise_id, "".to_string()); string_callback(error, promise_id, "".to_string());
return; return;
} }
}; };
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse { Ok(LatestBackupInfoResponse {
backup_id, backup_id,
user_id, user_id,
siwe_backup_msg, siwe_backup_msg,
}) })
} }
async fn download_backup_keys( async fn download_backup_keys(
backup_id: String, user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> { ) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?; let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;
let backup_descriptor = BackupDescriptor::BackupID { let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};
let mut encrypted_user_keys = backup_client let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys) .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?; .await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?; let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key) UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
} }
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} }
/// Stores the Olm account in `pickled_account`. However, Olm account /// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need /// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change. /// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account /// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these /// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary. /// operations only the identity signing key is necessary.
// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct UserKeys { struct UserKeys {
backup_data_key: String, backup_data_key: String,
backup_log_data_key: String, backup_log_data_key: String,
pickle_key: String, pickle_key: String,
pickled_account: String, pickled_account: String,
} }
impl UserKeys { impl UserKeys {
Show All 31 Lines