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 58B95609C1 for ; Thu, 3 Sep 2020 10:37:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47CFC16996 for ; Thu, 3 Sep 2020 10:36:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 1136F1698C for ; Thu, 3 Sep 2020 10:36:30 +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 CEF38449E9; Thu, 3 Sep 2020 10:36:29 +0200 (CEST) From: Wolfgang Link To: pve-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 10:36:20 +0200 Message-Id: <20200903083620.66529-1-w.link@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [accesscontrol.pm, ldap.pm, ad.pm] Subject: [pve-devel] [Patch v2 access-control] fix #2947 login name for the LDAP/AD realm can be case-insensitive X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:37:01 -0000 This is an optional for LDAP and AD realm. The default behavior is case-sensitive. Signed-off-by: Wolfgang Link --- v1 -> v2: * naming of paramenter * use grep instead of a loop, to avoid login errors with ambiguous usernames PVE/API2/AccessControl.pm | 23 +++++++++++++++++++++++ PVE/Auth/AD.pm | 1 + PVE/Auth/LDAP.pm | 7 +++++++ 3 files changed, 31 insertions(+) diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm index fd27786..3155d67 100644 --- a/PVE/API2/AccessControl.pm +++ b/PVE/API2/AccessControl.pm @@ -226,6 +226,28 @@ __PACKAGE__->register_method ({ returns => { type => "null" }, code => sub { return undef; }}); +sub lookup_username { + my ($username) = @_; + + $username =~ /@(.+)/; + + my $realm = $1; + my $domain_cfg = cfs_read_file("domains.cfg"); + my $casesensitive = $domain_cfg->{ids}->{$realm}->{'case-sensitive'} // 1; + my $usercfg = cfs_read_file('user.cfg'); + + if (!$casesensitive) { + my @matches = grep { lc $username eq lc $_ } (keys %{$usercfg->{users}}); + + die "ambiguous case insensitive match of username '$username', cannot safely grant access!\n" + if scalar @matches > 1; + + return $matches[0] + } + + return $username; +}; + __PACKAGE__->register_method ({ name => 'create_ticket', path => 'ticket', @@ -292,6 +314,7 @@ __PACKAGE__->register_method ({ my $username = $param->{username}; $username .= "\@$param->{realm}" if $param->{realm}; + $username = lookup_username($username); my $rpcenv = PVE::RPCEnvironment::get(); my $res; diff --git a/PVE/Auth/AD.pm b/PVE/Auth/AD.pm index 4d64c20..88b2098 100755 --- a/PVE/Auth/AD.pm +++ b/PVE/Auth/AD.pm @@ -94,6 +94,7 @@ sub options { group_classes => { optional => 1 }, 'sync-defaults-options' => { optional => 1 }, mode => { optional => 1 }, + 'case-sensitive' => { optional => 1 }, }; } diff --git a/PVE/Auth/LDAP.pm b/PVE/Auth/LDAP.pm index 09b2202..97d0778 100755 --- a/PVE/Auth/LDAP.pm +++ b/PVE/Auth/LDAP.pm @@ -129,6 +129,12 @@ sub properties { optional => 1, default => 'ldap', }, + 'case-sensitive' => { + description => "username is case-sensitive", + type => 'boolean', + optional => 1, + default => 1, + } }; } @@ -159,6 +165,7 @@ sub options { group_classes => { optional => 1 }, 'sync-defaults-options' => { optional => 1 }, mode => { optional => 1 }, + 'case-sensitive' => { optional => 1 }, }; } -- 2.20.1