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

Remove different states of ToSave in peerstate

Browse Source
This commit is contained in:
link2xt
2022-11-25 21:06:14 +00:00
parent 08de326930
commit 2ae9165bfb
5 changed files with 25 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/e2ee.rs
View File

@@ -147,7 +147,6 @@ mod tests {
use crate::chat; use crate::chat;
use crate::message::{Message, Viewtype}; use crate::message::{Message, Viewtype};
use crate::param::Param; use crate::param::Param;
use crate::peerstate::ToSave;
use crate::test_utils::{bob_keypair, TestContext}; use crate::test_utils::{bob_keypair, TestContext};
use super::*; use super::*;
@@ -297,7 +296,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
gossip_key_fingerprint: Some(pub_key.fingerprint()), gossip_key_fingerprint: Some(pub_key.fingerprint()),
verified_key: Some(pub_key.clone()), verified_key: Some(pub_key.clone()),
verified_key_fingerprint: Some(pub_key.fingerprint()), verified_key_fingerprint: Some(pub_key.fingerprint()),
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
vec![(Some(peerstate), addr)] vec![(Some(peerstate), addr)]

61
src/peerstate.rs
View File

@@ -46,7 +46,7 @@ pub struct Peerstate {
pub gossip_key_fingerprint: Option<Fingerprint>, pub gossip_key_fingerprint: Option<Fingerprint>,
pub verified_key: Option<SignedPublicKey>, pub verified_key: Option<SignedPublicKey>,
pub verified_key_fingerprint: Option<Fingerprint>, pub verified_key_fingerprint: Option<Fingerprint>,
pub to_save: Option<ToSave>, pub to_save: bool,
pub fingerprint_changed: bool, pub fingerprint_changed: bool,
} }
@@ -90,13 +90,6 @@ impl fmt::Debug for Peerstate {
} }
} }
#[derive(Debug, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive)]
#[repr(u8)]
pub enum ToSave {
Timestamps = 0x01,
All = 0x02,
}
impl Peerstate { impl Peerstate {
pub fn from_header(header: &Aheader, message_time: i64) -> Self { pub fn from_header(header: &Aheader, message_time: i64) -> Self {
Peerstate { Peerstate {
@@ -111,7 +104,7 @@ impl Peerstate {
gossip_timestamp: 0, gossip_timestamp: 0,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
} }
} }
@@ -137,7 +130,7 @@ impl Peerstate {
gossip_timestamp: message_time, gossip_timestamp: message_time,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
} }
} }
@@ -229,7 +222,7 @@ impl Peerstate {
.map(|s| s.parse::<Fingerprint>()) .map(|s| s.parse::<Fingerprint>())
.transpose() .transpose()
.unwrap_or_default(), .unwrap_or_default(),
to_save: None, to_save: false,
fingerprint_changed: false, fingerprint_changed: false,
}; };
@@ -252,7 +245,7 @@ impl Peerstate {
|| self.public_key_fingerprint.is_none() || self.public_key_fingerprint.is_none()
|| old_public_fingerprint != self.public_key_fingerprint || old_public_fingerprint != self.public_key_fingerprint
{ {
self.to_save = Some(ToSave::All); self.to_save = true;
if old_public_fingerprint.is_some() { if old_public_fingerprint.is_some() {
self.fingerprint_changed = true; self.fingerprint_changed = true;
} }
@@ -267,7 +260,7 @@ impl Peerstate {
|| self.gossip_key_fingerprint.is_none() || self.gossip_key_fingerprint.is_none()
|| old_gossip_fingerprint != self.gossip_key_fingerprint || old_gossip_fingerprint != self.gossip_key_fingerprint
{ {
self.to_save = Some(ToSave::All); self.to_save = true;
// Warn about gossip key change only if there is no public key obtained from // Warn about gossip key change only if there is no public key obtained from
// Autocrypt header, which overrides gossip key. // Autocrypt header, which overrides gossip key.
@@ -281,7 +274,7 @@ impl Peerstate {
pub fn degrade_encryption(&mut self, message_time: i64) { pub fn degrade_encryption(&mut self, message_time: i64) {
self.prefer_encrypt = EncryptPreference::Reset; self.prefer_encrypt = EncryptPreference::Reset;
self.last_seen = message_time; self.last_seen = message_time;
self.to_save = Some(ToSave::All); self.to_save = true;
} }
pub fn apply_header(&mut self, header: &Aheader, message_time: i64) { pub fn apply_header(&mut self, header: &Aheader, message_time: i64) {
@@ -292,19 +285,17 @@ impl Peerstate {
if message_time > self.last_seen { if message_time > self.last_seen {
self.last_seen = message_time; self.last_seen = message_time;
self.last_seen_autocrypt = message_time; self.last_seen_autocrypt = message_time;
self.to_save = Some(ToSave::Timestamps); self.to_save = true;
if (header.prefer_encrypt == EncryptPreference::Mutual if (header.prefer_encrypt == EncryptPreference::Mutual
|| header.prefer_encrypt == EncryptPreference::NoPreference) || header.prefer_encrypt == EncryptPreference::NoPreference)
&& header.prefer_encrypt != self.prefer_encrypt && header.prefer_encrypt != self.prefer_encrypt
{ {
self.prefer_encrypt = header.prefer_encrypt; self.prefer_encrypt = header.prefer_encrypt;
self.to_save = Some(ToSave::All)
} }
if self.public_key.as_ref() != Some(&header.public_key) { if self.public_key.as_ref() != Some(&header.public_key) {
self.public_key = Some(header.public_key.clone()); self.public_key = Some(header.public_key.clone());
self.recalc_fingerprint(); self.recalc_fingerprint();
self.to_save = Some(ToSave::All);
} }
} }
} }
@@ -316,11 +307,10 @@ impl Peerstate {
if message_time > self.gossip_timestamp { if message_time > self.gossip_timestamp {
self.gossip_timestamp = message_time; self.gossip_timestamp = message_time;
self.to_save = Some(ToSave::Timestamps); self.to_save = true;
if self.gossip_key.as_ref() != Some(&gossip_header.public_key) { if self.gossip_key.as_ref() != Some(&gossip_header.public_key) {
self.gossip_key = Some(gossip_header.public_key.clone()); self.gossip_key = Some(gossip_header.public_key.clone());
self.recalc_fingerprint(); self.recalc_fingerprint();
self.to_save = Some(ToSave::All)
} }
// This is non-standard. // This is non-standard.
@@ -339,7 +329,6 @@ impl Peerstate {
&& gossip_header.prefer_encrypt == EncryptPreference::Mutual && gossip_header.prefer_encrypt == EncryptPreference::Mutual
{ {
self.prefer_encrypt = EncryptPreference::Mutual; self.prefer_encrypt = EncryptPreference::Mutual;
self.to_save = Some(ToSave::All);
} }
}; };
} }
@@ -395,7 +384,7 @@ impl Peerstate {
if self.public_key_fingerprint.is_some() if self.public_key_fingerprint.is_some()
&& self.public_key_fingerprint.as_ref().unwrap() == fingerprint && self.public_key_fingerprint.as_ref().unwrap() == fingerprint
{ {
self.to_save = Some(ToSave::All); self.to_save = true;
self.verified_key = self.public_key.clone(); self.verified_key = self.public_key.clone();
self.verified_key_fingerprint = self.public_key_fingerprint.clone(); self.verified_key_fingerprint = self.public_key_fingerprint.clone();
true true
@@ -407,7 +396,7 @@ impl Peerstate {
if self.gossip_key_fingerprint.is_some() if self.gossip_key_fingerprint.is_some()
&& self.gossip_key_fingerprint.as_ref().unwrap() == fingerprint && self.gossip_key_fingerprint.as_ref().unwrap() == fingerprint
{ {
self.to_save = Some(ToSave::All); self.to_save = true;
self.verified_key = self.gossip_key.clone(); self.verified_key = self.gossip_key.clone();
self.verified_key_fingerprint = self.gossip_key_fingerprint.clone(); self.verified_key_fingerprint = self.gossip_key_fingerprint.clone();
true true
@@ -422,7 +411,7 @@ impl Peerstate {
} }
pub async fn save_to_db(&self, sql: &Sql, create: bool) -> Result<()> { pub async fn save_to_db(&self, sql: &Sql, create: bool) -> Result<()> {
if self.to_save == Some(ToSave::All) || create { if self.to_save || create {
sql.execute( sql.execute(
if create { if create {
"INSERT INTO acpeerstates ( \ "INSERT INTO acpeerstates ( \
@@ -467,18 +456,6 @@ impl Peerstate {
], ],
) )
.await?; .await?;
} else if self.to_save == Some(ToSave::Timestamps) {
sql.execute(
"UPDATE acpeerstates SET last_seen=?, last_seen_autocrypt=?, gossip_timestamp=? \
WHERE addr=?;",
paramsv![
self.last_seen,
self.last_seen_autocrypt,
self.gossip_timestamp,
self.addr
],
)
.await?;
} }
Ok(()) Ok(())
@@ -651,7 +628,7 @@ pub async fn maybe_do_aeap_transition(
"Internal error: Tried to do an AEAP transition without an autocrypt header??", "Internal error: Tried to do an AEAP transition without an autocrypt header??",
)?; )?;
peerstate.apply_header(header, info.message_time); peerstate.apply_header(header, info.message_time);
peerstate.to_save = Some(ToSave::All); peerstate.to_save = true;
// We don't know whether a peerstate with this address already existed, or a // We don't know whether a peerstate with this address already existed, or a
// new one should be created, so just try both create=false and create=true, // new one should be created, so just try both create=false and create=true,
@@ -722,7 +699,7 @@ mod tests {
gossip_key_fingerprint: Some(pub_key.fingerprint()), gossip_key_fingerprint: Some(pub_key.fingerprint()),
verified_key: Some(pub_key.clone()), verified_key: Some(pub_key.clone()),
verified_key_fingerprint: Some(pub_key.fingerprint()), verified_key_fingerprint: Some(pub_key.fingerprint()),
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
@@ -737,7 +714,7 @@ mod tests {
.expect("no peerstate found in the database"); .expect("no peerstate found in the database");
// clear to_save, as that is not persissted // clear to_save, as that is not persissted
peerstate.to_save = None; peerstate.to_save = false;
assert_eq!(peerstate, peerstate_new); assert_eq!(peerstate, peerstate_new);
let peerstate_new2 = Peerstate::from_fingerprint(&ctx.ctx, &pub_key.fingerprint()) let peerstate_new2 = Peerstate::from_fingerprint(&ctx.ctx, &pub_key.fingerprint())
.await .await
@@ -764,7 +741,7 @@ mod tests {
gossip_key_fingerprint: None, gossip_key_fingerprint: None,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
@@ -797,7 +774,7 @@ mod tests {
gossip_key_fingerprint: None, gossip_key_fingerprint: None,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
@@ -811,7 +788,7 @@ mod tests {
.expect("failed to load peerstate from db"); .expect("failed to load peerstate from db");
// clear to_save, as that is not persissted // clear to_save, as that is not persissted
peerstate.to_save = None; peerstate.to_save = false;
assert_eq!(Some(peerstate), peerstate_new); assert_eq!(Some(peerstate), peerstate_new);
} }
@@ -862,7 +839,7 @@ mod tests {
gossip_key_fingerprint: None, gossip_key_fingerprint: None,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: None, to_save: false,
fingerprint_changed: false, fingerprint_changed: false,
}; };
assert_eq!(peerstate.prefer_encrypt, EncryptPreference::NoPreference); assert_eq!(peerstate.prefer_encrypt, EncryptPreference::NoPreference);

3
src/qr.rs
View File

@@ -641,7 +641,6 @@ mod tests {
use crate::aheader::EncryptPreference; use crate::aheader::EncryptPreference;
use crate::chat::{create_group_chat, ProtectionStatus}; use crate::chat::{create_group_chat, ProtectionStatus};
use crate::key::DcKey; use crate::key::DcKey;
use crate::peerstate::ToSave;
use crate::securejoin::get_securejoin_qr; use crate::securejoin::get_securejoin_qr;
use crate::test_utils::{alice_keypair, TestContext}; use crate::test_utils::{alice_keypair, TestContext};
use anyhow::Result; use anyhow::Result;
@@ -894,7 +893,7 @@ mod tests {
gossip_key_fingerprint: None, gossip_key_fingerprint: None,
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
assert!( assert!(

6
src/securejoin.rs
View File

@@ -18,7 +18,7 @@ use crate::key::{DcKey, Fingerprint, SignedPublicKey};
use crate::message::{Message, Viewtype}; use crate::message::{Message, Viewtype};
use crate::mimeparser::{MimeMessage, SystemMessage}; use crate::mimeparser::{MimeMessage, SystemMessage};
use crate::param::Param; use crate::param::Param;
use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus, ToSave}; use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus};
use crate::qr::check_qr; use crate::qr::check_qr;
use crate::stock_str; use crate::stock_str;
use crate::token; use crate::token;
@@ -640,7 +640,7 @@ async fn mark_peer_as_verified(context: &Context, fingerprint: &Fingerprint) ->
PeerstateVerifiedStatus::BidirectVerified, PeerstateVerifiedStatus::BidirectVerified,
) { ) {
peerstate.prefer_encrypt = EncryptPreference::Mutual; peerstate.prefer_encrypt = EncryptPreference::Mutual;
peerstate.to_save = Some(ToSave::All); peerstate.to_save = true;
peerstate peerstate
.save_to_db(&context.sql, false) .save_to_db(&context.sql, false)
.await .await
@@ -932,7 +932,7 @@ mod tests {
gossip_key_fingerprint: Some(alice_pubkey.fingerprint()), gossip_key_fingerprint: Some(alice_pubkey.fingerprint()),
verified_key: None, verified_key: None,
verified_key_fingerprint: None, verified_key_fingerprint: None,
to_save: Some(ToSave::All), to_save: true,
fingerprint_changed: false, fingerprint_changed: false,
}; };
peerstate.save_to_db(&bob.ctx.sql, true).await?; peerstate.save_to_db(&bob.ctx.sql, true).await?;

2
src/tests/aeap.rs
View File

@@ -341,7 +341,7 @@ async fn mark_as_verified(this: &TestContext, other: &TestContext) {
peerstate.verified_key = peerstate.public_key.clone(); peerstate.verified_key = peerstate.public_key.clone();
peerstate.verified_key_fingerprint = peerstate.public_key_fingerprint.clone(); peerstate.verified_key_fingerprint = peerstate.public_key_fingerprint.clone();
peerstate.to_save = Some(peerstate::ToSave::All); peerstate.to_save = true;
peerstate.save_to_db(&this.sql, false).await.unwrap(); peerstate.save_to_db(&this.sql, false).await.unwrap();
} }