From 2d970acfa4046272af19eed104f807c070e0cb5e Mon Sep 17 00:00:00 2001
From: Chinmay Pendharkar <notthetup@gmail.com>
Date: Wed, 10 Jul 2024 13:27:29 +0800
Subject: [PATCH] fix(webshell): making webshell iframe safe by making all
 parent access inside try-catch

---
 .../org/arl/fjage/web/shell/index.html        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/org/arl/fjage/web/shell/index.html b/src/main/resources/org/arl/fjage/web/shell/index.html
index d5b15e87..e77f6015 100644
--- a/src/main/resources/org/arl/fjage/web/shell/index.html
+++ b/src/main/resources/org/arl/fjage/web/shell/index.html
@@ -80,7 +80,6 @@
   </div>
   <script>
     const ignoreKeys = ['Meta-R', 'Meta-Shift-R'];
-    let defaultCursorWidth;
     let rtime = 0;
     let resizing = false;
     let delta = 200;
@@ -160,18 +159,23 @@
       }
     }
     window.addEventListener('load', () => {
-      let hideModeToggle = false;
-      if (window.parent.document.documentElement.classList.contains('dark')){
-        currentTheme = 'dark';
-        hideModeToggle = true;
-      }else if (window.parent.document.documentElement.classList.contains('light')){
-        currentTheme = 'light';
-        hideModeToggle = true;
-      }
-      hideModeToggle = hideModeToggle || window.parent.hideModeToggle;
       const darkmodeBtn = document.getElementById('darkmode-tgl');
+      let hideModeToggle = false;
       let userTheme = false;
 
+      try{
+        if (window.parent.document.documentElement.classList.contains('dark')){
+          currentTheme = 'dark';
+          hideModeToggle = true;
+        }else if (window.parent.document.documentElement.classList.contains('light')){
+          currentTheme = 'light';
+          hideModeToggle = true;
+        }
+        hideModeToggle = hideModeToggle || window.parent.hideModeToggle;
+      }catch(e){
+        // ignore
+      }
+
       const term = new Terminal({
         cols: 160,
         rows: 50
@@ -179,10 +183,9 @@
       fitAddon = new FitAddon.FitAddon();
       term.loadAddon(fitAddon);
       term.loadAddon(new WebLinksAddon.WebLinksAddon());
-
       term.open(document.getElementById('terminal'));
+
       fitAddon.fit();
-      defaultCursorWidth = term.getOption("cursorWidth");
 
       if (currentTheme == null && window.matchMedia) currentTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';