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

Only assume that DKIM works for a month after the last valid email

Browse Source
This commit is contained in:
Hocuri
2022-10-22 19:09:06 +02:00
parent 2b388d0eb7
commit c5e93bf057
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/authres.rs
View File

@@ -4,6 +4,7 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::fmt; use std::fmt;
use std::time::SystemTime;
use anyhow::Result; use anyhow::Result;
use mailparse::MailHeaderMap; use mailparse::MailHeaderMap;
@@ -13,6 +14,7 @@ use once_cell::sync::Lazy;
use crate::config::Config; use crate::config::Config;
use crate::context::Context; use crate::context::Context;
use crate::headerdef::HeaderDef; use crate::headerdef::HeaderDef;
use crate::tools::time;
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
@@ -276,24 +278,33 @@ async fn compute_dkim_results(
}) })
} }
/// Whether DKIM in emails from this domain is known to work.
async fn dkim_works(context: &Context, from_domain: &str) -> Result<bool> { async fn dkim_works(context: &Context, from_domain: &str) -> Result<bool> {
Ok(context let last_working_timestamp: i64 = context
.sql .sql
.query_get_value( .query_get_value(
"SELECT dkim_works FROM sending_domains WHERE domain=?", "SELECT dkim_works FROM sending_domains WHERE domain=?",
paramsv![from_domain], paramsv![from_domain],
) )
.await? .await?
.unwrap_or(false)) .unwrap_or(0);
// When we get an email with valid DKIM-Authentication-Results,
// then we assume that DKIM works for 30 days from this time on.
let should_work_until = last_working_timestamp + 3600 * 24 * 30;
let dkim_ever_worked = last_working_timestamp > 0;
let dkim_should_work_now = should_work_until > time();
Ok(dkim_ever_worked && dkim_should_work_now)
} }
async fn set_dkim_works(context: &Context, from_domain: &str) -> Result<()> { async fn set_dkim_works(context: &Context, from_domain: &str) -> Result<()> {
context context
.sql .sql
.execute( .execute(
"INSERT INTO sending_domains (domain, dkim_works) VALUES (?1,1) "INSERT INTO sending_domains (domain, dkim_works) VALUES (?,?)
ON CONFLICT(domain) DO UPDATE SET dkim_works=1 WHERE domain=?1", ON CONFLICT(domain) DO UPDATE SET dkim_works=excluded.dkim_works",
paramsv![from_domain], paramsv![from_domain, time()],
) )
.await?; .await?;
Ok(()) Ok(())
@@ -605,9 +616,9 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
// We don't need bob anymore, let's make sure it's not accidentally used // We don't need bob anymore, let's make sure it's not accidentally used
drop(bob); drop(bob);
// Assume Alice receives an email from bob@example.net in the past with // Assume Alice receives an email from bob@example.net with
// correct DKIM -> `dkim_works()` was called // correct DKIM -> `set_dkim_works()` was called
dkim_works(&alice, "example.net").await?; set_dkim_works(&alice, "example.net").await?;
// And Alice knows her server's authserv-id // And Alice knows her server's authserv-id
alice alice
.set_config(Config::AuthservIdCandidates, Some("example.org")) .set_config(Config::AuthservIdCandidates, Some("example.org"))