mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cob: allow hyphens in `TypeName` 

Also make sure to only allow ASCII characters and add some tests.
This commit is contained in:
Defelo 2025-12-15 13:07:19 +01:00
parent 352c29c23c
commit cf023f750d
No known key found for this signature in database
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/radicle-cob/src/type_name.rs
View File

@ -7,8 +7,8 @@ use serde::{Deserialize, Serialize};
use thiserror::Error; use thiserror::Error;
/// The typename of an object. Valid typenames MUST be sequences of /// The typename of an object. Valid typenames MUST be sequences of
/// alphanumeric characters separated by a period. The name must start /// alphanumeric characters or hyphens separated by a period. Each
/// and end with an alphanumeric character /// component must start and end with an alphanumeric character.
/// ///
/// # Examples /// # Examples
/// ///
@ -47,7 +47,18 @@ impl FromStr for TypeName {
invalid: s.to_string(), invalid: s.to_string(),
}); });
} }
if !component.chars().all(char::is_alphanumeric) { if !component
.chars()
.all(|c| c.is_ascii_alphanumeric() || c == '-')
{
return Err(TypeNameParse {
invalid: s.to_string(),
});
}
let first = component.chars().next().expect("component is not empty");
let last = component.chars().last().expect("component is not empty");
if !first.is_ascii_alphanumeric() || !last.is_ascii_alphanumeric() {
return Err(TypeNameParse { return Err(TypeNameParse {
invalid: s.to_string(), invalid: s.to_string(),
}); });
@ -77,7 +88,13 @@ mod test {
assert!(TypeName::from_str("abc.def.ghi").is_ok()); assert!(TypeName::from_str("abc.def.ghi").is_ok());
assert!(TypeName::from_str("abc.123.ghi").is_ok()); assert!(TypeName::from_str("abc.123.ghi").is_ok());
assert!(TypeName::from_str("1bc.123.ghi").is_ok()); assert!(TypeName::from_str("1bc.123.ghi").is_ok());
assert!(TypeName::from_str("1bc-123.ghi").is_ok());
assert!(TypeName::from_str("").is_err());
assert!(TypeName::from_str(".").is_err());
assert!(TypeName::from_str(".abc.123.ghi").is_err()); assert!(TypeName::from_str(".abc.123.ghi").is_err());
assert!(TypeName::from_str("abc.123.ghi.").is_err()); assert!(TypeName::from_str("abc.123.ghi.").is_err());
assert!(TypeName::from_str("abc..ghi").is_err());
assert!(TypeName::from_str("abc.-123.ghi").is_err());
assert!(TypeName::from_str("abc.123-.ghi").is_err());
} }
} }