From 51416950e631119ccad6c9dfe798fc7b10958220 Mon Sep 17 00:00:00 2001
From: Gonne <gonne@mathebau.de>
Date: Mon, 24 Mar 2025 11:30:29 +0100
Subject: [PATCH] Redirect for all incoming recipients as a copy and discard
 original incoming mail

This way it is not saved in the catch-all account.
---
 packages/alias-to-sieve/src/lib.rs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/alias-to-sieve/src/lib.rs b/packages/alias-to-sieve/src/lib.rs
index 99a83e2..a398846 100644
--- a/packages/alias-to-sieve/src/lib.rs
+++ b/packages/alias-to-sieve/src/lib.rs
@@ -134,24 +134,41 @@ where
 /// Addresses are sorted according to the order on `OrdEmailAddress`.
 pub fn generate_sieve_script(redirects: AliasMap) -> String {
     let mut script: String =
-        "require [\"variables\", \"copy\", \"vnd.stalwart.expressions\", \"envelope\"];\n\n"
-            .to_string();
+        "require [\"variables\", \"copy\", \"vnd.stalwart.expressions\", \"envelope\"];
+
+let \"i\" \"0\";
+while \"i < count(envelope.to)\" {
+  let \"redirected\" \"false\";
+"
+        .to_string();
     for (redirect, mut destinations) in redirects {
         script += format!(
             // inspired by https://github.com/stalwartlabs/mail-server/issues/916#issuecomment-2474844389
-            "if eval \"contains_ignore_case(envelope.to, '{}')\" {{\n{}}}\n",
+            "  if eval \"eq_ignore_case(envelope.to[i], '{}')\" {{
+{}
+    let \"redirected\" \"true\";
+  }}
+",
             redirect.0,
             {
                 let mut subscript: String = String::new();
                 destinations.sort();
                 for destination in destinations.iter() {
-                    subscript += format!("  redirect :copy \"{}\";\n", destination.0).as_str();
+                    subscript += format!("    redirect :copy \"{}\";", destination.0).as_str();
                 }
                 subscript
             }
         )
         .as_str();
     }
+    script += "  if eval \"!redirected\" {
+    let \"destination\" \"envelope.to[i]\";
+    redirect :copy \"${destination}\";
+  }
+";
+    script += "  let \"i\" \"i+1\";\n";
+    script += "}
+discard;";
     script
 }