From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7EEBD1FF39E for ; Mon, 24 Jun 2024 11:09:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D8351325A3; Mon, 24 Jun 2024 11:09:38 +0200 (CEST) From: Markus Frank To: pmg-devel@lists.proxmox.com Date: Mon, 24 Jun 2024 11:08:43 +0200 Message-Id: <20240624090850.4683-2-m.frank@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624090850.4683-1-m.frank@proxmox.com> References: <20240624090850.4683-1-m.frank@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pmg-devel] [PATCH pve-common v3 1/8] add Schema package with auth module that contains realm sync options X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" This is because these standard options & formats are used by both PVE and PMG. Signed-off-by: Markus Frank --- src/Makefile | 2 ++ src/PVE/Schema/Auth.pm | 82 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 src/PVE/Schema/Auth.pm diff --git a/src/Makefile b/src/Makefile index 2d8bdc4..833bbc1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,6 +29,7 @@ LIB_SOURCES = \ RESTEnvironment.pm \ RESTHandler.pm \ SafeSyslog.pm \ + Schema/Auth.pm \ SectionConfig.pm \ SysFSTools.pm \ Syscall.pm \ @@ -41,6 +42,7 @@ all: install: $(addprefix PVE/,${LIB_SOURCES}) install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/Job + install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/Schema for i in ${LIB_SOURCES}; do install -D -m 0644 PVE/$$i ${DESTDIR}${PERLDIR}/PVE/$$i; done diff --git a/src/PVE/Schema/Auth.pm b/src/PVE/Schema/Auth.pm new file mode 100644 index 0000000..1f7f586 --- /dev/null +++ b/src/PVE/Schema/Auth.pm @@ -0,0 +1,82 @@ +package PVE::Schema::Auth; + +use strict; +use warnings; + +use PVE::JSONSchema qw(get_standard_option parse_property_string); + +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 => get_standard_option('sync-scope'), + 'remove-vanished' => get_standard_option('sync-remove-vanished'), + 'enable-new' => { + description => "Enable newly synced users immediately.", + type => 'boolean', + default => '1', + optional => '1', + }, +}; +PVE::JSONSchema::register_standard_option('realm-sync-options', $realm_sync_options_desc); +PVE::JSONSchema::register_format('realm-sync-options', $realm_sync_options_desc); + +my $tfa_format = { + type => { + description => "The type of 2nd factor authentication.", + format_description => 'TFATYPE', + type => 'string', + enum => [qw(oath)], + }, + digits => { + description => "TOTP digits.", + format_description => 'COUNT', + type => 'integer', + minimum => 6, maximum => 8, + default => 6, + optional => 1, + }, + step => { + description => "TOTP time period.", + format_description => 'SECONDS', + type => 'integer', + minimum => 10, + default => 30, + optional => 1, + }, +}; + +PVE::JSONSchema::register_format('pve-tfa-config', $tfa_format); + +PVE::JSONSchema::register_standard_option('tfa', { + description => "Use Two-factor authentication.", + type => 'string', format => 'pve-tfa-config', + optional => 1, + maxLength => 128, +}); + +sub parse_tfa_config { + my ($data) = @_; + + return parse_property_string($tfa_format, $data); +} -- 2.39.2 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel