stamp: reflect upstream changes

supabase · Jul 31, 2024 · 5239160 · 5239160
1 parent 9ef612f
commit 5239160
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/crates/sb_core/permissions.rs b/crates/sb_core/permissions.rs
@@ -2,7 +2,6 @@ use deno_core::error::{custom_error, generic_error, AnyError};
 use deno_core::url::Url;
 use deno_fs::OpenOptions;
 use deno_permissions::NetDescriptor;
-use fqdn::fqdn;
 use std::borrow::Cow;
 use std::path::Path;
 
@@ -67,11 +66,8 @@ impl deno_fetch::FetchPermissions for Permissions {
         }
 
         if let Some(allow_net) = &self.allow_net {
-            let hostname = url
-                .host_str()
-                .ok_or(generic_error("empty host"))?
-                .to_string();
-            let descriptor = NetDescriptor(fqdn!(&hostname), url.port());
+            let hostname = url.host_str().ok_or(generic_error("empty host"))?.parse()?;
+            let descriptor = NetDescriptor(hostname, url.port());
             if !allow_net.contains(&descriptor) {
                 return Err(custom_error(
                     "PermissionDenied",
@@ -132,11 +128,8 @@ impl deno_websocket::WebSocketPermissions for Permissions {
             ));
         }
         if let Some(allow_net) = &self.allow_net {
-            let hostname = url
-                .host_str()
-                .ok_or(generic_error("empty host"))?
-                .to_string();
-            let descriptor = NetDescriptor(fqdn!(&hostname), url.port());
+            let hostname = url.host_str().ok_or(generic_error("empty host"))?.parse()?;
+            let descriptor = NetDescriptor(hostname, url.port());
             if !allow_net.contains(&descriptor) {
                 return Err(custom_error(
                     "PermissionDenied",