From: Oguz Bektas <o.bektas@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 common] REST environment: default to root@pam in forked workers if no user was specified
Date: Mon, 14 Mar 2022 14:50:42 +0100 [thread overview]
Message-ID: <20220314135042.1210842-1-o.bektas@proxmox.com> (raw)
first call $rpcenv->get_user() if user was 'undef'. if that doesn't
return then we set it to root@pam.
Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
v1->v2:
* do get_user() first, set to 'root@pam' as fallback
* drop first patch for pve-container (not needed anymore)
src/PVE/RESTEnvironment.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/PVE/RESTEnvironment.pm b/src/PVE/RESTEnvironment.pm
index 1b2af08..bc5b8b5 100644
--- a/src/PVE/RESTEnvironment.pm
+++ b/src/PVE/RESTEnvironment.pm
@@ -492,7 +492,12 @@ sub fork_worker {
$dtype = 'unknown' if !defined ($dtype);
$id = '' if !defined ($id);
- $user = 'root@pve' if !defined ($user);
+ $user = $self->get_user() if !defined($user);
+
+ if (!defined($user)) {
+ warn 'internal error: Worker user was not specified, defaulting to "root@pam"!';
+ $user = 'root@pam';
+ }
my $sync = ($self->{type} eq 'cli' && !$background) ? 1 : 0;
--
2.30.2
next reply other threads:[~2022-03-14 13:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-14 13:50 Oguz Bektas [this message]
2022-03-15 7:31 ` Fabian Ebner
2022-03-15 8:57 ` Thomas Lamprecht
2022-03-15 11:21 ` Oguz Bektas
2022-03-15 11:34 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220314135042.1210842-1-o.bektas@proxmox.com \
--to=o.bektas@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox