fix Self XSS by injecting data attrbutte #727

jcubic · Dec 30, 2021 · 77eb044 · 77eb044
1 parent eb85cf1
commit 77eb044
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.31.1
+### Bugfix
+* fixing low severity self XSS with potential more security implications [#727](https://github.com/jcubic/jquery.terminal/issues/727)
+
 ## 2.31.0
 ### Breaking
 * remove undocumented `echo_command` (that was used by old `echo_newline` extension)

diff --git a/js/jquery.terminal-2.31.0.js b/js/jquery.terminal-2.31.0.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 27 Dec 2021 10:26:13 +0000
+ * Date: Thu, 30 Dec 2021 10:53:02 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5130,7 +5130,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: '2.31.0',
-        date: 'Mon, 27 Dec 2021 10:26:13 +0000',
+        date: 'Thu, 30 Dec 2021 10:53:02 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6180,7 +6180,9 @@
                     return text;
                 } else {
                     return data.replace(/&#93;/g, ']')
-                        .replace(/>/g, '&gt;').replace(/</g, '&lt;');
+                        .replace(/>/g, '&gt;')
+                        .replace(/</g, '&lt;')
+                        .replace(/"/g, '&quot;');
                 }
             }
             // -----------------------------------------------------------------
@@ -6365,7 +6367,7 @@
                 } else if (style.indexOf('@') !== -1) {
                     result += ' data-text/>';
                 } else {
-                    result += ' data-text="' + data.replace(/"/g, '&quot;') + '">' +
+                    result += ' data-text="' + data + '">' +
                         '<span>' + text + '</span></span>';
                 }
                 return result;
@@ -6386,7 +6388,7 @@
                     } else {
                         text = safe(text);
                         text = text.replace(/\\\]/, '&#93;');
-                        var data = text;
+                        var data = clean_data(text);
                         var extra = extra_css(text, settings);
                         var prefix;
                         if (extra.length) {

diff --git a/js/jquery.terminal-2.31.0.min.js b/js/jquery.terminal-2.31.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -6180,7 +6180,9 @@
                     return text;
                 } else {
                     return data.replace(/&#93;/g, ']')
-                        .replace(/>/g, '&gt;').replace(/</g, '&lt;');
+                        .replace(/>/g, '&gt;')
+                        .replace(/</g, '&lt;')
+                        .replace(/"/g, '&quot;');
                 }
             }
             // -----------------------------------------------------------------
@@ -6365,7 +6367,7 @@
                 } else if (style.indexOf('@') !== -1) {
                     result += ' data-text/>';
                 } else {
-                    result += ' data-text="' + data.replace(/"/g, '&quot;') + '">' +
+                    result += ' data-text="' + data + '">' +
                         '<span>' + text + '</span></span>';
                 }
                 return result;
@@ -6386,7 +6388,7 @@
                     } else {
                         text = safe(text);
                         text = text.replace(/\\\]/, '&#93;');
-                        var data = text;
+                        var data = clean_data(text);
                         var extra = extra_css(text, settings);
                         var prefix;
                         if (extra.length) {

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 27 Dec 2021 10:26:13 +0000
+ * Date: Thu, 30 Dec 2021 10:53:02 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5130,7 +5130,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: '2.31.0',
-        date: 'Mon, 27 Dec 2021 10:26:13 +0000',
+        date: 'Thu, 30 Dec 2021 10:53:02 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6180,7 +6180,9 @@
                     return text;
                 } else {
                     return data.replace(/&#93;/g, ']')
-                        .replace(/>/g, '&gt;').replace(/</g, '&lt;');
+                        .replace(/>/g, '&gt;')
+                        .replace(/</g, '&lt;')
+                        .replace(/"/g, '&quot;');
                 }
             }
             // -----------------------------------------------------------------
@@ -6365,7 +6367,7 @@
                 } else if (style.indexOf('@') !== -1) {
                     result += ' data-text/>';
                 } else {
-                    result += ' data-text="' + data.replace(/"/g, '&quot;') + '">' +
+                    result += ' data-text="' + data + '">' +
                         '<span>' + text + '</span></span>';
                 }
                 return result;
@@ -6386,7 +6388,7 @@
                     } else {
                         text = safe(text);
                         text = text.replace(/\\\]/, '&#93;');
-                        var data = text;
+                        var data = clean_data(text);
                         var extra = extra_css(text, settings);
                         var prefix;
                         if (extra.length) {

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map