chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve validation error for empty mxid.

Browse Source 
Previously an empty MXID was reported as MissingLeadingSigil but a more
concise variant is just Empty.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-03 04:41:13 +00:00
parent b57e03e342
commit c434098fb1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruma-identifiers-validation/src/lib.rs
View File

@ -22,17 +22,17 @@ pub use error::Error;
const MAX_BYTES: usize = 255; const MAX_BYTES: usize = 255;
/// Checks if an identifier is valid. /// Checks if an identifier is valid.
fn validate_id(id: &str, first_byte: u8) -> Result<(), Error> { fn validate_id(id: &str, sigil: u8) -> Result<(), Error> {
#[cfg(not(feature = "compat-arbitrary-length-ids"))] #[cfg(not(feature = "compat-arbitrary-length-ids"))]
if id.len() > MAX_BYTES { if id.len() > MAX_BYTES {
return Err(Error::MaximumLengthExceeded); return Err(Error::MaximumLengthExceeded);
} }
if id.as_bytes().first() != Some(&first_byte) { match id.as_bytes().first() {
return Err(Error::MissingLeadingSigil); Some(&first_byte) if first_byte == sigil => Ok(()),
Some(_) => Err(Error::MissingLeadingSigil),
None => Err(Error::Empty),
} }
Ok(())
} }
/// Checks an identifier that contains a localpart and hostname for validity. /// Checks an identifier that contains a localpart and hostname for validity.