fix(custom-protocol): Make sure custom protocol on Windows is over HT…

…TPS. (#179) I thought we’ll get a SSL error but after my tests I figured out we should use https instead of http.
tauri-apps · Apr 21, 2021 · c36db35 · c36db35
1 parent dd0fa46
commit c36db35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.changes/windows-ssl-custom-protocol.md b/.changes/windows-ssl-custom-protocol.md
@@ -0,0 +1,5 @@
+---
+"wry": minor
+---
+
+Make sure custom protocol on Windows is over HTTPS.
diff --git a/src/webview/win32/mod.rs b/src/webview/win32/mod.rs
@@ -117,15 +117,15 @@ impl InnerWebView {
           // See https://github.com/MicrosoftEdge/WebView2Feedback/issues/73
           custom_protocol_names.insert(name.clone());
           w.add_web_resource_requested_filter(
-            &format!("http://custom-protocol-{}*", name),
+            &format!("https://custom-protocol-{}*", name),
             webview2::WebResourceContext::All,
           )?;
           let env_clone = env_.clone();
           w.add_web_resource_requested(move |_, args| {
             let uri = args.get_request()?.get_uri()?;
             // Undo the protocol workaround when giving path to resolver
             let path = &uri.replace(
-              &format!("http://custom-protocol-{}", name),
+              &format!("https://custom-protocol-{}", name),
               &format!("{}://", name),
             );
 
@@ -175,7 +175,7 @@ impl InnerWebView {
               // See https://github.com/MicrosoftEdge/WebView2Feedback/issues/73
               url_string = url.as_str().replace(
                 &format!("{}://", name),
-                &format!("http://custom-protocol-{}", name),
+                &format!("https://custom-protocol-{}", name),
               )
             }
             w.navigate(&url_string)?;

diff --git a/src/webview/winrt/mod.rs b/src/webview/winrt/mod.rs
@@ -141,7 +141,7 @@ impl InnerWebView {
       // See https://github.com/MicrosoftEdge/WebView2Feedback/issues/73
       custom_protocol_names.insert(name.clone());
       w.AddWebResourceRequestedFilter(
-        format!("http://custom-protocol-{}*", name).as_str(),
+        format!("https://custom-protocol-{}*", name).as_str(),
         webview2::CoreWebView2WebResourceContext::All,
       )?;
       let env_ = env.clone();
@@ -154,7 +154,7 @@ impl InnerWebView {
           if let Ok(uri) = String::from_utf16(args.Request()?.Uri()?.as_wide()) {
             // Undo the protocol workaround when giving path to resolver
             let path = uri.replace(
-              &format!("http://custom-protocol-{}", name),
+              &format!("https://custom-protocol-{}", name),
               &format!("{}://", name),
             );
 
@@ -208,7 +208,7 @@ impl InnerWebView {
           // See https://github.com/MicrosoftEdge/WebView2Feedback/issues/73
           url_string = url.as_str().replace(
             &format!("{}://", name),
-            &format!("http://custom-protocol-{}", name),
+            &format!("https://custom-protocol-{}", name),
           )
         }
         w.Navigate(url_string.as_str())?;