From b9a8111a00b58e355baf60a55893dbfc70b0dfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 10 Aug 2021 13:19:45 +0200 Subject: refactor: --unsafely-ignore-certificate-errors (#11629) --- extensions/websocket/lib.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/websocket/lib.rs') diff --git a/extensions/websocket/lib.rs b/extensions/websocket/lib.rs index 97e970e85..69c6154b8 100644 --- a/extensions/websocket/lib.rs +++ b/extensions/websocket/lib.rs @@ -54,11 +54,11 @@ pub trait WebSocketPermissions { fn check_net_url(&mut self, _url: &url::Url) -> Result<(), AnyError>; } -/// `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>` could work, but there's a high chance /// that there might be another type alias pointing to a `Option>`, which /// would override previously used alias. -pub struct UnsafelyTreatInsecureOriginAsSecure(Option>); +pub struct UnsafelyIgnoreCertificateErrors(Option>); /// For use with `op_websocket_*` when the user does not want permissions. pub struct NoWebSocketPermissions; @@ -223,9 +223,9 @@ where ); } - let unsafely_treat_insecure_origin_as_secure = state + let unsafely_ignore_certificate_errors = state .borrow() - .borrow::() + .borrow::() .0 .clone(); let root_cert_store = state.borrow().borrow::().0.clone(); @@ -255,7 +255,7 @@ where let tls_config = create_client_config( root_cert_store, None, - unsafely_treat_insecure_origin_as_secure, + unsafely_ignore_certificate_errors, )?; let tls_connector = TlsConnector::from(Arc::new(tls_config)); let dnsname = DNSNameRef::try_from_ascii_str(domain) @@ -430,7 +430,7 @@ pub async fn op_ws_next_event( pub fn init( user_agent: String, root_cert_store: Option, - unsafely_treat_insecure_origin_as_secure: Option>, + unsafely_ignore_certificate_errors: Option>, ) -> Extension { Extension::builder() .js(include_js_files!( @@ -450,8 +450,8 @@ pub fn init( ]) .state(move |state| { state.put::(WsUserAgent(user_agent.clone())); - state.put(UnsafelyTreatInsecureOriginAsSecure( - unsafely_treat_insecure_origin_as_secure.clone(), + state.put(UnsafelyIgnoreCertificateErrors( + unsafely_ignore_certificate_errors.clone(), )); state.put::(WsRootStore(root_cert_store.clone())); Ok(()) -- cgit v1.2.3