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

refactor: remove unused argument from set_verified()

Browse Source 
It is always PeerstateVerifiedStatus::BidirectVerified
and is always passed as a constant.
This commit is contained in:
link2xt
2023-10-30 14:50:35 +00:00
parent ed2bc9e44d
commit b747dd6ae8
3 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/peerstate.rs
View File

@@ -427,42 +427,37 @@ impl Peerstate {
&mut self, &mut self,
which_key: PeerstateKeyType, which_key: PeerstateKeyType,
fingerprint: Fingerprint, fingerprint: Fingerprint,
verified: PeerstateVerifiedStatus,
verifier: String, verifier: String,
) -> Result<()> { ) -> Result<()> {
if verified == PeerstateVerifiedStatus::BidirectVerified { match which_key {
match which_key { PeerstateKeyType::PublicKey => {
PeerstateKeyType::PublicKey => { 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.verified_key = self.public_key.clone();
self.verified_key = self.public_key.clone(); self.verified_key_fingerprint = Some(fingerprint);
self.verified_key_fingerprint = Some(fingerprint); self.verifier = Some(verifier);
self.verifier = Some(verifier); Ok(())
Ok(()) } else {
} else { Err(Error::msg(format!(
Err(Error::msg(format!( "{fingerprint} is not peer's public key fingerprint",
"{fingerprint} is not peer's public key fingerprint", )))
))) }
} }
} PeerstateKeyType::GossipKey => {
PeerstateKeyType::GossipKey => { 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.verified_key = self.gossip_key.clone();
self.verified_key = self.gossip_key.clone(); self.verified_key_fingerprint = Some(fingerprint);
self.verified_key_fingerprint = Some(fingerprint); self.verifier = Some(verifier);
self.verifier = Some(verifier); Ok(())
Ok(()) } else {
} else { Err(Error::msg(format!(
Err(Error::msg(format!( "{fingerprint} is not peer's gossip key fingerprint",
"{fingerprint} is not peer's gossip key fingerprint", )))
)))
}
} }
} }
} else {
Err(Error::msg("BidirectVerified required"))
} }
} }

3
src/receive_imf.rs
View File

@@ -30,7 +30,7 @@ use crate::message::{
}; };
use crate::mimeparser::{parse_message_ids, AvatarAction, MimeMessage, SystemMessage}; use crate::mimeparser::{parse_message_ids, AvatarAction, MimeMessage, SystemMessage};
use crate::param::{Param, Params}; use crate::param::{Param, Params};
use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus}; use crate::peerstate::{Peerstate, PeerstateKeyType};
use crate::reaction::{set_msg_reaction, Reaction}; use crate::reaction::{set_msg_reaction, Reaction};
use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device}; use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device};
use crate::simplify; use crate::simplify;
@@ -2342,7 +2342,6 @@ async fn has_verified_encryption(
peerstate.set_verified( peerstate.set_verified(
PeerstateKeyType::GossipKey, PeerstateKeyType::GossipKey,
fp, fp,
PeerstateVerifiedStatus::BidirectVerified,
contact.get_addr().to_owned(), contact.get_addr().to_owned(),
)?; )?;
peerstate.save_to_db(&context.sql).await?; peerstate.save_to_db(&context.sql).await?;

19
src/securejoin.rs
View File

@@ -18,7 +18,7 @@ use crate::key::{load_self_public_key, DcKey, Fingerprint};
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}; use crate::peerstate::{Peerstate, PeerstateKeyType};
use crate::qr::check_qr; use crate::qr::check_qr;
use crate::stock_str; use crate::stock_str;
use crate::token; use crate::token;
@@ -614,12 +614,9 @@ pub(crate) async fn observe_securejoin_on_other_device(
return Ok(HandshakeMessage::Ignore); return Ok(HandshakeMessage::Ignore);
} }
}; };
if let Err(err) = peerstate.set_verified( if let Err(err) =
PeerstateKeyType::GossipKey, peerstate.set_verified(PeerstateKeyType::GossipKey, fingerprint, addr)
fingerprint, {
PeerstateVerifiedStatus::BidirectVerified,
addr,
) {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
contact_id, contact_id,
@@ -743,12 +740,8 @@ async fn mark_peer_as_verified(
verifier: String, verifier: String,
) -> Result<()> { ) -> Result<()> {
if let Some(ref mut peerstate) = Peerstate::from_fingerprint(context, &fingerprint).await? { if let Some(ref mut peerstate) = Peerstate::from_fingerprint(context, &fingerprint).await? {
if let Err(err) = peerstate.set_verified( if let Err(err) = peerstate.set_verified(PeerstateKeyType::PublicKey, fingerprint, verifier)
PeerstateKeyType::PublicKey, {
fingerprint,
PeerstateVerifiedStatus::BidirectVerified,
verifier,
) {
error!(context, "Could not mark peer as verified: {}", err); error!(context, "Could not mark peer as verified: {}", err);
return Err(err); return Err(err);
} }