From ba2d4ee1bce9a7d44132220a5bb683e5d2c417e5 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo.trentesaux@lilo.org>
Date: Wed, 8 Feb 2023 17:16:30 +0100
Subject: [PATCH] restrict identity name (nodes/rust/duniter-v2s!119)
* clearer length limit
* restrict identity name
see discussion https://forum.duniter.org/t/format-du-userid/10147
* improve comments valid identity name
---
primitives/duniter/src/lib.rs | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/primitives/duniter/src/lib.rs b/primitives/duniter/src/lib.rs
index 8e4b99cc7..e077fa5d8 100644
--- a/primitives/duniter/src/lib.rs
+++ b/primitives/duniter/src/lib.rs
@@ -16,19 +16,16 @@
#![cfg_attr(not(feature = "std"), no_std)]
-/// Bound length; forbid trailing or double spaces; accept only ascii alphanumeric or punctuation or space
+/// Rules for valid identity names are defined below
+/// - 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
- && idty_name[0] != 32
- && idty_name[idty_name.len() - 1] != 32
+ && 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)
- && 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)]
@@ -37,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_______10________20________30________40_-"
+ ));
+ // --- disallow
+ assert!(!validate_idty_name(
+ b"1_______10________20________30________40_-_"
+ ));
+ 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