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 16D417DFDE for ; Tue, 9 Nov 2021 18:59:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C01E12283 for ; Tue, 9 Nov 2021 18:58:56 +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 E0D3612273 for ; Tue, 9 Nov 2021 18:58:54 +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 B24D446063 for ; Tue, 9 Nov 2021 18:58:54 +0100 (CET) Message-ID: <0bfbd636-d2da-f69f-8984-76a595207306@proxmox.com> Date: Tue, 9 Nov 2021 18:58:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:95.0) Gecko/20100101 Thunderbird/95.0 Content-Language: en-US To: Proxmox VE development discussion , Dominik Csapak References: <20211027125708.1068455-1-d.csapak@proxmox.com> <20211027125708.1068455-2-d.csapak@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20211027125708.1068455-2-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.672 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 NICE_REPLY_A -3.06 Looks like a legit reply (A) 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. [tlmp.it, plugin.pm, domains.pm] WEIRD_PORT 0.001 Uses non-standard port number for HTTP Subject: Re: [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: Tue, 09 Nov 2021 17:59:26 -0000 On 27.10.21 14:57, Dominik Csapak wrote: > 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. ps. missing an patch for pve-docs, in any case... https://d7.work.tlmp.it:8006/pve-docs/chapter-pveum.html#pveum_ldap_sync The amount of sync related options is a bit confusing/crowded already now, so did you thought about just expanding the value set of the `full` property for that (possibly renaming it to "sync mode" or the like)? Albeit purge and this new one could be chosen independently, that wouldn't make the list of choises easier.. > > 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', >