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 6F484BAD53 for ; Fri, 15 Dec 2023 17:44:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 509816328 for ; Fri, 15 Dec 2023 17:44:23 +0100 (CET) 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, 15 Dec 2023 17:44:21 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BCE9747734 for ; Fri, 15 Dec 2023 17:44:21 +0100 (CET) Date: Fri, 15 Dec 2023 17:44:19 +0100 From: Stoiko Ivanov To: Dominik Csapak Cc: pmg-devel@lists.proxmox.com Message-ID: References: <20230630082748.1875726-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230630082748.1875726-1-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 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. [matcharchivefilename.pm, proxmox.com, whoregex.pm] Subject: Re: [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, 15 Dec 2023 16:44:23 -0000 Thanks for the patch, this definitely improves UX! one tiny nit in-line (I'll gladly change that upon applying directly, but just don't want to miss anything): On Fri, Jun 30, 2023 at 10:27:47AM +0200, Dominik Csapak wrote: > 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: > ..snip.. > 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; > > ..snip.. > 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 = ''; we use the result as condition in an if (pmg-smtp-filter apply_rules), I'd rather leave it as undef instead of '' - for consistency with the other objects (see diff-context above) - as I asked myself a bit too long why this needs to be an '' here instead of undef.. or am I missing something? > + eval { > + $res = $addr =~ m/^$t$/i; > + }; > + warn "invalid regex: $@\n" if $@; > + return $res; > } > > sub address { > -- > 2.30.2 > > > > _______________________________________________ > pmg-devel mailing list > pmg-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel > >