denoland · yazan-abdalrahman · Jun 2, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 4, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,6  109,7 @@ faster-hex = "0.9"
 fastwebsockets = { version = "0.6", features = ["upgrade", "unstable-split"] }
 filetime = "0.2.16"
 flate2 = { version = "1.0.26", default-features = false }
 fqdn = "0.3.4"
 fs3 = "0.5.0"
 futures = "0.3.21"
 glob = "0.3.1"

diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -9789,4  9789,43 @@ mod tests {
       }
     );
   }
 
   #[test]
   fn wildcard_flags() {
     #[rustfmt::skip]
     let r = flags_from_vec(svec![
         "deno",
         "run",
         "--allow-read",
         "--allow-write=notion-next",
         "--allow-net=api.notion.com,*.amazonaws.com",
         "--allow-env",
         "script.ts"
     ]);
 
     let flags = r.unwrap();
     assert_eq!(
       flags,
       Flags {
         subcommand: DenoSubcommand::Run(RunFlags::new_default(
           "script.ts".to_string()
         )),
         permissions: PermissionFlags {
           allow_env: Some(vec![],),
           allow_net: Some(vec![
             "api.notion.com".to_string(),
             "*.amazonaws.com".to_string(),
           ],),
           allow_read: Some(vec![],),
           allow_write: Some(vec!["notion-next".to_string(),],),
           ..Default::default()
         },
         unstable_config: UnstableConfig {
           ..Default::default()
         },
         code_cache_enabled: true,
         ..Flags::default()
       }
     );
   }
 }
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
@@ -16,6  16,7 @@ path = "lib.rs"
 [dependencies]
 deno_core.workspace = true
 deno_tls.workspace = true
 fqdn.workspace = true
 pin-project.workspace = true
 rustls-tokio-stream.workspace = true
 serde.workspace = true

diff --git a/ext/net/host.rs b/ext/net/host.rs
@@ -0,0  1,87 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use fqdn::FQDN;
 use std::fmt;
 use std::net::Ipv4Addr;
 use std::net::Ipv6Addr;
 use std::str::FromStr;
 
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub enum Host {
   FQDN(FQDN),
   Ipv4(Ipv4Addr),
   Ipv6(Ipv6Addr),
 }
 
 impl Host {
   pub fn from_host_and_origin_host(
     host: &str,
     origin_host: &str,
   ) -> Result<Self, AnyError> {
     if let Ok(ipv6) = host.parse::<Ipv6Addr>() {
       return Ok(Host::Ipv6(ipv6));
     }
 
     let host = FQDN::from_str(host)
       .with_context(|| format!("Failed to parse host: {}\n", origin_host))?;
     let host_string = host.to_string();
 
     if let Ok(ipv4) = host_string.parse::<Ipv4Addr>() {
       return Ok(Host::Ipv4(ipv4));
     }
 
     Ok(Host::FQDN(host))
   }
 }
 
 impl fmt::Display for Host {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     match self {
       Host::FQDN(fqdn) => write!(f, "{}", fqdn),
       Host::Ipv4(ipv4) => write!(f, "{}", ipv4),
       Host::Ipv6(ipv6) => write!(f, "[{}]", ipv6),
     }
   }
 }
 
 pub fn split_host_port(s: &str) -> Result<(String, Option<u16>), AnyError> {
   let mut host = s.to_string();
   let mut port = None;
 
   let have_port = host.contains(':') && !host.contains('[');
 
   if host.starts_with('[') && host.contains(']') {
     if host.ends_with("]:") {
       return Err(AnyError::msg("Invalid format: [ipv6]:port"));
     }
     if let Some(pos) = host.rfind("]:") {
       let port_str = &host[pos   2..];
       let port_ = port_str.parse::<u16>().ok();
       host = host[1..pos].to_string();
       port = port_;
     } else {
       host = host[1..(host.len() - 1)].to_string();
     }
   } else if let Some(pos) = host.rfind(':') {
     let port_str = &host[pos   1..];
     if let Ok(parsed_port) = port_str.parse::<u16>() {
       host.truncate(pos);
       port = Some(parsed_port);
     }
   }
 
   if have_port && port.is_none() {
     return Err(AnyError::msg("No port specified after ':'"));
   }
 
   Ok((host, port))
 }
 
 pub fn extract_host(s: &str) -> String {
   if let Some(index) = s.find("://") {
     return s[index   3..].split('/').next().unwrap_or(s).to_string();
   }
   s.to_string()
 }