From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A1CCF1FF170 for ; Tue, 19 Nov 2024 16:56:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6EE772F6F7; Tue, 19 Nov 2024 16:56:49 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 19 Nov 2024 16:56:09 +0100 Message-Id: <20241119155609.118940-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer v2] fetch-answer: encode unsafe characters in partition label 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Ensure potentially unsafe characters in the partition label are encoded, preventing the installer from failing to find the answer partition when the label contains whitespaces or !"$%&'()*,/;<>?[\]^`{|}~ The encoding is done according to `blkid_encode_string` [0] in the blkid util, which is used by `/lib/udev/rules.d/60-persistent-storage.rules` to create a symlink under `/dev/disk/by-label/`. For example: "ANSWER PART" is encoded to "ANSWER\x20PART" [0] https://github.com/util-linux/util-linux/blob/master/libblkid/src/encode.c Signed-off-by: Filip Schauer Tested-by: Christoph Heiss --- Changed since v1: * Log the non-encoded label instead of the encoded one when a partition is found. .../src/fetch_plugins/partition.rs | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/proxmox-fetch-answer/src/fetch_plugins/partition.rs b/proxmox-fetch-answer/src/fetch_plugins/partition.rs index 131f422..0f1fa7b 100644 --- a/proxmox-fetch-answer/src/fetch_plugins/partition.rs +++ b/proxmox-fetch-answer/src/fetch_plugins/partition.rs @@ -41,6 +41,19 @@ fn path_exists_logged(file_name: &str, search_path: &str) -> Option { } } +fn encode_partlabel(input: &str) -> String { + input + .chars() + .map(|c| { + if (' '..='~').contains(&c) && !(c.is_ascii_alphanumeric() || "#+-.:=@_".contains(c)) { + format!("\\x{:02x}", c as u32) + } else { + c.to_string() + } + }) + .collect() +} + /// Searches for the exact case, upper and finally lower case existence of the partlabel in the /// search_path, in that order. /// @@ -52,19 +65,22 @@ fn path_exists_logged(file_name: &str, search_path: &str) -> Option { /// * `partlabel_source` - Partition Label, used for matching, in the exact, upper and lower case /// * `search_path` - Path where to search for the partition label fn scan_partlabels(partlabel: &str, search_path: &str) -> Result { - if let Some(path) = path_exists_logged(partlabel, search_path) { + let partlabel_enc = encode_partlabel(partlabel); + if let Some(path) = path_exists_logged(&partlabel_enc, search_path) { info!("Found partition with label '{partlabel}'"); return Ok(path); } let partlabel_upper_case = partlabel.to_uppercase(); - if let Some(path) = path_exists_logged(&partlabel_upper_case, search_path) { + let partlabel_upper_case_enc = encode_partlabel(&partlabel_upper_case); + if let Some(path) = path_exists_logged(&partlabel_upper_case_enc, search_path) { info!("Found partition with label '{partlabel_upper_case}'"); return Ok(path); } let partlabel_lower_case = partlabel.to_lowercase(); - if let Some(path) = path_exists_logged(&partlabel_lower_case, search_path) { + let partlabel_lower_case_enc = encode_partlabel(&partlabel_lower_case); + if let Some(path) = path_exists_logged(&partlabel_lower_case_enc, search_path) { info!("Found partition with label '{partlabel_lower_case}'"); return Ok(path); } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel