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 2A7156A0EF for ; Tue, 15 Mar 2022 12:53:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1EF331DE1A for ; Tue, 15 Mar 2022 12:52:45 +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 id A67341DE11 for ; Tue, 15 Mar 2022 12:52:44 +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 78691463EC for ; Tue, 15 Mar 2022 12:52:44 +0100 (CET) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Tue, 15 Mar 2022 12:52:39 +0100 Message-Id: <20220315115239.636011-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.569 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [restenvironment.pm] Subject: [pve-devel] [PATCH v3 common] REST environment: 'root@pam' fallback in task logs if no user specified for forked worker 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, 15 Mar 2022 11:53:15 -0000 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 --- 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