[pve-devel] [PATCH v3 common] REST environment: 'root@pam' fallback in task logs if no user specified for forked worker

[pve-devel] [PATCH v3 common] REST environment: 'root@pam' fallback in task logs if no user specified for forked worker

[Oguz Bektas]

call sites without a defined user parameter (found only push_file and
pull_file from pve-container) were logging the user as 'root@pve' which
doesn't exist.

for clarity, also add a comment that this is only used for the task
logs.

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
v2->v3:
* drop warning message
* pass $noerr to get_user() to avoid dead code in case it fails

 src/PVE/RESTEnvironment.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PVE/RESTEnvironment.pm b/src/PVE/RESTEnvironment.pm
index 1b2af08..abe388b 100644
--- a/src/PVE/RESTEnvironment.pm
+++ b/src/PVE/RESTEnvironment.pm
@@ -492,7 +492,8 @@ sub fork_worker {
     $dtype = 'unknown' if !defined ($dtype);
     $id = '' if !defined ($id);
 
-    $user = 'root@pve' if !defined ($user);
+    # note: below is only used for the task log entry
+    $user = $self->get_user(1) // 'root@pam' if !defined($user);
 
     my $sync = ($self->{type} eq 'cli' && !$background) ? 1 : 0;
 
-- 
2.30.2

[pve-devel] applied: [PATCH v3 common] REST environment: 'root@pam' fallback in task logs if no user specified for forked worker

[Thomas Lamprecht]

On 15.03.22 12:52, Oguz Bektas wrote:
> call sites without a defined user parameter (found only push_file and
> pull_file from pve-container) were logging the user as 'root@pve' which
> doesn't exist.
> 
> for clarity, also add a comment that this is only used for the task
> logs.
> 
> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> ---
> v2->v3:
> * drop warning message
> * pass $noerr to get_user() to avoid dead code in case it fails
> 
>  src/PVE/RESTEnvironment.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
>

applied, with slight adaptions to the commit message, thanks!