fix(runtime): Improve Error Handling and-Dot Handling in-fqdn! Macro (closed)

runtime/permissions/lib.rs

@@ -16,7 +16,6 @@ use deno_core::url;
 use deno_core::url::Url;
 use deno_core::ModuleSpecifier;
 use deno_terminal::colors;
-use fqdn::fqdn;
 use fqdn::FQDN;
 use once_cell::sync::Lazy;
 use std::borrow::Cow;
@@ -688,6 +687,28 @@ impl Descriptor for WriteDescriptor {
   }
 }
 
+/// Modify `fqdn!` to handle domain names ending with a dot
+/// Handle parsing error
+macro_rules! fqdn {
+    ($($args:expr),*) => {{
+        #[allow(unused_mut)]
+        let mut str = std::string::String::new();
+        $( str += "."; str += $args; )*
+
+
+        let fqdn_string = if str.ends_with('.') {
+            &str[1..str.len() - 1]
+        } else {
+            &str[1..]
+        };
+
+        match fqdn_string.parse::<$crate::FQDN>() {
+            Ok(fqdn) => fqdn,
+            Err(_) => $crate::FQDN::default(),
+        }
+    }}
+}
+
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct NetDescriptor(pub FQDN, pub Option<u16>);
 
@@ -3293,4 +3314,50 @@ mod tests {
     )
     .is_err());
   }
+
+  #[test]
+  fn test_from_str_valid() {
+    let input = "example.com:8080";
+    let expected_fqdn = fqdn!("example.com");
+    let expected_port = Some(8080);
+    let result = NetDescriptor::from_str(input).unwrap();
+    assert_eq!(result.0, expected_fqdn);
+    assert_eq!(result.1, expected_port);
+  }
+
+  #[test]
+  fn test_from_str_invalid_empty() {
+    let input = "";
+    assert!(NetDescriptor::from_str(input).is_err());
+  }
+
+  #[test]
+  fn test_from_str_invalid_no_host() {
+    let input = ":8080";
+    assert!(NetDescriptor::from_str(input).is_err());
+  }
+
+  #[test]
+  fn test_macro_expansion() {
+    let host = "example.com";
+    let port = Some(8080);
+    let descriptor_tuple: (&str, Option<u16>) = (host, port);
+    let descriptor = NetDescriptor::new(&&descriptor_tuple);
+    assert_eq!(descriptor.0, fqdn!("example.com."));
+    assert_eq!(descriptor.1, Some(8080));
+  }
+
+  #[test]
+  fn test_parse_with_unknown_scheme() {
+    let input = "example.com:8080";
+    let descriptor = NetDescriptor::from_str(input).unwrap();
+    assert_eq!(descriptor.0, fqdn!("example.com."));
+    assert_eq!(descriptor.1, Some(8080));
+  }
+
+  #[test]
+  fn test_from_str_invalid_unparsable() {
+    let input = "foo@bar.com.";
+    assert_eq!(fqdn!(input), crate::FQDN::default());
+  }
 }