[pve-devel] [PATCH common 2/2] REST environment: default to 'root at pam' for forked workers in case no user was specified

Oguz Bektas o.bektas at proxmox.com
Mon Mar 7 10:20:43 CET 2022


previously we had a default of 'root at pve', which doesn't exist.
since the username is only relevant for the task logs, we can change it
to 'root at pam' without ill effects.

also add a warning in case there are other call sites that we missed
where fork_worker is called without a user variable (found call sites
only in pve-container where this was unset, namely in 'push_file' and
'pull_file').

Signed-off-by: Oguz Bektas <o.bektas at proxmox.com>
---
 src/PVE/RESTEnvironment.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PVE/RESTEnvironment.pm b/src/PVE/RESTEnvironment.pm
index 1b2af08..5352aad 100644
--- a/src/PVE/RESTEnvironment.pm
+++ b/src/PVE/RESTEnvironment.pm
@@ -492,7 +492,10 @@ sub fork_worker {
     $dtype = 'unknown' if !defined ($dtype);
     $id = '' if !defined ($id);
 
-    $user = 'root at pve' if !defined ($user);
+    if (!defined($user)) {
+	warn 'Worker user was not specified, defaulting to "root at pam"!';
+	$user = 'root at pam';
+    }
 
     my $sync = ($self->{type} eq 'cli' && !$background) ? 1 : 0;
 
-- 
2.30.2






More information about the pve-devel mailing list