CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): account for data: uri when calculating origin, closes #7078 (#7133)

Browse Source 
Co-authored-by: Lucas Nogueira <lucas@tauri.app>
This commit is contained in:
Amr Bashir
2023-06-05 15:47:21 +03:00
committed by GitHub
parent 85e77fb797
commit 0503eb69ce
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/core-unix-window-data-url.md Normal file
View File

@@ -0,0 +1,5 @@
---
'tauri': 'patch:bug'
---
On macOS and Linux, fix app crashing when creating a window with `data:` uri.

30
core/tauri/src/manager.rs
View File

@@ -471,21 +471,21 @@ impl<R: Runtime> WindowManager<R> {
}
let window_url = Url::parse(&pending.url).unwrap();
let window_origin =
if cfg!(windows) && window_url.scheme() != "http" && window_url.scheme() != "https" {
format!("https://{}.localhost", window_url.scheme())
} else {
format!(
"{}://{}{}",
window_url.scheme(),
window_url.host().unwrap(),
if let Some(port) = window_url.port() {
format!(":{port}")
} else {
"".into()
}
)
};
let window_origin = if window_url.scheme() == "data" {
"null".into()
} else if cfg!(windows) && window_url.scheme() != "http" && window_url.scheme() != "https" {
format!("https://{}.localhost", window_url.scheme())
} else {
format!(
"{}://{}{}",
window_url.scheme(),
window_url.host().unwrap(),
window_url
.port()
.map(|p| format!(":{p}"))
.unwrap_or_default()
)
};
if !registered_scheme_protocols.contains(&"tauri".into()) {
let web_resource_request_handler = pending.web_resource_request_handler.take();