Page MenuHomePhabricator
Differential D10511

[lib/shared] clean `RefreshKeyRequest` type
ClosedPublic
Actions

Authored by kamil on Jan 3 2024, 7:25 AM.
Tags
None
Referenced Files
F5581237: D10511.diff
Sat, Apr 12, 7:39 PM
Unknown Object (File)
Tue, Apr 8, 8:51 PM
Unknown Object (File)
Sat, Apr 5, 10:59 PM
Unknown Object (File)
Feb 27 2025, 11:37 PM
Unknown Object (File)
Feb 27 2025, 4:16 PM
Unknown Object (File)
Feb 25 2025, 12:19 AM
Unknown Object (File)
Feb 20 2025, 6:28 PM
Unknown Object (File)
Feb 20 2025, 6:28 PM
View All 90 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
varun
michal
Commits
rCOMM10771ee94c00: [lib/shared] clean `RefreshKeyRequest` type
Summary

This is not a separate message type, this is a message sent as a payload of MessageToDevice.

The following change from D10379

Depends on D10510

Test Plan

Rust/Flow

Diff Detail

Repository
rCOMM Comm
Branch
publish-olm-stack-3
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jan 3 2024, 7:25 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 3 2024, 7:25 AM
Harbormaster completed remote builds in B25451: Diff 35159.Jan 3 2024, 8:00 AM
kamil added a child revision: D10526: [native] implement uploading one-time keys.Jan 4 2024, 3:11 AM
kamil published this revision for review.Jan 4 2024, 3:20 AM
kamil updated this revision to Diff 35423.Jan 9 2024, 2:43 AM

rebase

kamil edited the summary of this revision. (Show Details)Jan 9 2024, 2:51 AM
kamil added 1 blocking reviewer(s): michal.
Harbormaster failed remote builds in B25624: Diff 35423!Jan 9 2024, 2:55 AM
michal accepted this revision.Jan 9 2024, 2:58 AM
This revision is now accepted and ready to land.Jan 9 2024, 2:58 AM
kamil updated this revision to Diff 35425.Jan 9 2024, 3:11 AM

CI

Harbormaster completed remote builds in B25626: Diff 35425.Jan 9 2024, 3:36 AM
Closed by commit rCOMM10771ee94c00: [lib/shared] clean `RefreshKeyRequest` type (authored by kamil). · Explain WhyJan 11 2024, 5:28 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM10771ee94c00: [lib/shared] clean `RefreshKeyRequest` type.

Revision Contents
Changeset List

PathSize
keyserver/
src/
socket/
8 lines
lib/
types/
tunnelbroker/
7 lines
22 lines
shared/
tunnelbroker_messages/
src/
messages/
7 lines

Diff 35159

View Options

keyserver/src/socket/tunnelbroker-socket.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
View Options

lib/types/tunnelbroker/keys-types.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
View Options

lib/types/tunnelbroker/messages.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
View Options

lib/types/tunnelbroker/peer-to-peer-message-types.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
View Options

shared/tunnelbroker_messages/src/messages/mod.rs

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