From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CDB3CB435 for ; Fri, 30 Jun 2023 10:28:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B06962119B for ; Fri, 30 Jun 2023 10:27:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 30 Jun 2023 10:27:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D5C3B42963 for ; Fri, 30 Jun 2023 10:27:48 +0200 (CEST) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Fri, 30 Jun 2023 10:27:47 +0200 Message-Id: <20230630082748.1875726-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [contenttypefilter.pm, archivefilter.pm, matcharchivefilename.pm, whoregex.pm, matchfilename.pm] Subject: [pmg-devel] [PATCH pmg-api v2 1/2] fix #4811: rule db: test regex validity on save X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2023 08:28:19 -0000 and warn only when it's an invalid regex on execution, because users may have previously had such rules. Otherwise, pmg-smtp-filter will restart every time it encounters such a rule. do so for every rule type that uses a regex to match Signed-off-by: Dominik Csapak --- changes from v1: * add it for all relevant rule types (for those with recursive calls only check it once during execution) src/PMG/RuleDB/ArchiveFilter.pm | 6 ++++++ src/PMG/RuleDB/ContentTypeFilter.pm | 7 +++++++ src/PMG/RuleDB/MatchArchiveFilename.pm | 7 +++++++ src/PMG/RuleDB/MatchFilename.pm | 14 +++++++++++--- src/PMG/RuleDB/WhoRegex.pm | 12 +++++++++++- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/PMG/RuleDB/ArchiveFilter.pm b/src/PMG/RuleDB/ArchiveFilter.pm index 6d91556..3d9890c 100644 --- a/src/PMG/RuleDB/ArchiveFilter.pm +++ b/src/PMG/RuleDB/ArchiveFilter.pm @@ -48,6 +48,12 @@ sub parse_entity { my $res; + # test regex for validity + eval { "" =~ m|$self->{field_value}|; }; + if (my $err = $@) { + warn "invalid regex: $err\n"; + return $res; + } # match subtypes? We currently do exact matches only. if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { diff --git a/src/PMG/RuleDB/ContentTypeFilter.pm b/src/PMG/RuleDB/ContentTypeFilter.pm index 76fc1ce..0199311 100644 --- a/src/PMG/RuleDB/ContentTypeFilter.pm +++ b/src/PMG/RuleDB/ContentTypeFilter.pm @@ -60,6 +60,13 @@ sub parse_entity { my $res; + # test regex for validity + eval { "" =~ m|$self->{field_value}|; }; + if (my $err = $@) { + warn "invalid regex: $err\n"; + return $res; + } + # match subtypes? We currently do exact matches only. if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { diff --git a/src/PMG/RuleDB/MatchArchiveFilename.pm b/src/PMG/RuleDB/MatchArchiveFilename.pm index 2ef3543..5b1cb6d 100644 --- a/src/PMG/RuleDB/MatchArchiveFilename.pm +++ b/src/PMG/RuleDB/MatchArchiveFilename.pm @@ -25,6 +25,13 @@ sub parse_entity { my $res; + # test regex for validity + eval { "" =~ m|^$self->{fname}$|i; }; + if (my $err = $@) { + warn "invalid regex: $err\n"; + return $res; + } + if (my $id = $entity->head->mime_attr('x-proxmox-tmp-aid')) { chomp $id; diff --git a/src/PMG/RuleDB/MatchFilename.pm b/src/PMG/RuleDB/MatchFilename.pm index c9cdbe0..f6449c4 100644 --- a/src/PMG/RuleDB/MatchFilename.pm +++ b/src/PMG/RuleDB/MatchFilename.pm @@ -58,6 +58,11 @@ sub save { defined($self->{ogroup}) || die "undefined ogroup: ERROR"; my $new_value = $self->{fname}; + + # test regex for validity + eval { "" =~ m|^$new_value$|i; }; + die "invalid regex: $@\n" if $@; + $new_value =~ s/\\/\\\\/g; $new_value = encode('UTF-8', $new_value); @@ -91,9 +96,12 @@ sub parse_entity { chomp $id; if (my $value = PMG::Utils::extract_filename($entity->head)) { - if ($value =~ m|^$self->{fname}$|i) { - push @$res, $id; - } + eval { + if ($value =~ m|^$self->{fname}$|i) { + push @$res, $id; + } + }; + warn "invalid regex: $@\n" if $@; } } diff --git a/src/PMG/RuleDB/WhoRegex.pm b/src/PMG/RuleDB/WhoRegex.pm index 5c13604..1db6418 100644 --- a/src/PMG/RuleDB/WhoRegex.pm +++ b/src/PMG/RuleDB/WhoRegex.pm @@ -60,6 +60,11 @@ sub save { defined($self->{address}) || die "undefined address: ERROR"; my $adr = $self->{address}; + + # test regex for validity + eval { "" =~ /^$adr$/i; }; + die "invalid regex: $@\n" if $@; + $adr =~ s/\\/\\\\/g; $adr = encode('UTF-8', $adr); @@ -100,7 +105,12 @@ sub who_match { my $t = $self->address; - return $addr =~ m/^$t$/i; + my $res = ''; + eval { + $res = $addr =~ m/^$t$/i; + }; + warn "invalid regex: $@\n" if $@; + return $res; } sub address { -- 2.30.2