From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.gleumes@proxmox.com>
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 459FD945B5
for <pve-devel@lists.proxmox.com>; Fri, 9 Feb 2024 14:17:14 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2573C39E41
for <pve-devel@lists.proxmox.com>; Fri, 9 Feb 2024 14:17:14 +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 <pve-devel@lists.proxmox.com>; Fri, 9 Feb 2024 14:17:13 +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 5ACDE46838
for <pve-devel@lists.proxmox.com>; Fri, 9 Feb 2024 14:17:13 +0100 (CET)
From: Folke Gleumes <f.gleumes@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 9 Feb 2024 14:17:09 +0100
Message-Id: <20240209131709.491145-1-f.gleumes@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <9e65cabe-9251-4b3c-b8ad-c761df5cca0a@proxmox.com>
References: <9e65cabe-9251-4b3c-b8ad-c761df5cca0a@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.020 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [pct.pm]
Subject: [pve-devel] [PATCH container v3] pct: add keep-env option
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2024 13:17:14 -0000
The keep-env option allows the user to define if the current environment
should be kept when running 'pct enter/exec'. pct will now always set
'--keep-env' or '--clear-env' when calling lxc-attach to anticipate
the upcoming change in default behavior.
Signed-off-by: Folke Gleumes <f.gleumes@proxmox.com>
---
changes in v3:
* fix code style nits
changes in v2:
* add this patch
src/PVE/CLI/pct.pm | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index 091ac8e..325178f 100755
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -162,12 +162,22 @@ __PACKAGE__->register_method ({
additionalProperties => 0,
properties => {
vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid_running }),
+ # FIXME: passing the environment into the container potentially leaks hosts secrets, or causes
+ # unexpected behavior. Change to opt-in for pve 9
+ 'keep-env' => {
+ type => 'boolean',
+ description => "Keep the current environment. This option will disabled by default with PVE 9."
+ ." If you rely on a preserved environment, please use this option to be future-proof.",
+ optional => 1,
+ default => 1,
+ },
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
+ my $keep_env = $param->{'keep-env'} // 1; # FIXME: switch to default 0 with pve 9, see above
my $vmid = $param->{vmid};
@@ -175,7 +185,10 @@ __PACKAGE__->register_method ({
die "container '$vmid' not running!\n" if !PVE::LXC::check_running($vmid);
clean_environment();
- exec('lxc-attach', '-n', $vmid);
+
+ my @lxc_attach_cmd = ('lxc-attach', '-n', $vmid);
+ push @lxc_attach_cmd, $keep_env ? '--keep-env' : '--clear-env';
+ exec(@lxc_attach_cmd);
}});
__PACKAGE__->register_method ({
@@ -187,12 +200,20 @@ __PACKAGE__->register_method ({
additionalProperties => 0,
properties => {
vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid_running }),
+ 'keep-env' => {
+ type => 'boolean',
+ description => "Keep the current environment. This option will disabled by default with PVE 9."
+ ." If you rely on a preserved environment, please use this option to be future-proof.",
+ optional => 1,
+ default => 1, # FIXME: switch to default 0 with pve 9, see enter method
+ },
'extra-args' => get_standard_option('extra-args'),
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
+ my $keep_env = $param->{'keep-env'} // 1; # FIXME: switch to default 0 with pve 9, see enter method
my $vmid = $param->{vmid};
PVE::LXC::Config->load_config($vmid); # test if container exists on this node
@@ -201,7 +222,11 @@ __PACKAGE__->register_method ({
die "missing command" if !@{$param->{'extra-args'}};
clean_environment();
- exec('lxc-attach', '-n', $vmid, '--', @{$param->{'extra-args'}});
+
+ my @lxc_attach_cmd = ('lxc-attach', '-n', $vmid);
+ push @lxc_attach_cmd, $keep_env ? '--keep-env' : '--clear-env';
+ push @lxc_attach_cmd, '--', @{$param->{'extra-args'}};
+ exec(@lxc_attach_cmd);
}});
__PACKAGE__->register_method ({
--
2.39.2