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

fix ci

Browse Source
This commit is contained in:
Hocuri
2022-10-14 17:29:05 +02:00
parent 74fb567470
commit 2bf88108a6
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/authres_handling.rs
View File

@@ -15,14 +15,14 @@ use crate::headerdef::HeaderDef;
use crate::tools::EmailAddress; use crate::tools::EmailAddress;
/// `authres` is short for the Authentication-Results header, defined in /// `authres` is short for the Authentication-Results header, defined in
/// https://datatracker.ietf.org/doc/html/rfc8601, which contains info /// <https://datatracker.ietf.org/doc/html/rfc8601>, which contains info
/// about whether DKIM and SPF passed. /// about whether DKIM and SPF passed.
/// ///
/// To mitigate from forgery, we remember for each sending domain whether it is known /// To mitigate from forgery, we remember for each sending domain whether it is known
/// to have valid DKIM. If an email from such a domain comes with invalid DKIM, /// to have valid DKIM. If an email from such a domain comes with invalid DKIM,
/// we don't allow changing the autocrypt key. /// we don't allow changing the autocrypt key.
/// ///
/// See https://github.com/deltachat/deltachat-core-rust/issues/3507. /// See <https://github.com/deltachat/deltachat-core-rust/issues/3507>.
pub(crate) async fn handle_authres( pub(crate) async fn handle_authres(
context: &Context, context: &Context,
mail: &ParsedMail<'_>, mail: &ParsedMail<'_>,
@@ -215,7 +215,7 @@ async fn should_allow_keychange(
let ids = parse_authservid_candidates_config(&ids_config); let ids = parse_authservid_candidates_config(&ids_config);
// Remove all foreign authentication results // Remove all foreign authentication results
authres.retain_mut(|(authserv_id, _dkim_passed)| ids.contains(authserv_id.as_str())); authres.retain(|(authserv_id, _dkim_passed)| ids.contains(authserv_id.as_str()));
if authres.is_empty() { if authres.is_empty() {
// If the authentication results are empty, then our provider doesn't add them // If the authentication results are empty, then our provider doesn't add them
@@ -530,7 +530,7 @@ Authentication-Results: gmx.net; dkim=pass header.i=@slack.com";
let t = TestContext::new().await; let t = TestContext::new().await;
t.configure_addr(&self_addr).await; t.configure_addr(&self_addr).await;
if !authres_parsing_works { if !authres_parsing_works {
println!("========= Receiving as {self_addr} ========="); println!("========= Receiving as {} =========", &self_addr);
} }
// Simulate receiving all emails once, so that we have the correct authserv-ids // Simulate receiving all emails once, so that we have the correct authserv-ids
@@ -587,10 +587,9 @@ Authentication-Results: gmx.net; dkim=pass header.i=@slack.com";
entry.path(), entry.path(),
dir.iter().map(|e| e.file_name()).collect::<Vec<_>>() dir.iter().map(|e| e.file_name()).collect::<Vec<_>>()
); );
println!("works {authres_parsing_works} self {self_domain}");
test_failed = true; test_failed = true;
} }
println!("From {from_domain}: {dkim_result}"); println!("From {}: {}", from_domain, dkim_result);
} }
} }

2
src/config.rs
View File

@@ -188,7 +188,7 @@ pub enum Config {
/// Space-separated list of all the authserv-ids which we believe /// Space-separated list of all the authserv-ids which we believe
/// may be the one of our email server. /// may be the one of our email server.
/// ///
/// See [update_authservid_candidates](`crate::authres_handling::update_authservid_candidates`). /// See `crate::authres_handling::update_authservid_candidates`.
AuthservidCandidates, AuthservidCandidates,
} }