fix: Update global variable handling in views to use decodeURICompone…

…nt (#4383) Signed-off-by: ya zhou <[email protected]>
kubesphere · Dec 24, 2024 · 91b30dd · 91b30dd
1 parent 74db818
commit 91b30dd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 31 deletions.
diff --git a/server/controllers/view.js b/server/controllers/view.js
@@ -55,15 +55,17 @@ const renderIndex = async (ctx, params) => {
     extStyles,
     hostname: ctx.hostname,
     importMap: JSON.stringify(importMap),
-    globals: JSON.stringify({
-      config: clientConfig,
-      manifest,
-      localeManifest,
-      theme,
-      defaultTheme,
-      useDefaultTheme,
-      ...params,
-    }),
+    globals: encodeURIComponent(
+      JSON.stringify({
+        config: clientConfig,
+        manifest,
+        localeManifest,
+        theme,
+        defaultTheme,
+        useDefaultTheme,
+        ...params,
+      }),
+    )
   });
 };
 
@@ -82,16 +84,18 @@ const renderV3Index = async (ctx, params) => {
     isDev: global.MODE_DEV,
     title: clientConfig.title,
     hostname: ctx.hostname,
-    globals: JSON.stringify({
-      config: clientConfig,
-      localeManifest,
+    globals: encodeURIComponent(
+      JSON.stringify({
+        config: clientConfig,
+        localeManifest,
 
-      theme,
-      defaultTheme,
-      useDefaultTheme,
+        theme,
+        defaultTheme,
+        useDefaultTheme,
 
-      ...params,
-    }),
+        ...params,
+      }),
+    )
   });
 };
 
@@ -164,17 +168,19 @@ const renderTerminal = async ctx => {
       favicon,
       hostname: ctx.hostname,
       importMap: JSON.stringify(importMap),
-      globals: JSON.stringify({
-        config: clientConfig,
-        manifest,
-        localeManifest,
-        user,
-        ksConfig,
-        runtime,
-        theme,
-        defaultTheme,
-        useDefaultTheme,
-      }),
+      globals: encodeURIComponent(
+        JSON.stringify({
+          config: clientConfig,
+          manifest,
+          localeManifest,
+          user,
+          ksConfig,
+          runtime,
+          theme,
+          defaultTheme,
+          useDefaultTheme,
+        }),
+      )
     });
   } catch (err) {
     await renderViewErr(ctx, err);

diff --git a/server/views/consolev3.html b/server/views/consolev3.html
@@ -18,7 +18,7 @@
   <body>
     <div id="root"></div>
     <script type="text/javascript">
-      window.globals = JSON.parse(`<%- globals %>`);
+      window.globals = JSON.parse(decodeURIComponent(`<%- globals %>`));
     </script>
     <% if (manifest && manifest.js && manifest.js.length > 0) { %> <%
     manifest.js.forEach(function(item){ %>

diff --git a/server/views/index.html b/server/views/index.html
@@ -26,7 +26,7 @@
       { "imports": <%- importMap %> }
     </script>
     <script type="text/javascript">
-      window.globals = JSON.parse(`<%- globals %>`);
+      window.globals = JSON.parse(decodeURIComponent(`<%- globals %>`));
     </script>
     <% if (isDev) { %> <%- include('./components/dev_scripts.html') %> <% } else { %> <%-
     include('./components/prod_scripts.html') %> <% } %>

diff --git a/server/views/terminal.html b/server/views/terminal.html
@@ -23,7 +23,7 @@
       { "imports": <%- importMap %> }
     </script>
     <script type="text/javascript">
-      window.globals = JSON.parse(`<%- globals %>`);
+      window.globals = JSON.parse(decodeURIComponent(`<%- globals %>`));
     </script>
     <% if (isDev) { %>
     <script type="text/javascript" src="<%= bundlePrefix %>/runtime.js"></script>