[pve-devel] [PATCH installer] fetch-answer: encode unsafe characters in partition label
Filip Schauer
f.schauer at proxmox.com
Tue Nov 19 15:59:34 CET 2024
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 <f.schauer at proxmox.com>
---
.../src/fetch_plugins/partition.rs | 30 ++++++++++++++-----
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/proxmox-fetch-answer/src/fetch_plugins/partition.rs b/proxmox-fetch-answer/src/fetch_plugins/partition.rs
index 131f422..0563b2d 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<PathBuf> {
}
}
+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,20 +65,21 @@ fn path_exists_logged(file_name: &str, search_path: &str) -> Option<PathBuf> {
/// * `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<PathBuf> {
- if let Some(path) = path_exists_logged(partlabel, search_path) {
- info!("Found partition with label '{partlabel}'");
+ let partlabel_enc = encode_partlabel(partlabel);
+ if let Some(path) = path_exists_logged(&partlabel_enc, search_path) {
+ info!("Found partition with label '{partlabel_enc}'");
return Ok(path);
}
- let partlabel_upper_case = partlabel.to_uppercase();
- if let Some(path) = path_exists_logged(&partlabel_upper_case, search_path) {
- info!("Found partition with label '{partlabel_upper_case}'");
+ let partlabel_upper_case_enc = encode_partlabel(&partlabel.to_uppercase());
+ if let Some(path) = path_exists_logged(&partlabel_upper_case_enc, search_path) {
+ info!("Found partition with label '{partlabel_upper_case_enc}'");
return Ok(path);
}
- let partlabel_lower_case = partlabel.to_lowercase();
- if let Some(path) = path_exists_logged(&partlabel_lower_case, search_path) {
- info!("Found partition with label '{partlabel_lower_case}'");
+ let partlabel_lower_case_enc = encode_partlabel(&partlabel.to_lowercase());
+ if let Some(path) = path_exists_logged(&partlabel_lower_case_enc, search_path) {
+ info!("Found partition with label '{partlabel_lower_case_enc}'");
return Ok(path);
}
--
2.39.5
More information about the pve-devel
mailing list