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 6A2C76B312 for ; Fri, 18 Mar 2022 13:43:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56C311DA4A for ; Fri, 18 Mar 2022 13:42:53 +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 id CCBB01DA41 for ; Fri, 18 Mar 2022 13:42:52 +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 28CDF46EDD for ; Fri, 18 Mar 2022 13:37:27 +0100 (CET) From: Markus Frank To: pmg-devel@lists.proxmox.com Date: Fri, 18 Mar 2022 13:37:06 +0100 Message-Id: <20220318123706.6160-1-m.frank@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.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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] fix #3924: ldap: skip non-smtp proxyAddresses 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, 18 Mar 2022 12:43:23 -0000 When an entry in proxyAddresses starts with SIP (or everthing that is not smtp) no e-mail gets listed on the webpage. Therefore no quarantine notification messages are sent. To change this, every entry with another protocol than smtp, should be skipped. removed "SMTP" because of lowercase function is called before. Signed-off-by: Markus Frank --- src/PMG/LDAPCache.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PMG/LDAPCache.pm b/src/PMG/LDAPCache.pm index df61454..8172329 100755 --- a/src/PMG/LDAPCache.pm +++ b/src/PMG/LDAPCache.pm @@ -159,12 +159,17 @@ sub queryusers { next if !$user->{attributes}->{$attr}; foreach my $mail (@{$user->{attributes}->{$attr}}) { $mail = lc($mail); + + # Check if proxyAddresses entry starts with anything + # other than smtp and skip if true + next if ($mail =~ m/^(?!.*smtp).*[\:\$]/gs); + # Test if the Line starts with one of the following lines: - # proxyAddresses: [smtp|SMTP]: + # proxyAddresses: [smtp]: # and also discard this starting string, so that $mail is only the # address without any other characters... - $mail =~ s/^(smtp|SMTP)[\:\$]//gs; + $mail =~ s/^smtp[\:\$]//gs; if ($mail !~ m/[\{\}\\\/]/ && $mail =~ m/^\S+\@\S+$/) { $umails->{$mail} = 1; -- 2.30.2