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 5073579A3D for ; Wed, 27 Oct 2021 14:57:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 470CE134F2 for ; Wed, 27 Oct 2021 14:57:10 +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 2405C134D9 for ; Wed, 27 Oct 2021 14:57:09 +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 F1C7F468BB for ; Wed, 27 Oct 2021 14:57:08 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 27 Oct 2021 14:57:06 +0200 Message-Id: <20211027125708.1068455-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211027125708.1068455-1-d.csapak@proxmox.com> References: <20211027125708.1068455-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.265 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [plugin.pm, domains.pm] Subject: [pve-devel] [PATCH access-control 1/2] fix #3668: realm sync: add 'remove-vanished' parameter to delete non-existing users 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: Wed, 27 Oct 2021 12:57:40 -0000 this way, users can use the 'non-full' mode to provide local information (like tfa keys), but still remove the users not present in the ldap anymore. Signed-off-by: Dominik Csapak --- src/PVE/API2/Domains.pm | 5 +++-- src/PVE/Auth/Plugin.pm | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/Domains.pm b/src/PVE/API2/Domains.pm index 9c2b254..55bb7ae 100644 --- a/src/PVE/API2/Domains.pm +++ b/src/PVE/API2/Domains.pm @@ -279,10 +279,11 @@ my $update_users = sub { my $users = $usercfg->{users}; my $oldusers = {}; - if ($opts->{'full'}) { - print "full sync, deleting outdated existing users first\n"; + if ($opts->{'full'} || $opts->{'remove-vanished'}) { + print "deleting outdated existing users first\n"; foreach my $userid (sort keys %$users) { next if $userid !~ m/\@$realm$/; + next if !$opts->{full} && defined($synced_users->{$userid}); $oldusers->{$userid} = delete $users->{$userid}; if ($opts->{'purge'} && !$synced_users->{$userid}) { diff --git a/src/PVE/Auth/Plugin.pm b/src/PVE/Auth/Plugin.pm index 1413053..27d6294 100755 --- a/src/PVE/Auth/Plugin.pm +++ b/src/PVE/Auth/Plugin.pm @@ -64,6 +64,13 @@ my $realm_sync_options_desc = { type => 'boolean', optional => '1', }, + 'remove-vanished' => { + description => "Only for non-full mode. If set, removes users that are not" + ." present in the current synced data.", + type => 'boolean', + optional => '1', + default => '0', + }, 'enable-new' => { description => "Enable newly synced users immediately.", type => 'boolean', -- 2.30.2