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

first bit

Browse Source
This commit is contained in:
holger krekel
2019-09-29 17:13:28 +02:00
parent ab2ef1e1e4
commit cbfb391714
2 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/e2ee.rs
View File

@@ -339,7 +339,7 @@ pub fn try_decrypt(
}
}
}
Ok((encrypted, signatures, gossipped_addr))
Ok((!signatures.is_empty(), signatures, gossipped_addr))
}
fn new_data_part(
@@ -436,57 +436,39 @@ fn update_gossip_peerstates(
let mut recipients: Option<HashSet<String>> = None;
let mut gossipped_addr: HashSet<String> = Default::default();
for cur_data in unsafe { (*(*gossip_headers).fld_list).into_iter() } {
let field = cur_data as *mut mailimf_field;
if field.is_null() {
continue;
}
let fields = wrapmime::iter_optional_field_values(
gossip_headers,
b"Autocrypt-Gossip\0" as *const u8 as *const libc::c_char,
)?;
for value in fields.iter() {
let gossip_header = Aheader::from_str(&value);
let field = unsafe { *field };
if field.fld_type == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int {
let optional_field = unsafe { field.fld_data.fld_optional_field };
if optional_field.is_null() {
continue;
if let Ok(ref header) = gossip_header {
if recipients.is_none() {
recipients = Some(mailimf_get_recipients(imffields));
}
let optional_field = unsafe { *optional_field };
if !optional_field.fld_name.is_null()
&& as_str(optional_field.fld_name) == "Autocrypt-Gossip"
{
let value = to_string_lossy(optional_field.fld_value);
let gossip_header = Aheader::from_str(&value);
if let Ok(ref header) = gossip_header {
if recipients.is_none() {
recipients = Some(mailimf_get_recipients(imffields));
}
if recipients.as_ref().unwrap().contains(&header.addr) {
let mut peerstate =
Peerstate::from_addr(context, &context.sql, &header.addr);
if let Some(ref mut peerstate) = peerstate {
peerstate.apply_gossip(header, message_time);
peerstate.save_to_db(&context.sql, false)?;
} else {
let p = Peerstate::from_gossip(context, header, message_time);
p.save_to_db(&context.sql, true)?;
peerstate = Some(p);
}
if let Some(peerstate) = peerstate {
if peerstate.degrade_event.is_some() {
handle_degrade_event(context, &peerstate)?;
}
}
gossipped_addr.insert(header.addr.clone());
} else {
info!(
context,
"Ignoring gossipped \"{}\" as the address is not in To/Cc list.",
&header.addr,
);
if recipients.as_ref().unwrap().contains(&header.addr) {
let mut peerstate = Peerstate::from_addr(context, &context.sql, &header.addr);
if let Some(ref mut peerstate) = peerstate {
peerstate.apply_gossip(header, message_time);
peerstate.save_to_db(&context.sql, false)?;
} else {
let p = Peerstate::from_gossip(context, header, message_time);
p.save_to_db(&context.sql, true)?;
peerstate = Some(p);
}
if let Some(peerstate) = peerstate {
if peerstate.degrade_event.is_some() {
handle_degrade_event(context, &peerstate)?;
}
}
gossipped_addr.insert(header.addr.clone());
} else {
info!(
context,
"Ignoring gossipped \"{}\" as the address is not in To/Cc list.", &header.addr,
);
}
}
}

29
src/wrapmime.rs
View File

@@ -202,6 +202,35 @@ pub unsafe fn mailimf_find_optional_field(
ptr::null_mut()
}
pub fn iter_optional_field_values(
header: *const mailimf_fields,
wanted_fld_name: *const libc::c_char,
) -> Result<Vec<String>, Error> {
ensure!(
!header.is_null() && unsafe { !(*header).fld_list.is_null() },
"iter_optional_fields: invalid input"
);
let mut result = Vec::default();
for cur_data in unsafe { (*(*header).fld_list).into_iter() } {
let field: *mut mailimf_field = cur_data as *mut _;
unsafe {
if (*field).fld_type == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int {
let optional_field: *mut mailimf_optional_field =
(*field).fld_data.fld_optional_field;
if !optional_field.is_null()
&& !(*optional_field).fld_name.is_null()
&& !(*optional_field).fld_value.is_null()
&& strcasecmp((*optional_field).fld_name, wanted_fld_name) == 0i32
{
result.push(to_string((*optional_field).fld_value));
}
}
}
}
Ok(result)
}
pub fn mailimf_get_recipients(imffields: *mut mailimf_fields) -> HashSet<String> {
/* returned addresses are normalized. */
let mut recipients: HashSet<String> = Default::default();