diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2021-08-10 13:19:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-10 13:19:45 +0200 |
commit | b9a8111a00b58e355baf60a55893dbfc70b0dfdd (patch) | |
tree | 99f88f95143ddeaa11f77dd80dccacb03f6d5270 /extensions/net | |
parent | 465cf9a6fe2d77f4c3cdaeb8eea60bd2b8697608 (diff) |
refactor: --unsafely-ignore-certificate-errors (#11629)
Diffstat (limited to 'extensions/net')
-rw-r--r-- | extensions/net/lib.rs | 10 | ||||
-rw-r--r-- | extensions/net/ops_tls.rs | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/extensions/net/lib.rs b/extensions/net/lib.rs index f68034517..fe10abf5f 100644 --- a/extensions/net/lib.rs +++ b/extensions/net/lib.rs @@ -94,16 +94,16 @@ pub struct DefaultTlsOptions { pub root_cert_store: Option<RootCertStore>, } -/// `UnsafelyTreatInsecureOriginAsSecure` is a wrapper struct so it can be placed inside `GothamState`; +/// `UnsafelyIgnoreCertificateErrors` is a wrapper struct so it can be placed inside `GothamState`; /// using type alias for a `Option<Vec<String>>` could work, but there's a high chance /// that there might be another type alias pointing to a `Option<Vec<String>>`, which /// would override previously used alias. -pub struct UnsafelyTreatInsecureOriginAsSecure(Option<Vec<String>>); +pub struct UnsafelyIgnoreCertificateErrors(Option<Vec<String>>); pub fn init<P: NetPermissions + 'static>( root_cert_store: Option<RootCertStore>, unstable: bool, - unsafely_treat_insecure_origin_as_secure: Option<Vec<String>>, + unsafely_ignore_certificate_errors: Option<Vec<String>>, ) -> Extension { let mut ops_to_register = vec![]; ops_to_register.extend(io::init()); @@ -122,8 +122,8 @@ pub fn init<P: NetPermissions + 'static>( root_cert_store: root_cert_store.clone(), }); state.put(UnstableChecker { unstable }); - state.put(UnsafelyTreatInsecureOriginAsSecure( - unsafely_treat_insecure_origin_as_secure.clone(), + state.put(UnsafelyIgnoreCertificateErrors( + unsafely_ignore_certificate_errors.clone(), )); Ok(()) }) diff --git a/extensions/net/ops_tls.rs b/extensions/net/ops_tls.rs index 6c26ed748..91fad6706 100644 --- a/extensions/net/ops_tls.rs +++ b/extensions/net/ops_tls.rs @@ -9,7 +9,7 @@ use crate::resolve_addr::resolve_addr; use crate::resolve_addr::resolve_addr_sync; use crate::DefaultTlsOptions; use crate::NetPermissions; -use crate::UnsafelyTreatInsecureOriginAsSecure; +use crate::UnsafelyIgnoreCertificateErrors; use deno_core::error::bad_resource; use deno_core::error::bad_resource_id; use deno_core::error::custom_error; @@ -761,9 +761,9 @@ where }; let port = args.port; let cert_file = args.cert_file.as_deref(); - let unsafely_treat_insecure_origin_as_secure = state + let unsafely_ignore_certificate_errors = state .borrow() - .borrow::<UnsafelyTreatInsecureOriginAsSecure>() + .borrow::<UnsafelyIgnoreCertificateErrors>() .0 .clone(); @@ -810,7 +810,7 @@ where let mut tls_config = create_client_config( root_cert_store, ca_data, - unsafely_treat_insecure_origin_as_secure, + unsafely_ignore_certificate_errors, )?; if args.cert_chain.is_some() || args.private_key.is_some() { |