[pmg-devel] [PATCH pmg-api v2] rulesystem: matchfield: match all headers not only the first

Stoiko Ivanov s.ivanov at proxmox.com
Tue May 17 12:19:50 CEST 2022


currently the match field uses $entity->head->get in scalar context,
which only returns the first matching header (see [0])

switch over to using get_all in list context and iterating over all
headers makes it possible to match subsequent headers.

while it is uncommon in general - the Received headers are usually not
restricted to one - reported in our community forum:
https://forum.proxmox.com/threads/.109629/

[0] https://metacpan.org/pod/MIME::Head#Getting-field-contents
Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
v1->v2:
* dropped useless indentation by directly iterating over the list (if it's
empty the iteration will not happen) - huge thx to Dominik for the feedback!

tested with the sample from the forum for the multiple received headers
case and a simple subject match for the single header case.

src/PMG/RuleDB/MatchField.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PMG/RuleDB/MatchField.pm b/src/PMG/RuleDB/MatchField.pm
index b1da4fa..2671ea4 100644
--- a/src/PMG/RuleDB/MatchField.pm
+++ b/src/PMG/RuleDB/MatchField.pm
@@ -102,7 +102,7 @@ sub parse_entity {
     if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) {
 	chomp $id;
 
-	if (defined(my $value = $entity->head->get($self->{field}))) {
+	for my $value ($entity->head->get_all($self->{field})) {
 	    chomp $value;
 
 	    my $decvalue = MIME::Words::decode_mimewords($value);
-- 
2.30.2





More information about the pmg-devel mailing list