test that Autocrypt-gossip and selfavatar should never go into

full-messages

and fix exclusion of gossip header, which was broken

Author: Simon-Laux

src/download.rs

@@ -214,6 +214,7 @@ mod tests {
     use crate::chat::{self, create_group, send_msg};
     use crate::headerdef::{HeaderDef, HeaderDefMap};
     use crate::message::Viewtype;
+    use crate::mimeparser::MimeMessage;
     use crate::test_utils::TestContext;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -250,11 +251,15 @@ mod tests {
 
     /// Tests that pre message is sent for attachment larger than `PRE_MESSAGE_ATTACHMENT_SIZE_THRESHOLD`
     /// Also test that pre message is sent first, before the full message
+    /// And that Autocrypt-gossip and selfavatar never go into full-messages
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_sending_pre_message() -> Result<()> {
         let alice = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
-        let chat = alice.create_chat(&bob).await;
+        let fiona = TestContext::new_fiona().await;
+        let group_id = alice
+            .create_group_with_members("test group", &[&bob, &fiona])
+            .await;
 
         let mut msg = Message::new(Viewtype::File);
         msg.set_file_from_bytes(&alice.ctx, "test.bin", &[0u8; 300_000], None)?;
@@ -265,7 +270,9 @@ mod tests {
             msg.get_filebytes(&alice.ctx).await?.unwrap() > PRE_MESSAGE_ATTACHMENT_SIZE_THRESHOLD
         );
 
-        let msg_id = chat::send_msg(&alice.ctx, chat.id, &mut msg).await.unwrap();
+        let msg_id = chat::send_msg(&alice.ctx, group_id, &mut msg)
+            .await
+            .unwrap();
         let smtp_rows = alice.get_smtp_rows_for_msg(msg_id).await;
 
         //   pre-message and full message should be present
@@ -278,13 +285,12 @@ mod tests {
                 .2
                 .as_bytes(),
         )?;
-        let full_message = mailparse::parse_mail(
-            smtp_rows
-                .get(1)
-                .expect("second element exists")
-                .2
-                .as_bytes(),
-        )?;
+        let full_message_bytes = smtp_rows
+            .get(1)
+            .expect("second element exists")
+            .2
+            .as_bytes();
+        let full_message = mailparse::parse_mail(full_message_bytes)?;
 
         assert!(
             pre_message
@@ -325,7 +331,10 @@ mod tests {
         );
 
         // also test that Autocrypt-gossip and selfavatar should never go into full-messages
-        // TODO: (this needs decryption, right?)
+        let decrypted_full_message = MimeMessage::from_bytes(&bob.ctx, full_message_bytes).await?;
+        assert!(!decrypted_full_message.decrypting_failed);
+        assert_eq!(decrypted_full_message.gossiped_keys.len(), 0);
+        assert_eq!(decrypted_full_message.user_avatar, None);
         Ok(())
     }
 

src/mimefactory.rs

@@ -1145,11 +1145,12 @@ impl MimeFactory {
                             let fingerprint = key.dc_fingerprint().hex();
                             let cmd = msg.param.get_cmd();
                             let is_full_msg =
-                                self.pre_message_mode != Some(PreMessageMode::FullMessage);
-                            let should_do_gossip = is_full_msg
-                                && cmd == SystemMessage::MemberAddedToGroup
-                                || cmd == SystemMessage::SecurejoinMessage
-                                || multiple_recipients && {
+                                self.pre_message_mode == Some(PreMessageMode::FullMessage);
+                            let should_do_gossip = !is_full_msg
+                                && (cmd == SystemMessage::MemberAddedToGroup
+                                    || cmd == SystemMessage::SecurejoinMessage
+                                    || multiple_recipients)
+                                && {
                                     let gossiped_timestamp: Option<i64> = context
                                         .sql
                                         .query_get_value(
@@ -1186,6 +1187,10 @@ impl MimeFactory {
                                 continue;
                             }
 
+                            debug_assert!(
+                                self.pre_message_mode != Some(PreMessageMode::FullMessage)
+                            );
+
                             let header = Aheader {
                                 addr: addr.clone(),
                                 public_key: key.clone(),