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 DE7B98F0E for ; Wed, 30 Mar 2022 14:32:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D3B0B86E6 for ; Wed, 30 Mar 2022 14:32:29 +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 id 127F486DD for ; Wed, 30 Mar 2022 14:32:29 +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 DF564429B7 for ; Wed, 30 Mar 2022 14:32:28 +0200 (CEST) From: Markus Frank To: pmg-devel@lists.proxmox.com Date: Wed, 30 Mar 2022 14:32:15 +0200 Message-Id: <20220330123215.41926-2-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220330123215.41926-1-m.frank@proxmox.com> References: <20220330123215.41926-1-m.frank@proxmox.com> 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 v2 2/2] fix #3924: ldap: accept only valid email-address 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: Wed, 30 Mar 2022 12:32:29 -0000 If a mail attribute contains special characters in ldap at the first line, it will be set as primary email and results in a "400 invalid format - value does not look like a valid email address" Error-Statement in the webconsole. This mostly can happen if SIP Addresses are in Active-Directory's proxyAddresses which begin with "SIP:". To make the validation more strict I changed the api to use pmg-email-address and added a regex which looks for protocolnames (sip:) that could be in proxyAddresses but are not compatible and skips these addresses. Signed-off-by: Markus Frank --- src/PMG/API2/LDAP.pm | 5 ++--- src/PMG/LDAPCache.pm | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/PMG/API2/LDAP.pm b/src/PMG/API2/LDAP.pm index d2ee6a4..4922155 100644 --- a/src/PMG/API2/LDAP.pm +++ b/src/PMG/API2/LDAP.pm @@ -408,10 +408,9 @@ __PACKAGE__->register_method ({ description => "Profile ID.", type => 'string', format => 'pve-configid', }, - email => { + email => get_standard_option('pmg-email-address', { description => "Email address.", - type => 'string', format => 'email', - }, + }), }, }, returns => { diff --git a/src/PMG/LDAPCache.pm b/src/PMG/LDAPCache.pm index 19e22a4..7a1d812 100755 --- a/src/PMG/LDAPCache.pm +++ b/src/PMG/LDAPCache.pm @@ -166,7 +166,13 @@ sub queryusers { $mail =~ s/^smtp[\:\$]//gs; - if ($mail !~ m/[\{\}\\\/]/ && $mail =~ m/^\S+\@\S+$/) { + # exclude sip and x500 addresses in proxyAddresses + # https://docs.microsoft.com/en-us/troubleshoot/azure/active-directory/proxyaddresses-attribute-populate + if ( + $mail !~ m/[\{\}\\\/]/ && + $mail =~ m/^\S+\@\S+$/ && + $mail !~ m/^(sip|x500)[\:\$]/ + ) { $umails->{$mail} = 1; $pmail = $mail if !$pmail; } -- 2.30.2