Return empty header addresses in lists

stalwartlabs · Sep 24, 2023 · 85da5c0 · 85da5c0
1 parent d637bac
commit 85da5c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/runtime/eval.rs b/src/runtime/eval.rs
@@ -322,9 +322,11 @@ impl HeaderVariable {
                             .map(Variable::from),
                         Ordering::Equal => {
                             for item in list {
-                                if let Some(part) = part.eval_strict(item) {
-                                    result.push(Variable::from(part));
-                                }
+                                result.push(
+                                    part.eval_strict(item)
+                                        .map(Variable::from)
+                                        .unwrap_or_default(),
+                                );
                             }
                             return;
                         }
@@ -351,9 +353,11 @@ impl HeaderVariable {
                                 .map(|s| Variable::String(s.to_string())),
                             Ordering::Equal => {
                                 for item in list {
-                                    if let Some(part) = part.eval_strict(item) {
-                                        result.push(Variable::String(part.to_string()));
-                                    }
+                                    result.push(
+                                        part.eval_strict(item)
+                                            .map(|s| Variable::String(s.to_string()))
+                                            .unwrap_or_default(),
+                                    );
                                 }
                                 return;
                             }

diff --git a/tests/stalwart/extensions.svtest b/tests/stalwart/extensions.svtest
@@ -119,6 +119,9 @@ test "Variable scopes" {
 test_set "message" text:
 From: Giovanni
 To: [email protected]
+Cc: User <[email protected]>, invalid, User2 <[email protected]>
+Bcc: Test <[email protected]>, Test 1 <[email protected]>
+Bcc: Test 2 <[email protected]>, Test 3 <[email protected]>
 X-Confirm-Reading-To: <[email protected]>
 Subject: Pranzo d'acqua fa volti sghembi
 
@@ -139,4 +142,8 @@ test "Header addresses" {
 	if not eval "header.X-Confirm-Reading-To.addr == '[email protected]'" {
 		test_fail "header.X-Confirm-Reading-To.addr != '[email protected]'";
 	}
+
+	if not eval "header.from:to:cc:bcc:X-Confirm-Reading-To[*].addr[*] == ['', '[email protected]', '[email protected]', '', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]']" {
+		test_fail "header.from:to:cc:bcc:X-Confirm-Reading-To[*].addr[*] = [%{header.from:to:cc:bcc:X-Confirm-Reading-To[*].addr[*]}]";
+	}
 }