From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pmg-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 89F3E1FF15C for <inbox@lore.proxmox.com>; Wed, 19 Feb 2025 13:19:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EAD9A28212; Wed, 19 Feb 2025 13:19:50 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Wed, 19 Feb 2025 13:18:47 +0100 Message-Id: <20250219121851.110090-6-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219121851.110090-1-s.ivanov@proxmox.com> References: <20250219121851.110090-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.067 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api v3 5/5] fix #2709: ruledb: match-field: optionally restrict to top mime-part X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com> The current Match Field (header) what-objects always traverse each mime-part of a mail. This can be inconvenient, and causes unexpected matches when you forward a message as attachment(message/rfc822). following the patches for adding a Disclaimer on top of a mail from an implementation point of view, this simply adds an optional top-level-only attribute for the MatchField object, which is disabled by default for backwards-compatibility. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/PMG/RuleDB/ContentTypeFilter.pm | 2 +- src/PMG/RuleDB/MatchField.pm | 47 +++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/PMG/RuleDB/ContentTypeFilter.pm b/src/PMG/RuleDB/ContentTypeFilter.pm index e44bf3c..6818de1 100644 --- a/src/PMG/RuleDB/ContentTypeFilter.pm +++ b/src/PMG/RuleDB/ContentTypeFilter.pm @@ -35,7 +35,7 @@ sub new { $fvalue = $nt; } - my $self = $class->SUPER::new('content-type', $fvalue, $ogroup); + my $self = $class->SUPER::new('content-type', $fvalue, $ogroup, undef); $self->{only_content} = $only_content; return $self; diff --git a/src/PMG/RuleDB/MatchField.pm b/src/PMG/RuleDB/MatchField.pm index ee1851a..f6787e8 100644 --- a/src/PMG/RuleDB/MatchField.pm +++ b/src/PMG/RuleDB/MatchField.pm @@ -27,7 +27,7 @@ sub otype_text { } sub new { - my ($type, $field, $field_value, $ogroup) = @_; + my ($type, $field, $field_value, $ogroup, $top_part_only) = @_; my $class = ref($type) || $type; @@ -35,6 +35,7 @@ sub new { $self->{field} = $field; $self->{field_value} = $field_value; + $self->{top_part_only} = $top_part_only; return $self; } @@ -54,12 +55,28 @@ sub load_attr { my $decoded_field_value = PMG::Utils::try_decode_utf8($field_value); # use known constructor, bless afterwards (because sub class can have constructor # with other parameter signature). - my $obj = PMG::RuleDB::MatchField->new($field, $decoded_field_value, $ogroup); + my $obj = PMG::RuleDB::MatchField->new($field, $decoded_field_value, $ogroup, undef); bless $obj, $class; + my $sth = $ruledb->{dbh}->prepare( + "SELECT * FROM Attribut WHERE Object_ID = ?"); + + $sth->execute($id); + + $obj->{top_part_only} = 0; + + while (my $ref = $sth->fetchrow_hashref()) { + if ($ref->{name} eq 'top_part_only') { + $obj->{top_part_only} = $ref->{value}; + } + } + + $sth->finish(); + $obj->{id} = $id; - $obj->{digest} = Digest::SHA::sha1_hex($id, $field, $field_value, $ogroup); + $obj->{digest} = Digest::SHA::sha1_hex( + $id, $field, $field_value, $ogroup, $obj->{top_part_only}); return $obj; } @@ -79,6 +96,9 @@ sub save { if (defined ($self->{id})) { # update + $ruledb->{dbh}->do( + "DELETE FROM Attribut WHERE Object_ID = ?", + undef, $self->{id}); $ruledb->{dbh}->do( "UPDATE Object SET Value = ? WHERE ID = ?", @@ -96,6 +116,12 @@ sub save { $self->{id} = PMG::Utils::lastid($ruledb->{dbh}, 'object_id_seq'); } + if (defined($self->{top_part_only})) { + $ruledb->{dbh}->do( + "INSERT INTO Attribut (Value, Name, Object_ID) VALUES (?, 'top_part_only', ?)", + undef, $self->{top_part_only}, $self->{id}); + } + return $self->{id}; } @@ -124,6 +150,8 @@ sub parse_entity { } } + return $res if $self->{top_part_only}; + foreach my $part ($entity->parts) { if (my $match = $self->parse_entity($part)) { push @$res, @$match; @@ -160,6 +188,12 @@ sub properties { type => 'string', maxLength => 1024, }, + 'top-part-only' => { + description => "only match the headers in the first MIME-Part", + type => 'boolean', + optional => 1, + default => 0, + }, }; } @@ -169,6 +203,7 @@ sub get { return { field => $self->{field}, value => $self->{field_value}, + 'top-part-only' => $self->{top_part_only}, }; } @@ -177,6 +212,12 @@ sub update { $self->{field_value} = $param->{value}; $self->{field} = $param->{field}; + + if (defined($param->{'top-part-only'}) && $param->{'top-part-only'} == 1) { + $self->{top_part_only} = 1; + } else { + delete $self->{top_part_only}; + } } 1; -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel