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 72D48B27E for ; Thu, 29 Jun 2023 16:15:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5A02819727 for ; Thu, 29 Jun 2023 16:14:40 +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 ; Thu, 29 Jun 2023 16:14:39 +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 8DD20422BE for ; Thu, 29 Jun 2023 16:14:39 +0200 (CEST) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 29 Jun 2023 16:14:37 +0200 Message-Id: <20230629141438.3927688-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 - Subject: [pmg-devel] [PATCH pmg-api 1/2] fix #4811: who regex: test 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: Thu, 29 Jun 2023 14:15:10 -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. Signed-off-by: Dominik Csapak --- src/PMG/RuleDB/WhoRegex.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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