process Autocrypt

Author: link2xt

src/contact/contact_tests.rs

@@ -3,7 +3,6 @@ use deltachat_contact_tools::may_be_valid_addr;
 use super::*;
 use crate::chat::{get_chat_contacts, send_text_msg, Chat};
 use crate::chatlist::Chatlist;
-use crate::peerstate::Peerstate;
 use crate::receive_imf::receive_imf;
 use crate::test_utils::{self, TestContext, TestContextManager, TimeShiftFalsePositiveNote};
 
@@ -1065,12 +1064,8 @@ async fn test_make_n_import_vcard() -> Result<()> {
     let chat = bob.create_chat(alice).await;
     let sent_msg = bob.send_text(chat.id, "moin").await;
     let bob_id = alice.recv_msg(&sent_msg).await.from_id;
-    let key_base64 = Peerstate::from_addr(alice, &bob_addr)
-        .await?
-        .unwrap()
-        .peek_key(false)
-        .unwrap()
-        .to_base64();
+    let bob_contact = Contact::get_by_id(alice, bob_id).await?;
+    let key_base64 = bob_contact.openpgp_certificate(alice).await?.unwrap().to_base64();
     let fiona_id = Contact::create(alice, "Fiona", "[email protected]").await?;
 
     assert_eq!(make_vcard(alice, &[]).await?, "".to_string());

src/decrypt.rs

@@ -143,52 +143,6 @@ pub(crate) fn validate_detached_signature<'a, 'b>(
     }
 }
 
-/// Applies Autocrypt header to Autocrypt peer state and saves it into the database.
-///
-/// Returns updated peerstate.
-pub(crate) async fn get_autocrypt_peerstate(
-    context: &Context,
-    from: &str,
-    autocrypt_header: Option<&Aheader>,
-    message_time: i64,
-) -> Result<Option<Peerstate>> {
-    let allow_change = !context.is_self_addr(from).await?;
-    let mut peerstate;
-
-    // Apply Autocrypt header
-    if let Some(header) = autocrypt_header {
-        peerstate = Peerstate::from_addr(context, from).await?;
-
-        if let Some(ref mut peerstate) = peerstate {
-            if addr_cmp(&peerstate.addr, from) {
-                if allow_change {
-                    peerstate.apply_header(context, header, message_time);
-                    peerstate.save_to_db(&context.sql).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
-            // because they made an AEAP transition.
-            // But we don't know if that's legit until we checked the
-            // signatures, so wait until then with writing anything
-            // to the database.
-        } else {
-            let p = Peerstate::from_header(header, message_time);
-            p.save_to_db(&context.sql).await?;
-            peerstate = Some(p);
-        }
-    } else {
-        peerstate = Peerstate::from_addr(context, from).await?;
-    }
-
-    Ok(peerstate)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/mimeparser.rs

@@ -22,7 +22,7 @@ use crate::constants;
 use crate::contact::ContactId;
 use crate::context::Context;
 use crate::decrypt::{
-    get_autocrypt_peerstate, get_encrypted_mime, try_decrypt, validate_detached_signature,
+    get_encrypted_mime, try_decrypt, validate_detached_signature,
 };
 use crate::dehtml::dehtml;
 use crate::events::EventType;
@@ -386,6 +386,15 @@ impl MimeMessage {
             None
         };
 
+        if let Some(autocrypt_header) = &autocrypt_header {
+            let fingerprint = autocrypt_header.public_key.dc_fingerprint().hex();
+            context.sql.execute("INSERT INTO public_keys (fingerprint, public_key)
+                                 VALUES (?, ?)
+                                 ON CONFLICT (fingerprint)
+                                 DO NOTHING",
+                                 (&fingerprint, autocrypt_header.public_key.to_bytes())).await?;
+        }
+
         let public_keyring = if incoming {
             if let Some(autocrypt_header) = autocrypt_header {
                 vec![autocrypt_header.public_key]

src/receive_imf.rs

@@ -12,7 +12,6 @@ use mailparse::SingleInfo;
 use num_traits::FromPrimitive;
 use regex::Regex;
 
-use crate::aheader::EncryptPreference;
 use crate::chat::{self, Chat, ChatId, ChatIdBlocked, ProtectionStatus};
 use crate::config::Config;
 use crate::constants::{Blocked, Chattype, ShowEmails, DC_CHAT_ID_TRASH, EDITED_PREFIX};

src/receive_imf/receive_imf_tests.rs

@@ -9,6 +9,7 @@ use crate::chat::{
     get_chat_msgs, is_contact_in_chat, remove_contact_from_chat, send_text_msg, ChatItem,
     ChatVisibility,
 };
+use crate::aheader::EncryptPreference;
 use crate::chatlist::Chatlist;
 use crate::constants::{DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS};
 use crate::contact;