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 6A77D94FC0 for ; Tue, 17 Jan 2023 12:47:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4B0AEADFF for ; Tue, 17 Jan 2023 12:47:01 +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 for ; Tue, 17 Jan 2023 12:47:00 +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 37A7044CAB for ; Tue, 17 Jan 2023 12:47:00 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 17 Jan 2023 12:46:53 +0100 Message-Id: <20230117114659.2397499-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230117114659.2397499-1-d.csapak@proxmox.com> References: <20230117114659.2397499-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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] Subject: [pve-devel] [PATCH access-control v3 1/2] realm sync: refactor scope/remove-vanished into a standard option 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, 17 Jan 2023 11:47:01 -0000 so that we can reuse it easily Signed-off-by: Dominik Csapak --- src/PVE/Auth/Plugin.pm | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/PVE/Auth/Plugin.pm b/src/PVE/Auth/Plugin.pm index bae9fb9..b341046 100755 --- a/src/PVE/Auth/Plugin.pm +++ b/src/PVE/Auth/Plugin.pm @@ -51,26 +51,30 @@ PVE::JSONSchema::register_standard_option('realm', { my $remove_options = "(?:acl|properties|entry)"; +PVE::JSONSchema::register_standard_option('sync-scope', { + description => "Select what to sync.", + type => 'string', + enum => [qw(users groups both)], + optional => '1', +}); + +PVE::JSONSchema::register_standard_option('sync-remove-vanished', { + description => "A semicolon-seperated list of things to remove when they or the user" + ." vanishes during a sync. The following values are possible: 'entry' removes the" + ." user/group when not returned from the sync. 'properties' removes the set" + ." properties on existing user/group that do not appear in the source (even custom ones)." + ." 'acl' removes acls when the user/group is not returned from the sync." + ." Instead of a list it also can be 'none' (the default).", + type => 'string', + default => 'none', + typetext => "([acl];[properties];[entry])|none", + pattern => "(?:(?:$remove_options\;)*$remove_options)|none", + optional => '1', +}); + my $realm_sync_options_desc = { - scope => { - description => "Select what to sync.", - type => 'string', - enum => [qw(users groups both)], - optional => '1', - }, - 'remove-vanished' => { - description => "A semicolon-seperated list of things to remove when they or the user" - ." vanishes during a sync. The following values are possible: 'entry' removes the" - ." user/group when not returned from the sync. 'properties' removes the set" - ." properties on existing user/group that do not appear in the source (even custom ones)." - ." 'acl' removes acls when the user/group is not returned from the sync." - ." Instead of a list it also can be 'none' (the default).", - type => 'string', - default => 'none', - typetext => "([acl];[properties];[entry])|none", - pattern => "(?:(?:$remove_options\;)*$remove_options)|none", - optional => '1', - }, + scope => get_standard_option('sync-scope'), + 'remove-vanished' => get_standard_option('sync-remove-vanished'), # TODO check/rewrite in pve7to8, and remove with 8.0 full => { description => "DEPRECATED: use 'remove-vanished' instead. If set, uses the LDAP Directory as source of truth," -- 2.30.2