Page MenuHomePhabricator
Differential D13900

[lib] Implement getInboundP2PMessagesByID in SQLiteAPI
ClosedPublic
Actions

Authored by angelika on Nov 8 2024, 7:56 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Sat, Mar 15, 2:13 AM
Unknown Object (File)
Fri, Mar 14, 9:01 AM
View All 85 Files
Subscribers
ashoat

Details

Reviewers
tomek
kamil
Commits
rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI
Summary

https://linear.app/comm/issue/ENG-9713/mitigate-risk-of-olm-already-decrypted-or-keys-skipped

Depends on D13899

Test Plan

Test plan in the last diff in stack.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

angelika created this revision.Nov 8 2024, 7:56 AM
Herald added a subscriber: ashoat. · View Herald TranscriptNov 8 2024, 7:56 AM
angelika added a child revision: D13901: [lib] Do not reset a session when getting already decrypted message.Nov 8 2024, 8:07 AM
Harbormaster completed remote builds in B32595: Diff 45724.Nov 8 2024, 8:27 AM
angelika requested review of this revision.Nov 8 2024, 8:27 AM
kamil accepted this revision.Nov 12 2024, 2:56 AM
This revision is now accepted and ready to land.Nov 12 2024, 2:56 AM
angelika updated this revision to Diff 45738.Nov 12 2024, 5:26 AM

Rebase

Harbormaster failed remote builds in B32604: Diff 45738!Nov 12 2024, 5:40 AM
angelika updated this revision to Diff 45743.Nov 12 2024, 5:45 AM

Rebase

Harbormaster failed remote builds in B32609: Diff 45743!Nov 12 2024, 6:03 AM
angelika updated this revision to Diff 45753.Nov 12 2024, 7:35 AM

Rebase

Harbormaster completed remote builds in B32617: Diff 45753.Nov 12 2024, 8:00 AM
Closed by commit rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI (authored by angelika). · Explain WhyNov 13 2024, 4:17 AM
This revision was automatically updated to reflect the committed changes.
angelika added a commit: rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI.

Revision Contents
Changeset List

PathSize
lib/
types/
3 lines
utils/
__mocks__/
1 line
native/
database/
1 line
web/
database/
14 lines

Diff 45786

View Options

lib/types/sqlite-types.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

lib/utils/__mocks__/config.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

native/database/sqlite-api.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

web/database/sqlite-api.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines