feat: add back isolation pattern (tari-project#1334)

Adds back the tauri isolation pattern that was lost in v2 upgrade --------- Co-authored-by: brianp <[email protected]> Co-authored-by: Brian Pearce <[email protected]>
brianp · Jan 14, 2025 · cf3c3a5 · cf3c3a5
1 parent 0aceb44
commit cf3c3a5
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 12 deletions.
diff --git a/.license.ignore b/.license.ignore
@@ -1,2 +1 @@
-./public/assets/glApp.js
-./dist-isolation/index.js
+./public/assets/glApp.js
diff --git a/dist-isolation/index.html b/dist-isolation/index.html
@@ -1,10 +1,22 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8" />
     <title>Isolation Secure Script</title>
 </head>
+
 <body>
-<script src="index.js"></script>
+    <script>
+        window.__TAURI_ISOLATION_HOOK__ = (payload) => {
+            // console.debug("Isolation hook called with payload:", payload);
+            // TODO: Prevent command execution
+            // TODO: Perhaps whitelist commands
+            console.log("Isolation hook called with payload:", payload);
+            return payload;
+        };
+
+    </script>
 </body>
+
 </html>
diff --git a/dist-isolation/index.js b/dist-isolation/index.js
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.8.42"
 
 [build-dependencies]
 embed-resource = "2.5.0"
-tauri-build = { version = "2", features = [] }
+tauri-build = { version = "2", features = ["isolation"] }
 
 [dependencies]
 anyhow = "1"
@@ -69,6 +69,7 @@ tari_key_manager = { git = "https://github.com/tari-project/tari.git", tag = "v1
 tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
 tari_utilities = "0.8.0"
 tauri = { git = "https://github.com/tari-project/tauri.git", rev = "67a06c8a9bae94f412b8059dfa8b4d8dd8ea0a25", features = [
+  "isolation",
   "macos-private-api",
   "image-png",
   "image-ico",

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -40,7 +40,13 @@
                 "default",
                 "migrated"
             ],
-            "csp": null
+            "csp": null,
+            "pattern": {
+                "use": "isolation",
+                "options": {
+                    "dir": "../dist-isolation"
+                }
+            }
         },
         "trayIcon": {
             "id": "universe-tray-id",