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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DFF9060212 for ; Tue, 1 Sep 2020 14:27:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C56D49294 for ; Tue, 1 Sep 2020 14:27:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 5B600947C for ; Tue, 1 Sep 2020 14:27:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 29FE1449A0 for ; Tue, 1 Sep 2020 14:27:43 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 1 Sep 2020 14:27:27 +0200 Message-Id: <20200901122728.12566-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [upid.rs] Subject: [pbs-devel] [PATCH v2 proxmox-backup 1/2] upid: add workaround for parsing broken termproxy userids X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 12:27:44 -0000 Commit aafe8609 "d/postinst: fixup userid for older termproxy tasks" does the fixup after the upgrade, which is fine for CLI upgrades, but doesn't work for the GUI, as the termproxy instance used for upgrading will write it's own tasklog (with the still broken version) after the upgrade and postinst. Instead, add a (temporary) workaround to the UPID parser to handle this. Suggested-by: Fabian Grünbichler Signed-off-by: Stefan Reiter --- v2: * don't just match root As discussed off-list with Dominik, it's debatable if we want this patch together with the second one, or if the latter is enough on it's own. It does fix a breakage, but it adds workaround code, and this is a Beta after all... src/server/upid.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/server/upid.rs b/src/server/upid.rs index 9fc5085b..786bf6ab 100644 --- a/src/server/upid.rs +++ b/src/server/upid.rs @@ -107,20 +107,32 @@ impl UPID { } } +// This is a workaround for a bug which resulted in only the username instead of +// the userid to be written to the 'active' file for older termproxy tasks +// FIXME: Remove in future version +fn parse_userid(worker_type: &str, userid: &str) -> Result { + if worker_type == "termproxy" && !userid.ends_with("@pam") { + format!("{}@pam", userid).parse() + } else { + userid.parse() + } +} impl std::str::FromStr for UPID { type Err = Error; fn from_str(s: &str) -> Result { if let Some(cap) = PROXMOX_UPID_REGEX.captures(s) { + let worker_type = cap["wtype"].to_owned(); + let userid = parse_userid(&worker_type, &cap["userid"])?; Ok(UPID { pid: i32::from_str_radix(&cap["pid"], 16).unwrap(), pstart: u64::from_str_radix(&cap["pstart"], 16).unwrap(), starttime: i64::from_str_radix(&cap["starttime"], 16).unwrap(), task_id: usize::from_str_radix(&cap["task_id"], 16).unwrap(), - worker_type: cap["wtype"].to_string(), + worker_type, worker_id: if cap["wid"].is_empty() { None } else { Some(cap["wid"].to_string()) }, - userid: cap["userid"].parse()?, + userid, node: cap["node"].to_string(), }) } else { -- 2.20.1