Advertise HOSTLEN, NICKLEN, and USERLEN in ISUPPORT

Author: progval

sable_ircd/src/server/mod.rs

@@ -153,6 +153,19 @@ impl ClientServer {
 
         ret.add(ISupportEntry::string("CASEMAPPING", "ascii"));
 
+        ret.add(ISupportEntry::int(
+            "HOSTLEN",
+            Hostname::LENGTH.try_into().unwrap(),
+        ));
+        ret.add(ISupportEntry::int(
+            "NICKLEN",
+            Nickname::LENGTH.try_into().unwrap(),
+        ));
+        ret.add(ISupportEntry::int(
+            "USERLEN",
+            Username::LENGTH.try_into().unwrap(),
+        ));
+
         let list_modes: String = ListModeType::iter().map(|t| t.mode_letter()).collect();
         let key_modes: String = KeyModeType::iter().map(|t| t.mode_letter()).collect();
         let param_modes = "";

sable_network/src/validated.rs

@@ -46,7 +46,7 @@ const UPPER: &str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 const DIGIT: &str = "0123456789";
 
 define_validated! {
-    Nickname(ArrayString<15> casefolded) {
+    Nickname(ArrayString<{ Nickname::LENGTH }> casefolded) {
         check_allowed_chars(value, &[LOWER, UPPER, DIGIT, "-_\\|[]{}^`"])?;
         if let Some(first) = value.chars().next() {
             if DIGIT.contains(first) || first == '-' {
@@ -58,11 +58,11 @@ define_validated! {
         Ok(())
     }
 
-    Username(ArrayString<10>) {
+    Username(ArrayString<{ Username::LENGTH }>) {
         Ok(())
     }
 
-    Hostname(ArrayString<64>) {
+    Hostname(ArrayString<{ Hostname::LENGTH }>) {
         Ok(())
     }
 
@@ -112,6 +112,9 @@ define_validated! {
 }
 
 impl Nickname {
+    /// Maximum length, in bytes
+    pub const LENGTH: usize = 15;
+
     /// Create a new Nickname, bypassing normal validation. This is only for internal use, and only when created
     /// nicknames for collided users
     pub(crate) fn new_for_collision(
@@ -122,17 +125,25 @@ impl Nickname {
 }
 
 impl Username {
+    /// Maximum length, in bytes
+    pub const LENGTH: usize = 10;
+
     /// Coerce the provided value into a valid `Username`, by truncating to the
     /// permitted length and removing any invalid characters.
     pub fn new_coerce(s: &str) -> Self {
         let mut s = s.to_string();
         s.retain(|c| c != '[');
-        s.truncate(s.floor_char_boundary(10));
+        s.truncate(s.floor_char_boundary(Self::LENGTH));
         // expect() is safe here; we've already truncated to the max length
         Self(ArrayString::try_from(s.as_str()).expect("Failed to convert string"))
     }
 }
 
+impl Hostname {
+    /// Maximum length, in bytes
+    pub const LENGTH: usize = 64;
+}
+
 impl ChannelKey {
     pub fn new_coerce(s: &str) -> <Self as Validated>::Result {
         let mut s = s.to_string();