gui: stricter validation in add and edit modals

common/src/lib.rs

@@ -35,11 +35,12 @@ pub struct ServerEntry {
 #[cfg(feature = "networking")]
 pub async fn ping_server(address: &str, port: u16) -> color_eyre::Result<ServerStatus> {
     use color_eyre::eyre::{bail, eyre};
+    use std::net::ToSocketAddrs;
     use std::time::Duration;
-    use tokio::net::{lookup_host, UdpSocket};
+    use tokio::net::UdpSocket;
 
-    let dest = lookup_host(format!("{}:{}", address, port))
+    let dest = format!("{}:{}", address, port)
-        .await?
+        .to_socket_addrs()?
         .next()
         .ok_or_else(|| eyre!("could not resolve address"))?;
 

gui/src/main.rs

@@ -16,15 +16,6 @@ fn address_is_valid(addr: &str) -> bool {
     !addr.is_empty() && !addr.contains(':')
 }
 
-fn split_host_port(input: &str) -> (String, Option<String>) {
-    if let Some((host, port)) = input.rsplit_once(':') {
-        if !port.is_empty() && port.chars().all(|c| c.is_ascii_digit()) {
-            return (host.to_string(), Some(port.to_string()));
-        }
-    }
-    (input.to_string(), None)
-}
-
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum UserIcon {
     Normal,
@@ -825,7 +816,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
             .unwrap_or_default()
     });
     let mut password = use_signal(|| String::new());
-    let mut address_paste_pending = use_signal(|| false);
 
     let do_save = move |_| {
         let port_num: u16 = port.read().parse().unwrap_or(64738);
@@ -863,10 +853,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| name.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a name for this server."
-                    }
                 }
                 div {
                     class: "modal-field",
@@ -876,26 +862,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         placeholder: "mumble.example.com",
                         pattern: ADDRESS_PATTERN,
                         value: "{address.read()}",
-                        onpaste: move |_| address_paste_pending.set(true),
+                        oninput: move |evt| address.set(evt.value().clone()),
-                        oninput: move |evt| {
-                            if address_paste_pending() {
-                                address_paste_pending.set(false);
-                                let (host, maybe_port) = split_host_port(&evt.value());
-                                address.set(host);
-                                if let Some(p) = maybe_port {
-                                    port.set(p);
-                                }
-                            } else {
-                                address.set(evt.value());
-                            }
-                        },
-                        onblur: move |_| {
-                            let (host, maybe_port) = split_host_port(&address.read());
-                            if let Some(p) = maybe_port {
-                                address.set(host);
-                                port.set(p);
-                            }
-                        },
                         required: true,
                     }
                     div {
@@ -913,10 +880,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| port.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a port number."
-                    }
                 }
                 div {
                     class: "modal-field",
@@ -928,10 +891,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| username.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a username."
-                    }
                 }
                 div {
                     class: "modal-field",
@@ -974,7 +933,6 @@ fn EditServerModal(
     let mut port = use_signal(|| entry.port.to_string());
     let mut username = use_signal(|| entry.username.clone());
     let mut password = use_signal(|| entry.password.clone().unwrap_or_default());
-    let mut address_paste_pending = use_signal(|| false);
 
     let do_save = move |_| {
         let port_num: u16 = port.read().parse().unwrap_or(64738);
@@ -1003,7 +961,7 @@ fn EditServerModal(
                 class: "modal",
                 h2 { "Edit Server" }
                 div {
-                    class: "modal-field modal-field--strict",
+                    class: "modal-field",
                     label { "Name" }
                     input {
                         r#type: "text",
@@ -1012,10 +970,6 @@ fn EditServerModal(
                         oninput: move |evt| name.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a name for this server."
-                    }
                 }
                 div {
                     class: "modal-field modal-field--strict",
@@ -1025,26 +979,7 @@ fn EditServerModal(
                         placeholder: "mumble.example.com",
                         pattern: ADDRESS_PATTERN,
                         value: "{address.read()}",
-                        onpaste: move |_| address_paste_pending.set(true),
+                        oninput: move |evt| address.set(evt.value().clone()),
-                        oninput: move |evt| {
-                            if address_paste_pending() {
-                                address_paste_pending.set(false);
-                                let (host, maybe_port) = split_host_port(&evt.value());
-                                address.set(host);
-                                if let Some(p) = maybe_port {
-                                    port.set(p);
-                                }
-                            } else {
-                                address.set(evt.value());
-                            }
-                        },
-                        onblur: move |_| {
-                            let (host, maybe_port) = split_host_port(&address.read());
-                            if let Some(p) = maybe_port {
-                                address.set(host);
-                                port.set(p);
-                            }
-                        },
                         required: true,
                     }
                     div {
@@ -1053,7 +988,7 @@ fn EditServerModal(
                     }
                 }
                 div {
-                    class: "modal-field modal-field--strict",
+                    class: "modal-field",
                     label { "Port" }
                     input {
                         r#type: "number",
@@ -1062,13 +997,9 @@ fn EditServerModal(
                         oninput: move |evt| port.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a port number."
-                    }
                 }
                 div {
-                    class: "modal-field modal-field--strict",
+                    class: "modal-field",
                     label { "Username" }
                     input {
                         r#type: "text",
@@ -1077,10 +1008,6 @@ fn EditServerModal(
                         oninput: move |evt| username.set(evt.value().clone()),
                         required: true,
                     }
-                    div {
-                        class: "modal-field__error",
-                        "Enter a username."
-                    }
                 }
                 div {
                     class: "modal-field",