feat(core): custom protocol headers on Linux, closes #4496 (#5421)

tauri-apps · Oct 17, 2022 · 357480f · 357480f
1 parent 95f467a
commit 357480f
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 179 deletions.
diff --git a/.changes/custom-protocol-uri-parse.md b/.changes/custom-protocol-uri-parse.md
@@ -0,0 +1,5 @@
+---
+"tauri": minor
+---
+
+The custom protocol now validates the request URI. This has implications when using the `asset` protocol without the `convertFileSrc` helper, the URL must now use the `asset://localhost/$filePath` format.
diff --git a/.changes/linux-header-support.md b/.changes/linux-header-support.md
@@ -0,0 +1,6 @@
+---
+"tauri": minor
+"tauri-runtime-wry": minor
+---
+
+Custom protocol headers are now implemented on Linux when running on webkit2gtk 2.36 or above.
diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -29,7 +29,7 @@ webview2-com = "0.19.1"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.15", features = [ "v3_20" ] }
-webkit2gtk = { version = "0.18", features = [ "v2_22" ] }
+webkit2gtk = { version = "0.18.2", features = [ "v2_36" ] }
 percent-encoding = "2.1"
 
 [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]

diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -93,7 +93,7 @@ notify-rust = { version = "4.5", default-features = false, features = [ "d" ], o
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.15", features = [ "v3_20" ] }
 glib = "0.15"
-webkit2gtk = { version = "0.18", features = [ "v2_22" ] }
+webkit2gtk = { version = "0.18.2", features = [ "v2_36" ] }
 
 [target."cfg(target_os = \"macos\")".dependencies]
 embed_plist = "1.2"

diff --git a/core/tauri/scripts/bundle.global.js b/core/tauri/scripts/bundle.global.js
diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -513,15 +513,11 @@ impl<R: Runtime> WindowManager<R> {
       pending.register_uri_scheme_protocol("asset", move |request| {
         let parsed_path = Url::parse(request.uri())?;
         let filtered_path = &parsed_path[..Position::AfterPath];
-        #[cfg(target_os = "windows")]
         let path = filtered_path
           .strip_prefix("asset://localhost/")
           // the `strip_prefix` only returns None when a request is made to `https://tauri.$P` on Windows
           // where `$P` is not `localhost/*`
           .unwrap_or("");
-        // safe to unwrap: request.uri() always starts with this prefix
-        #[cfg(not(target_os = "windows"))]
-        let path = filtered_path.strip_prefix("asset://").unwrap();
         let path = percent_encoding::percent_decode(path.as_bytes())
           .decode_utf8_lossy()
           .to_string();

diff --git a/examples/api/dist/assets/index.js b/examples/api/dist/assets/index.js