fix(core): properly add CSP header to fallback routes (#3641)

tauri-apps · Mar 8, 2022 · bcd4316 · bcd4316
1 parent f5efc24
commit bcd4316
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/fix-csp-fallback-route.md b/.changes/fix-csp-fallback-route.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Properly apply the CSP when loading a route that fallbacks to index.html.
diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -733,7 +733,6 @@ impl<R: Runtime> WindowManager<R> {
       // skip leading `/`
       path.chars().skip(1).collect::<String>()
     };
-    let is_html = path.ends_with(".html");
 
     let mut asset_path = AssetKey::from(path.as_str());
 
@@ -757,6 +756,7 @@ impl<R: Runtime> WindowManager<R> {
       .map(Cow::into_owned);
 
     let mut csp_header = None;
+    let is_html = asset_path.as_ref().ends_with(".html");
 
     match asset_response {
       Ok(asset) => {