Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-17 05:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not allow sync item timestamps to be in the future

Browse Source
This commit is contained in:
link2xt
2025-09-13 06:19:59 +00:00
parent 2481a0f48e
commit afc74b0829
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/receive_imf.rs
View File

@@ -854,7 +854,9 @@ pub(crate) async fn receive_imf_inner(
if let Some(ref sync_items) = mime_parser.sync_items { if let Some(ref sync_items) = mime_parser.sync_items {
if from_id == ContactId::SELF { if from_id == ContactId::SELF {
if mime_parser.was_encrypted() { if mime_parser.was_encrypted() {
context.execute_sync_items(sync_items).await; context
.execute_sync_items(sync_items, mime_parser.timestamp_sent)
.await;
} else { } else {
warn!(context, "Sync items are not encrypted."); warn!(context, "Sync items are not encrypted.");
} }

15
src/sync.rs
View File

@@ -253,13 +253,19 @@ impl Context {
/// If an error is returned, the caller shall not try over because some sync items could be /// If an error is returned, the caller shall not try over because some sync items could be
/// already executed. Sync items are considered independent and executed in the given order but /// already executed. Sync items are considered independent and executed in the given order but
/// regardless of whether executing of the previous items succeeded. /// regardless of whether executing of the previous items succeeded.
pub(crate) async fn execute_sync_items(&self, items: &SyncItems) { pub(crate) async fn execute_sync_items(&self, items: &SyncItems, timestamp_sent: i64) {
info!(self, "executing {} sync item(s)", items.items.len()); info!(self, "executing {} sync item(s)", items.items.len());
for item in &items.items { for item in &items.items {
// Limit the timestamp to ensure it is not in the future.
//
// `sent_timestamp` should be already corrected
// if the `Date` header is in the future.
let timestamp = std::cmp::min(item.timestamp, timestamp_sent);
match &item.data { match &item.data {
SyncDataOrUnknown::SyncData(data) => match data { SyncDataOrUnknown::SyncData(data) => match data {
AddQrToken(token) => self.add_qr_token(token, item.timestamp).await, AddQrToken(token) => self.add_qr_token(token, timestamp).await,
DeleteQrToken(token) => self.delete_qr_token(token, item.timestamp).await, DeleteQrToken(token) => self.delete_qr_token(token, timestamp).await,
AlterChat { id, action } => self.sync_alter_chat(id, action).await, AlterChat { id, action } => self.sync_alter_chat(id, action).await,
SyncData::Config { key, val } => self.sync_config(key, val).await, SyncData::Config { key, val } => self.sync_config(key, val).await,
SyncData::SaveMessage { src, dest } => self.save_message(src, dest).await, SyncData::SaveMessage { src, dest } => self.save_message(src, dest).await,
@@ -557,6 +563,7 @@ mod tests {
assert!(!token::exists(&t, Namespace::Auth, "yip-auth").await?); assert!(!token::exists(&t, Namespace::Auth, "yip-auth").await?);
let timestamp_sent = time();
let sync_items = t let sync_items = t
.parse_sync_items( .parse_sync_items(
r#"{"items":[ r#"{"items":[
@@ -571,7 +578,7 @@ mod tests {
.to_string(), .to_string(),
) )
?; ?;
t.execute_sync_items(&sync_items).await; t.execute_sync_items(&sync_items, timestamp_sent).await;
assert!( assert!(
Contact::lookup_id_by_addr(&t, "bob@example.net", Origin::Unknown) Contact::lookup_id_by_addr(&t, "bob@example.net", Origin::Unknown)