Skip to content

Commit

Permalink
Make sure custom protocol is handled as secure context on macOS (#1551)
Browse files Browse the repository at this point in the history
  • Loading branch information
lemarier committed Apr 22, 2021
1 parent 422dd5e commit 5909c1e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changes/macos-custom-protocol-https.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Make sure custom protocol is treated as secure content on macOS.
11 changes: 5 additions & 6 deletions core/tauri/src/runtime/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ impl<P: Params> WindowManager<P> {
if self.inner.config.build.dev_path.starts_with("http") {
self.inner.config.build.dev_path.clone()
} else {
format!("tauri://{}", self.inner.config.tauri.bundle.identifier)
"tauri://localhost".into()
}
}

#[cfg(custom_protocol)]
fn get_url(&self) -> String {
format!("tauri://{}", self.inner.config.tauri.bundle.identifier)
"tauri://localhost".into()
}

fn prepare_attributes(
Expand Down Expand Up @@ -240,7 +240,6 @@ impl<P: Params> WindowManager<P> {

fn prepare_custom_protocol(&self) -> CustomProtocol {
let assets = self.inner.assets.clone();
let bundle_identifier = self.inner.config.tauri.bundle.identifier.clone();
CustomProtocol {
handler: Box::new(move |path| {
let mut path = path
Expand All @@ -249,12 +248,12 @@ impl<P: Params> WindowManager<P> {
.next()
.unwrap()
.to_string()
.replace(&format!("tauri://{}", bundle_identifier), "");
.replace("tauri://localhost", "");
if path.ends_with('/') {
path.pop();
}
let path = if path.is_empty() {
// if the url is `tauri://${appId}`, we should load `index.html`
// if the url is `tauri://localhost`, we should load `index.html`
"index.html".to_string()
} else {
// skip leading `/`
Expand Down Expand Up @@ -385,7 +384,7 @@ mod test {
);

#[cfg(custom_protocol)]
assert_eq!(manager.get_url(), "tauri://studio.tauri.example");
assert_eq!(manager.get_url(), "tauri://localhost");

#[cfg(dev)]
assert_eq!(manager.get_url(), manager.config().build.dev_path);
Expand Down

0 comments on commit 5909c1e

Please sign in to comment.