add support for latin characters for domain and fix IPv6 parsing

denoland · yazan-abdalrahman · Jun 2, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 4, 2024
commit 4f7d572e0eb94f7f15ab1fd73397879dca7bbc95
diff --git a/ext/net/lib.rs b/ext/net/lib.rs
@@ -35,10  35,16 @@ impl NetPermissionHost {
   ) -> Result<Self, AnyError> {
     let lowercased = host.to_lowercase();
     let extracted_host = lowercased.as_str();
-    let (host_str, port_) = split_host_port(extracted_host)?;
     let (host_str, mut port_) = split_host_port(extracted_host)?;
     let host =
       Host::from_host_and_origin_host(host_str.as_str(), extracted_host)?;
 
     if host.is_ipv6()
       && (!extracted_host.contains('[') || !extracted_host.contains(']'))
     {
       port_ = None;
     }
 
     let final_port = if let Some(port_) = port_ {
       Some(port_)
     } else {

diff --git a/ext/net/ops.rs b/ext/net/ops.rs
@@ -85,10  85,17 @@ pub struct IpAddr {
 fn normalize_ip_addr(addr: &mut IpAddr) -> Result<(), AnyError> {
   let lowercased = addr.hostname.as_str().to_lowercase();
   let extracted_host = lowercased.as_str();
-  let (host_str, port) = split_host_port(extracted_host)?;
-  addr.hostname =
-    Host::from_host_and_origin_host(host_str.as_str(), extracted_host)?
-      .to_string();
   let (host_str, mut port) = split_host_port(extracted_host)?;
   let host =
     Host::from_host_and_origin_host(host_str.as_str(), extracted_host)?;
   addr.hostname = host.to_string();
 
   if host.is_ipv6()
     && (!extracted_host.contains('[') || !extracted_host.contains(']'))
   {
     port = None;
   }
 
   if let Some(port) = port {
     addr.port = port;
   }

diff --git a/runtime/permissions/host.rs b/runtime/permissions/host.rs
@@ -2,6  2,7 @@
 
 use deno_core::error::uri_error;
 use deno_core::error::AnyError;
 use deno_core::url::quirks::domain_to_ascii;
 use fqdn::FQDN;
 use std::fmt;
 use std::net::Ipv4Addr;
@@ -24,9  25,20 @@ impl Host {
       return Ok(Host::Ipv6(ipv6));
     }
 
-    let host = FQDN::from_str(host).map_err(|_| {
     if let Ok(ipv6) = origin_host.parse::<Ipv6Addr>() {
       return Ok(Host::Ipv6(ipv6));
     }
 
     let mut ascii_host = domain_to_ascii(host);
 
     if ascii_host.is_empty() {
       ascii_host = host.to_string();
     }
 
     let host = FQDN::from_str(&ascii_host).map_err(|_| {
       uri_error(format!("Failed to parse host: {}\n", origin_host))
     })?;
 
     let host_string = host.to_string();
 
     if let Ok(ipv4) = host_string.parse::<Ipv4Addr>() {
@@ -35,6  47,10 @@ impl Host {
 
     Ok(Host::FQDN(host))
   }
 
   pub fn is_ipv6(&self) -> bool {
     matches!(self, Host::Ipv6(_))
   }
 }
 
 impl fmt::Display for Host {

diff --git a/runtime/permissions/lib.rs b/runtime/permissions/lib.rs
@@ -713,9  713,16 @@ impl NetDescriptor {
   pub fn from_cli_arg(s: &str) -> Result<Self, AnyError> {
     let lowercased = s.to_lowercase();
     let extracted_host = lowercased.as_str();
-    let (host_str, port) = split_host_port(extracted_host)?;
     let (host_str, mut port) = split_host_port(extracted_host)?;
     let host =
       Host::from_host_and_origin_host(host_str.as_str(), extracted_host)?;
 
     if host.is_ipv6()
       && (!extracted_host.contains('[') || !extracted_host.contains(']'))
     {
       port = None;
     }
 
     Ok(NetDescriptor(host, port))
   }