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

Stoiko Ivanov s.ivanov at proxmox.com
Tue May 17 11:39:25 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>
---
best viewed with `git show -w`
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 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/PMG/RuleDB/MatchField.pm b/src/PMG/RuleDB/MatchField.pm
index b1da4fa..171cb3d 100644
--- a/src/PMG/RuleDB/MatchField.pm
+++ b/src/PMG/RuleDB/MatchField.pm
@@ -102,13 +102,15 @@ 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}))) {
-	    chomp $value;
+	if (my @values = $entity->head->get_all($self->{field})) {
+	    for my $value (@values) {
+		chomp $value;
 
-	    my $decvalue = MIME::Words::decode_mimewords($value);
+		my $decvalue = MIME::Words::decode_mimewords($value);
 
-	    if ($decvalue =~ m|$self->{field_value}|i) {
-		push @$res, $id;
+		if ($decvalue =~ m|$self->{field_value}|i) {
+		    push @$res, $id;
+		}
 	    }
 	}
     }
-- 
2.30.2





More information about the pmg-devel mailing list