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 538CB9979F for ; Tue, 14 Nov 2023 11:36:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C15B1E218 for ; Tue, 14 Nov 2023 11:35:48 +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, 14 Nov 2023 11:35:47 +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 00D5D4287F for ; Tue, 14 Nov 2023 11:35:47 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 11:35:43 +0100 Message-Id: <20231114103545.2878054-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231114103545.2878054-1-d.csapak@proxmox.com> References: <20231114103545.2878054-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.133 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH container v2 2/3] api: add profile option to create ct api call 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, 14 Nov 2023 10:36:18 -0000 we use the profile cfg as the 'param' hash, but overwrite the values with the ones from the api call, so one can overwrite options from the profile easily we also log the used profile Signed-off-by: Dominik Csapak --- changes from v1: * use helper from Plugin * log profile when used * use /mapping/guest-profile as acl path now src/PVE/API2/LXC.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 28d14de..2b17f8f 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -27,6 +27,10 @@ use PVE::API2::LXC::Config; use PVE::API2::LXC::Status; use PVE::API2::LXC::Snapshot; use PVE::JSONSchema qw(get_standard_option); + +use PVE::Profiles::Plugin; +use PVE::Profiles::CT; + use base qw(PVE::RESTHandler); BEGIN { @@ -196,6 +200,11 @@ __PACKAGE__->register_method({ default => 0, description => "Start the CT after its creation finished successfully.", }, + profile => { + optional => 1, + type => 'string', + description => "The profile to use as base config.", + }, }), }, returns => { @@ -209,6 +218,19 @@ __PACKAGE__->register_method({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); + my $profile = extract_param($param, 'profile'); + if (defined($profile)) { + $rpcenv->check_full($authuser, "/mapping/guest-profile/${profile}", ['Mapping.Use']); + my $profile_cfg = eval { PVE::Profiles::Plugin::get_guest_ready_config($profile, 'ct') }; + raise_param_exc({ profile => "$@" }) if $@; + + for my $opt (keys $param->%*) { + $profile_cfg->{$opt} = $param->{$opt}; + } + + $param = $profile_cfg; + } + my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); my $ignore_unpack_errors = extract_param($param, 'ignore-unpack-errors'); @@ -381,6 +403,7 @@ __PACKAGE__->register_method({ my $vollist = []; eval { my $orig_mp_param; # only used if $restore + print "using profile '$profile'\n" if $profile; if ($restore) { die "can't overwrite running container\n" if PVE::LXC::check_running($vmid); if ($archive ne '-') { -- 2.30.2