use regex to parse process/package

Author: dr-frmr

Cargo.lock

@@ -27,6 +27,7 @@ mime_guess = "2.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.120"
 rand = "0.8"
+regex = "1.11.1"
 rmp-serde = "1.1.2"
 thiserror = "1.0"
 tracing = { version = "0.1", optional = true }

Cargo.toml

@@ -129,28 +129,18 @@ impl<'de> Deserialize<'de> for PackageId {
 
 impl std::str::FromStr for PackageId {
     type Err = ProcessIdParseError;
-    /// Attempt to parse a `PackageId` from a string. The string must
-    /// contain exactly two segments, where segments are non-empty strings
-    /// separated by a colon (`:`). The segments cannot themselves contain colons.
+    /// Attempts to parse a `PackageId` from a string. The string must match the pattern
+    /// of two segments containing only lowercase letters, numbers and hyphens, separated by a colon.
     fn from_str(input: &str) -> Result<Self, Self::Err> {
-        let segments: Vec<&str> = input.split(':').collect();
-        if segments.len() < 2 {
-            return Err(ProcessIdParseError::MissingField);
-        } else if segments.len() > 2 {
-            return Err(ProcessIdParseError::TooManyColons);
-        }
-        let package_name = segments[0].to_string();
-        if package_name.is_empty() {
-            return Err(ProcessIdParseError::MissingField);
-        }
-        let publisher_node = segments[1].to_string();
-        if publisher_node.is_empty() {
-            return Err(ProcessIdParseError::MissingField);
+        let re = regex::Regex::new(r"^[a-z0-9-]+:[a-z0-9-]+$").unwrap();
+        if !re.is_match(input) {
+            return Err(ProcessIdParseError::InvalidCharacter);
         }
 
+        let segments: Vec<&str> = input.split(':').collect();
         Ok(PackageId {
-            package_name,
-            publisher_node,
+            package_name: segments[0].to_string(),
+            publisher_node: segments[1].to_string(),
         })
     }
 }

src/types/package_id.rs

@@ -36,31 +36,19 @@ impl ProcessId {
 
 impl std::str::FromStr for ProcessId {
     type Err = ProcessIdParseError;
-    /// Attempts to parse a `ProcessId` from a string. To succeed, the string must contain
-    /// exactly 3 segments, separated by colons `:`. The segments must not contain colons.
+    /// Attempts to parse a `ProcessId` from a string. The string must match the pattern
+    /// of three segments containing only lowercase letters, numbers and hyphens, separated by colons.
     fn from_str(input: &str) -> Result<Self, ProcessIdParseError> {
-        let segments: Vec<&str> = input.split(':').collect();
-        if segments.len() < 3 {
-            return Err(ProcessIdParseError::MissingField);
-        } else if segments.len() > 3 {
-            return Err(ProcessIdParseError::TooManyColons);
-        }
-        let process_name = segments[0].to_string();
-        if process_name.is_empty() {
-            return Err(ProcessIdParseError::MissingField);
-        }
-        let package_name = segments[1].to_string();
-        if package_name.is_empty() {
-            return Err(ProcessIdParseError::MissingField);
-        }
-        let publisher_node = segments[2].to_string();
-        if publisher_node.is_empty() {
-            return Err(ProcessIdParseError::MissingField);
+        let re = regex::Regex::new(r"^[a-z0-9-]+:[a-z0-9-]+:[a-z0-9-]+$").unwrap();
+        if !re.is_match(input) {
+            return Err(ProcessIdParseError::InvalidCharacter);
         }
+
+        let segments: Vec<&str> = input.split(':').collect();
         Ok(ProcessId {
-            process_name,
-            package_name,
-            publisher_node,
+            process_name: segments[0].to_string(),
+            package_name: segments[1].to_string(),
+            publisher_node: segments[2].to_string(),
         })
     }
 }
@@ -134,6 +122,7 @@ impl PartialEq<ProcessId> for &str {
 pub enum ProcessIdParseError {
     TooManyColons,
     MissingField,
+    InvalidCharacter,
 }
 
 impl std::fmt::Display for ProcessIdParseError {
@@ -144,6 +133,7 @@ impl std::fmt::Display for ProcessIdParseError {
             match self {
                 ProcessIdParseError::TooManyColons => "Too many colons",
                 ProcessIdParseError::MissingField => "Missing field",
+                ProcessIdParseError::InvalidCharacter => "Invalid character",
             }
         )
     }
@@ -154,6 +144,7 @@ impl std::error::Error for ProcessIdParseError {
         match self {
             ProcessIdParseError::TooManyColons => "Too many colons",
             ProcessIdParseError::MissingField => "Missing field",
+            ProcessIdParseError::InvalidCharacter => "Invalid character",
         }
     }
 }