From: Dominik Csapak <d.csapak@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api] rulesystem: matchfield: match all headers not only the first
Date: Tue, 17 May 2022 12:05:18 +0200 [thread overview]
Message-ID: <c445678a-f995-bdc1-6448-6e82dd3b0a29@proxmox.com> (raw)
In-Reply-To: <20220517093925.18457-1-s.ivanov@proxmox.com>
On 5/17/22 11:39, Stoiko Ivanov wrote:
> 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@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;
> + }
> }
> }
> }
the docs say that get_all returns always a list, so we could do:
for my $value ($entity->head->get_all($self->{field})) {
...
}
directly, no?
would save us a level of indentation
prev parent reply other threads:[~2022-05-17 10:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 9:39 Stoiko Ivanov
2022-05-17 10:05 ` Dominik Csapak [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c445678a-f995-bdc1-6448-6e82dd3b0a29@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
--cc=s.ivanov@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox