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 3E3ED79AA8 for ; Wed, 27 Oct 2021 14:57:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C8D4134F1 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 116C6134D4 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 DBF9B45FC3 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:07 +0200 Message-Id: <20211027125708.1068455-3-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. [domains.pm, plugin.pm] Subject: [pve-devel] [PATCH access-control 2/2] realm sync: improve wording in log and description 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:10 -0000 by * differentiating 'updated' users in full sync ('overwrote') * adding '(full)' in the log for full syncs * making it more clear what full sync does and what happens otherwise Signed-off-by: Dominik Csapak --- src/PVE/API2/Domains.pm | 9 +++++++-- src/PVE/Auth/Plugin.pm | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/PVE/API2/Domains.pm b/src/PVE/API2/Domains.pm index 55bb7ae..7aff9cb 100644 --- a/src/PVE/API2/Domains.pm +++ b/src/PVE/API2/Domains.pm @@ -274,7 +274,12 @@ __PACKAGE__->register_method ({ my $update_users = sub { my ($usercfg, $realm, $synced_users, $opts) = @_; - print "syncing users\n"; + if ($opts->{'full'}) { + print "syncing users (full)\n"; + } else { + print "syncing users\n"; + } + $usercfg->{users} = {} if !defined($usercfg->{users}); my $users = $usercfg->{users}; @@ -311,7 +316,7 @@ my $update_users = sub { $user->{tokens} = $olduser->{tokens}; } if (defined($oldusers->{$userid})) { - print "updated user '$userid'\n"; + print "overwrote user '$userid'\n"; } else { print "added user '$userid'\n"; } diff --git a/src/PVE/Auth/Plugin.pm b/src/PVE/Auth/Plugin.pm index 27d6294..bf763ae 100755 --- a/src/PVE/Auth/Plugin.pm +++ b/src/PVE/Auth/Plugin.pm @@ -58,9 +58,10 @@ my $realm_sync_options_desc = { }, full => { description => "If set, uses the LDAP Directory as source of truth," - ." deleting users or groups not returned from the sync. Otherwise" - ." only syncs information which is not already present, and does not" - ." deletes or modifies anything else.", + ." deleting users or groups not returned from the sync and removing" + ." all locally modified properties of synced users. If not set," + ." only syncs information which is present in the synced data, and does not" + ." delete or modify anything else.", type => 'boolean', optional => '1', }, -- 2.30.2