From f700561e1a8d06c18ca2bdbe4605d7ab34f7a761 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 30 Mar 2022 00:55:38 +0500
Subject: [PATCH 1/2] fix(web): updated STUDIO log and webout

---
 web/src/containers/Studio/index.tsx | 37 ++++++++---------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/web/src/containers/Studio/index.tsx b/web/src/containers/Studio/index.tsx
index 5ef8013..27c73db 100644
--- a/web/src/containers/Studio/index.tsx
+++ b/web/src/containers/Studio/index.tsx
@@ -50,25 +50,9 @@ const Studio = () => {
           .map((logLine: any) => logLine.line)
           .join('\n')
 
-        setLog(`<div><h2>SAS Log</h2><pre>${parsedLog}</pre></div>`)
+        setLog(parsedLog)
 
-        let weboutString: string
-        try {
-          weboutString = res.data._webout
-            .split('>>weboutBEGIN<<')[1]
-            .split('>>weboutEND<<')[0]
-        } catch (_) {
-          weboutString = res?.data?._webout ?? ''
-        }
-
-        let webout: string
-        try {
-          webout = JSON.stringify(JSON.parse(weboutString), null, 4)
-        } catch (_) {
-          webout = weboutString
-        }
-
-        setWebout(`<pre><code>${webout}</code></pre>`)
+        setWebout(`${res.data?._webout}`)
         setTab('2')
 
         // Scroll to bottom of log
@@ -100,6 +84,7 @@ const Studio = () => {
   }, [location.search])
 
   const classes = useStyles()
+
   return (
     <>
       <br />
@@ -152,17 +137,15 @@ const Studio = () => {
             </Stack>
           </TabPanel>
           <TabPanel value="2">
-            <div
-              id="sas_log"
-              style={{ marginTop: '50px' }}
-              dangerouslySetInnerHTML={{ __html: log }}
-            />
+            <div style={{ marginTop: '50px' }}>
+              <h2>SAS Log</h2>
+              <pre>{log}</pre>
+            </div>
           </TabPanel>
           <TabPanel value="3">
-            <div
-              style={{ marginTop: '50px' }}
-              dangerouslySetInnerHTML={{ __html: webout }}
-            />
+            <div style={{ marginTop: '50px' }}>
+              <pre>{webout}</pre>
+            </div>
           </TabPanel>
         </TabContext>
       </Box>

From 99839ae62f33566aa3d952a1cec414a90928c13a Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 30 Mar 2022 00:55:59 +0500
Subject: [PATCH 2/2] chore: fix vulnerabilities

---
 api/package-lock.json | 12 ++++++------
 web/package-lock.json | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index 35e574f..37485a7 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -7107,9 +7107,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
@@ -15624,9 +15624,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mkdirp": {
       "version": "1.0.4",
diff --git a/web/package-lock.json b/web/package-lock.json
index 7667dbc..3fe8129 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -8472,9 +8472,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mkdirp": {
       "version": "0.5.5",
@@ -8581,9 +8581,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true,
       "engines": {
         "node": ">= 6.13.0"
@@ -17622,9 +17622,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mkdirp": {
       "version": "0.5.5",
@@ -17715,9 +17715,9 @@
       }
     },
     "node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true
     },
     "node-releases": {