From 25d26d83b137bb4b72d3c1c53966ddc3f20a9ad7 Mon Sep 17 00:00:00 2001 From: Markus Frank Date: Tue, 28 Nov 2023 14:23:18 +0100 Subject: [PATCH] api types: add regex, format & schema for partition names The new regex is similar to BLOCKDEVICE_NAME_REGEX but also allows numbers at the end of the device name (also allows partitions names). For nvme partitions it also allows the letter p and a number. Signed-off-by: Markus Frank Reviewed-by: Lukas Wagner Tested-by: Lukas Wagner Reviewed-by: Max Carrara Tested-by: Max Carrara --- pbs-api-types/src/lib.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index ebd5550d..795ff2a6 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -191,6 +191,7 @@ const_regex! { ); pub BLOCKDEVICE_NAME_REGEX = r"^(?:(?:h|s|x?v)d[a-z]+)|(?:nvme\d+n\d+)$"; + pub BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX = r"^(?:(?:h|s|x?v)d[a-z]+\d*)|(?:nvme\d+n\d+(p\d+)?)$"; pub SUBSCRIPTION_KEY_REGEX = concat!(r"^pbs(?:[cbsp])-[0-9a-f]{10}$"); } @@ -205,6 +206,8 @@ pub const PASSWORD_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&PASSWORD_ pub const UUID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&UUID_REGEX); pub const BLOCKDEVICE_NAME_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&BLOCKDEVICE_NAME_REGEX); +pub const BLOCKDEVICE_DISK_AND_PARTITION_NAME_FORMAT: ApiStringFormat = + ApiStringFormat::Pattern(&BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX); pub const SUBSCRIPTION_KEY_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SUBSCRIPTION_KEY_REGEX); pub const SYSTEMD_DATETIME_FORMAT: ApiStringFormat = @@ -285,6 +288,13 @@ pub const BLOCKDEVICE_NAME_SCHEMA: Schema = .max_length(64) .schema(); +pub const BLOCKDEVICE_DISK_AND_PARTITION_NAME_SCHEMA: Schema = + StringSchema::new("(Partition) block device name (/sys/class/block/).") + .format(&BLOCKDEVICE_DISK_AND_PARTITION_NAME_FORMAT) + .min_length(3) + .max_length(64) + .schema(); + pub const DISK_ARRAY_SCHEMA: Schema = ArraySchema::new("Disk name list.", &BLOCKDEVICE_NAME_SCHEMA).schema();