From f358bdbff121693fc3e44b5c2d853f515e4d371e Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sun, 16 Oct 2022 14:52:16 +0200
Subject: [PATCH] Some fixes from link2xt's review

---
 src/{authres_handling.rs => authres.rs} |  4 ++--
 src/config.rs                           |  2 +-
 src/decrypt.rs                          | 22 ++++++++++++++++------
 src/headerdef.rs                        |  1 +
 src/lib.rs                              |  2 +-
 src/sql/migrations.rs                   |  1 -
 src/tools.rs                            |  4 ++--
 7 files changed, 23 insertions(+), 13 deletions(-)
 rename src/{authres_handling.rs => authres.rs} (99%)

diff --git a/src/authres_handling.rs b/src/authres.rs
similarity index 99%
rename from src/authres_handling.rs
rename to src/authres.rs
index dde69569c..538f52604 100644
--- a/src/authres_handling.rs
+++ b/src/authres.rs
@@ -469,7 +469,7 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
     async fn test_realworld_authentication_results() -> Result<()> {
         let mut test_failed = false;
 
-        let dir = tools::read_dir("test-data/message/dkimchecks-2022-09-28/")
+        let dir = tools::read_dir("test-data/message/dkimchecks-2022-09-28/".as_ref())
             .await
             .unwrap();
         let mut bytes = Vec::new();
@@ -504,7 +504,7 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
             }
 
             // Simulate receiving all emails once, so that we have the correct authserv-ids
-            let mut dir = tools::read_dir(entry.path()).await.unwrap();
+            let mut dir = tools::read_dir(&entry.path()).await.unwrap();
 
             // The ordering in which the emails are received can matter;
             // the test _should_ pass for every ordering.
diff --git a/src/config.rs b/src/config.rs
index 612412aa5..a917ab907 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -188,7 +188,7 @@ pub enum Config {
     /// Space-separated list of all the authserv-ids which we believe
     /// may be the one of our email server.
     ///
-    /// See `crate::authres_handling::update_authservid_candidates`.
+    /// See `crate::authres::update_authservid_candidates`.
     AuthservidCandidates,
 }
 
diff --git a/src/decrypt.rs b/src/decrypt.rs
index 53a2dd88d..2e3fd7809 100644
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -7,8 +7,8 @@ use mailparse::ParsedMail;
 use mailparse::SingleInfo;
 
 use crate::aheader::Aheader;
-use crate::authres_handling;
-use crate::authres_handling::handle_authres;
+use crate::authres;
+use crate::authres::handle_authres;
 use crate::contact::addr_cmp;
 use crate::context::Context;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
@@ -105,7 +105,7 @@ pub struct DecryptionInfo {
     /// means out-of-order message arrival, We don't modify the
     /// peerstate in this case.
     pub message_time: i64,
-    pub(crate) dkim_results: authres_handling::DkimResults,
+    pub(crate) dkim_results: authres::DkimResults,
 }
 
 /// Returns a reference to the encrypted payload of a ["Mixed
@@ -273,6 +273,9 @@ fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublic
 /// If we already know this fingerprint from another contact's peerstate, return that
 /// peerstate in order to make AEAP work, but don't save it into the db yet.
 ///
+/// The param `allow_change` is used to prevent the autocrypt key from being changed
+/// if we suspect that the message may be forged and have a spoofed sender identity.
+///
 /// Returns updated peerstate.
 pub(crate) async fn get_autocrypt_peerstate(
     context: &Context,
@@ -299,9 +302,16 @@ pub(crate) async fn get_autocrypt_peerstate(
         .await?;
 
         if let Some(ref mut peerstate) = peerstate {
-            if addr_cmp(&peerstate.addr, from) && allow_change {
-                peerstate.apply_header(header, message_time);
-                peerstate.save_to_db(&context.sql, false).await?;
+            if addr_cmp(&peerstate.addr, from) {
+                if allow_change {
+                    peerstate.apply_header(header, message_time);
+                    peerstate.save_to_db(&context.sql, false).await?;
+                } else {
+                    info!(
+                        context,
+                        "Refusing to update existing peerstate of {}", &peerstate.addr
+                    );
+                }
             }
             // If `peerstate.addr` and `from` differ, this means that
             // someone is using the same key but a different addr, probably
diff --git a/src/headerdef.rs b/src/headerdef.rs
index b3940f27e..db0537e93 100644
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -65,6 +65,7 @@ pub enum HeaderDef {
     Received,
 
     /// A header that includes the results of the DKIM, SPF and DMARC checks.
+    /// See https://datatracker.ietf.org/doc/html/rfc8601
     AuthenticationResults,
 
     _TestHeader,
diff --git a/src/lib.rs b/src/lib.rs
index a708b10f0..aa7da4797 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,7 +93,7 @@ mod update_helper;
 pub mod webxdc;
 #[macro_use]
 mod dehtml;
-mod authres_handling;
+mod authres;
 mod color;
 pub mod html;
 pub mod plaintext;
diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs
index 9b0803dbf..7bcf0a6f2 100644
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -597,7 +597,6 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
         .await?;
     }
     if dbversion < 92 {
-        info!(context, "[migration] v92");
         sql.execute_migration(
             "CREATE TABLE sending_domains(domain TEXT PRIMARY KEY, dkim_works INTEGER DEFAULT 0);",
             92,
diff --git a/src/tools.rs b/src/tools.rs
index 3f2d23d1e..c22723f2a 100644
--- a/src/tools.rs
+++ b/src/tools.rs
@@ -495,8 +495,8 @@ pub fn open_file_std<P: AsRef<std::path::Path>>(
     }
 }
 
-pub async fn read_dir(path: impl AsRef<Path>) -> Result<Vec<fs::DirEntry>> {
-    let res = tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(path.as_ref()).await?)
+pub async fn read_dir(path: &Path) -> Result<Vec<fs::DirEntry>> {
+    let res = tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(path).await?)
         .try_collect()
         .await?;
     Ok(res)