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

DKIM-Checking: Don't disallowing keychanges for now

Browse Source 
To get back to a releaseable state - the info stays accessible in the
Message-info.

We can re-enable it as soon as it has been tested thoroughly.
This commit is contained in:
Hocuri
2022-11-04 11:57:49 +01:00
committed by link2xt
parent e93dc33ef8
commit db84317be0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/decrypt.rs
View File

@@ -79,7 +79,8 @@ pub async fn prepare_decryption(
from, from,
autocrypt_header.as_ref(), autocrypt_header.as_ref(),
message_time, message_time,
dkim_results.allow_keychange, // Disallowing keychanges is disabled for now:
true, // dkim_results.allow_keychange,
) )
.await?; .await?;

11
src/mimeparser.rs
View File

@@ -372,11 +372,12 @@ impl MimeMessage {
parser.heuristically_parse_ndn(context).await; parser.heuristically_parse_ndn(context).await;
parser.parse_headers(context).await?; parser.parse_headers(context).await?;
if !decryption_info.dkim_results.allow_keychange { // Disallowing keychanges is disabled for now
for part in parser.parts.iter_mut() { // if !decryption_info.dkim_results.allow_keychange {
part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string()); // for part in parser.parts.iter_mut() {
} // part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string());
} // }
// }
if warn_empty_signature && parser.signatures.is_empty() { if warn_empty_signature && parser.signatures.is_empty() {
for part in parser.parts.iter_mut() { for part in parser.parts.iter_mut() {
part.error = Some("No valid signature".to_string()); part.error = Some("No valid signature".to_string());