Page MenuHomePhabricator
Differential D13897

[sqlite] Add getInboundP2PMessagesByID query
ClosedPublic
Actions

Authored by angelika on Nov 8 2024, 7:51 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)
Feb 12 2025, 7:50 PM
Unknown Object (File)
Feb 12 2025, 7:50 PM
Unknown Object (File)
Feb 12 2025, 7:50 PM
Unknown Object (File)
Jan 13 2025, 1:59 AM
Unknown Object (File)
Jan 13 2025, 1:59 AM
View All 29 Files
Subscribers
ashoat

Details

Reviewers
tomek
kamil
Commits
rCOMM224d94fb7a6e: [sqlite] Add getInboundP2PMessagesByID query
Summary

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

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:51 AM
Herald added a subscriber: ashoat. · View Herald TranscriptNov 8 2024, 7:51 AM
angelika added a child revision: D13898: [web] Implement getInboundP2PMessagesByID query on worker.Nov 8 2024, 7:52 AM
Harbormaster completed remote builds in B32592: Diff 45721.Nov 8 2024, 8:14 AM
angelika requested review of this revision.Nov 8 2024, 8:14 AM
kamil accepted this revision.Nov 12 2024, 2:42 AM
kamil added inline comments.
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2752 ↗(On Diff #45721)
2753–2754 ↗(On Diff #45721)

nit: match indentation with other queries here

This revision is now accepted and ready to land.Nov 12 2024, 2:42 AM
angelika updated this revision to Diff 45735.Nov 12 2024, 4:50 AM

Formatting

kamil added inline comments.Nov 12 2024, 5:03 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2753–2757 ↗(On Diff #45735)

it needs to be 2-spaces to match other queries

Harbormaster failed remote builds in B32601: Diff 45735!Nov 12 2024, 5:06 AM
angelika updated this revision to Diff 45740.Nov 12 2024, 5:44 AM

Run emscripten

Harbormaster completed remote builds in B32606: Diff 45740.Nov 12 2024, 6:10 AM
Closed by commit rCOMM224d94fb7a6e: [sqlite] Add getInboundP2PMessagesByID query (authored by angelika). · Explain WhyNov 13 2024, 4:17 AM
This revision was automatically updated to reflect the committed changes.
angelika added a commit: rCOMM224d94fb7a6e: [sqlite] Add getInboundP2PMessagesByID query.
ashoat added inline comments.Nov 13 2024, 5:49 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2753–2757 ↗(On Diff #45735)

Kamil's feedback here was not addressed

angelika mentioned this in D13922: [sqlite] Add missing spaces in getInboundP2PMessagesByID query.Nov 13 2024, 6:15 AM
angelika mentioned this in rCOMMadd745dbaf17: [sqlite] Add missing spaces in getInboundP2PMessagesByID query.Nov 13 2024, 11:22 AM

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
DatabaseManagers/
2 lines
2 lines
20 lines
web/
cpp/
3 lines
shared-worker/
_generated/
queries/
6 lines
types/
3 lines

Diff 45783

View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

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/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

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/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

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/cpp/SQLiteQueryExecutorBindings.cpp

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/shared-worker/_generated/comm_query_executor.wasm

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/shared-worker/queries/inbound-p2p-message-queries.test.js

Loading...
View Options

web/shared-worker/types/sqlite-query-executor.js

Loading...