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

fix(receive_imf): remove recursive sql call

Browse Source
This commit is contained in:
dignifiedquire
2019-07-21 12:56:04 +02:00
parent df5464ea80
commit 69dc237ee3
1 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/dc_receive_imf.rs
View File

@@ -1659,9 +1659,7 @@ unsafe fn check_verified_properties(
let to_ids_str = to_string(to_ids_str_c); let to_ids_str = to_string(to_ids_str_c);
free(to_ids_str_c as *mut libc::c_void); free(to_ids_str_c as *mut libc::c_void);
let ok = context let rows = context.sql.query_map(
.sql
.query_map(
format!( format!(
"SELECT c.addr, LENGTH(ps.verified_key_fingerprint) FROM contacts c \ "SELECT c.addr, LENGTH(ps.verified_key_fingerprint) FROM contacts c \
LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ", LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ",
@@ -1669,13 +1667,17 @@ unsafe fn check_verified_properties(
), ),
params![], params![],
|row| Ok((row.get::<_, String>(0)?, row.get::<_, i32>(1)?)), |row| Ok((row.get::<_, String>(0)?, row.get::<_, i32>(1)?)),
|rows| { |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
for row in rows { );
let (to_addr, mut is_verified) = row?;
if rows.is_err() {
cleanup();
return 0;
}
for (to_addr, mut is_verified) in rows.unwrap().into_iter() {
let mut peerstate = Peerstate::from_addr(context, &context.sql, &to_addr); let mut peerstate = Peerstate::from_addr(context, &context.sql, &to_addr);
if mimeparser.e2ee_helper.gossipped_addr.contains(&to_addr) if mimeparser.e2ee_helper.gossipped_addr.contains(&to_addr) && peerstate.is_some() {
&& peerstate.is_some()
{
let peerstate = peerstate.as_mut().unwrap(); let peerstate = peerstate.as_mut().unwrap();
// if we're here, we know the gossip key is verified: // if we're here, we know the gossip key is verified:
@@ -1684,10 +1686,8 @@ unsafe fn check_verified_properties(
// (otherwise a verified key can _only_ be updated through QR scan which might be annoying, // (otherwise a verified key can _only_ be updated through QR scan which might be annoying,
// see https://github.com/nextleap-project/countermitm/issues/46 for a discussion about this point) // see https://github.com/nextleap-project/countermitm/issues/46 for a discussion about this point)
if 0 == is_verified if 0 == is_verified
|| peerstate.verified_key_fingerprint || peerstate.verified_key_fingerprint != peerstate.public_key_fingerprint
!= peerstate.public_key_fingerprint && peerstate.verified_key_fingerprint != peerstate.gossip_key_fingerprint
&& peerstate.verified_key_fingerprint
!= peerstate.gossip_key_fingerprint
{ {
info!( info!(
context, context,
@@ -1710,17 +1710,11 @@ unsafe fn check_verified_properties(
to_addr to_addr
)); ));
cleanup(); cleanup();
return Err(failure::format_err!("not a valid memember").into()); return 0;
} }
} }
Ok(())
},
)
.is_ok(); // TODO: Better default
cleanup(); 1
ok as libc::c_int
} }
unsafe fn set_better_msg(mime_parser: &dc_mimeparser_t, better_msg: *mut *mut libc::c_char) { unsafe fn set_better_msg(mime_parser: &dc_mimeparser_t, better_msg: *mut *mut libc::c_char) {