Test assigning unencrypted messages with Chat-Group-ID to adhoc groups

Author: link2xt

src/mimeparser.rs

@@ -1526,16 +1526,6 @@ impl MimeMessage {
         remove_header(headers, "chat-verified", removed);
         remove_header(headers, "autocrypt-gossip", removed);
 
-        // Chat-Group-ID can only appear in encrypted messages
-        // since PGP-contact migration.
-        //
-        // However, we do not remove `Chat-Group-ID` here.
-        // If we receive an unencrypted `Chat-Group-ID`
-        // from an older version which allowed
-        // unencrypted groups, we still want to assign
-        // a message to a group, but it will be an ad hoc group
-        // without a group ID.
-
         // Secure-Join is secured unless it is an initial "vc-request"/"vg-request".
         if let Some(secure_join) = remove_header(headers, "secure-join", removed) {
             if secure_join == "vc-request" || secure_join == "vg-request" {

src/receive_imf.rs

@@ -1473,7 +1473,7 @@ async fn do_chat_assignment(
                     );
                 }
             }
-            ChatAssignment::AdHocGroup | ChatAssignment::OneOneChat => {
+            ChatAssignment::AdHocGroup => {
                 if let Some((new_chat_id, new_chat_id_blocked)) = lookup_or_create_adhoc_group(
                     context,
                     mime_parser,
@@ -1489,6 +1489,7 @@ async fn do_chat_assignment(
                     chat_id_blocked = new_chat_id_blocked;
                 }
             }
+            ChatAssignment::OneOneChat => {}
         }
 
         if !to_ids.is_empty() {
@@ -3323,7 +3324,8 @@ async fn create_adhoc_group(
         );
         return Ok(Some((DC_CHAT_ID_TRASH, Blocked::Not)));
     }
-    if member_ids.len() < 3 {
+    if member_ids.len() < 2 {
+        info!(context, "Not creating ad hoc group with less than 2 members.");
         return Ok(None);
     }
 

src/receive_imf/receive_imf_tests.rs

@@ -5115,3 +5115,37 @@ async fn test_no_email_contact_added_into_group() -> Result<()> {
 
     Ok(())
 }
+
+/// Tests that message is assigned to an ad hoc group
+/// if the message has a `Chat-Group-ID` even
+/// if there are only two members in a group.
+///
+/// Since PGP-contacts introduction all groups are encrypted,
+/// but old versions running on other devices might still
+/// create unencrypted groups.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_outgoing_plaintext_two_member_group() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+
+    let msg = receive_imf(
+        alice,
+        b"From: alice@example.org\n\
+          To: bob@example.net\n\
+          Subject: foo\n\
+          Message-ID: <something@example.com>\n\
+          Chat-Version: 1.0\n\
+          Chat-Group-ID: 8ud29aridt29arid\n\
+          Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
+          \n\
+          Hello\n",
+        false,
+    )
+    .await?
+    .unwrap();
+
+    let chat = Chat::load_from_db(alice, msg.chat_id).await?;
+    assert_eq!(chat.typ, Chattype::Group);
+
+    Ok(())
+}