From ecf56912d8da347a5b28005ee168459f8700b805 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Mon, 12 Dec 2022 10:57:30 +0100
Subject: [PATCH] restrict identity name
see discussion https://forum.duniter.org/t/format-du-userid/10147
---
primitives/duniter/src/lib.rs | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/primitives/duniter/src/lib.rs b/primitives/duniter/src/lib.rs
index e0e560170..80d9d49e1 100644
--- a/primitives/duniter/src/lib.rs
+++ b/primitives/duniter/src/lib.rs
@@ -17,23 +17,15 @@
#![cfg_attr(not(feature = "std"), no_std)]
/// Rules for valid identity names are defined below
-/// - Bound length to 64
-/// - forbid trailing or double spaces
-/// - accept only ascii alphanumeric or punctuation or space
+/// - Bound length to 42
+/// - accept only ascii alphanumeric or - or _
pub fn validate_idty_name(idty_name: &[u8]) -> bool {
idty_name.len() >= 3
- && idty_name.len() <= 64 // length smaller than 64
- && idty_name[0] != 32 // does not start with space
- && idty_name[idty_name.len() - 1] != 32 // does not end with space
- // all characters are alphanumeric or punctuation or space
+ && idty_name.len() <= 42 // length smaller than 42
+ // all characters are alphanumeric or - or _
&& idty_name
.iter()
- .all(|c| c.is_ascii_alphanumeric() || c.is_ascii_punctuation() || *c == 32)
- // disallow two consecutive spaces
- && idty_name
- .iter()
- .zip(idty_name.iter().skip(1))
- .all(|(c1, c2)| *c1 != 32 || *c2 != 32)
+ .all(|c| c.is_ascii_alphanumeric() || *c == b'-' || *c == b'_')
}
#[cfg(test)]
@@ -42,12 +34,19 @@ mod tests {
#[test]
fn test_validate_idty_name() {
+ // --- allow
assert!(validate_idty_name(b"B0b"));
- assert!(validate_idty_name(b"lorem ipsum dolor-sit_amet."));
- assert!(!validate_idty_name(b" space"));
- assert!(!validate_idty_name(b"space "));
- assert!(!validate_idty_name(b"double space"));
+ assert!(validate_idty_name(b"lorem_ipsum-dolor-sit_amet"));
+ assert!(validate_idty_name(
+ b"1_______________________________________42"
+ ));
+ // --- disallow
+ assert!(!validate_idty_name(
+ b"1________________________________________43"
+ ));
+ assert!(!validate_idty_name(b"with space"));
assert!(!validate_idty_name("non-ascii🌵".as_bytes()));
assert!(!validate_idty_name("ğune".as_bytes()));
+ assert!(!validate_idty_name("toto!".as_bytes()));
}
}
--
GitLab