netstack.js 2.1.1 → 2.1.3

package/netstack.js

@@ -1,5 +1,5 @@
 /*!
- * netStack v2.1.1
+ * netStack v2.1.3
  * A simple and easy JavaScript library for highlighting .NET stack traces
  * License: Apache 2
  * Author: https://elmah.io
@@ -18,6 +18,10 @@
     }
 }(typeof self !== 'undefined' ? self : this, function() {
 
+    // Prevent SQL keywords
+    var sqlKeywords = "INNER JOIN|DELETE|SELECT|FROM|WHERE|INSERT|UPDATE";
+    var preventSQL = `(?!${sqlKeywords})`;
+
     function netStack(element, options) {
         if (typeof document !== 'undefined') {
             if (typeof element === 'string') {
@@ -100,7 +104,7 @@
                 repl: null
             },
             {
-                find: new RegExp('(\\s)' + at_language + ' ([^-:]*?)\\((.*?)\\)', 'g'),
+                find: new RegExp('(\\s)' + at_language + ' ' + preventSQL + '([^-:)]*?)\\((.*?)\\)', 'g'),
                 repl: null
             }
         ];
@@ -141,19 +145,19 @@
 
     netStack.prototype.init = function() {
         // Get the stacktrace, sanitize it, and split it into lines
-        var stacktrace = this.element.textContent,
+        var stacktrace = this.element.textContent.trim(), // trim empty spaces and lines before and after stacktrace
             sanitizedStack = stacktrace.replace(/</g, '&lt;').replace(/>/g, '&gt;'),
             lines = sanitizedStack.split('\n'),
             lang = '',
             clone = '';
 
-        var languagesRegex = { 
-            english: /\s+at .*?\)/g,
-            danish: /\s+ved .*?\)/g,
-            german: /\s+bei .*?\)/g,
-            spanish: /\s+en .*?\)/g,
-            russian: /\s+в .*?\)/g,
-            chinese: /\s+在 .*?\)/g
+        const languagesRegex = {
+            english: new RegExp(`\\s+at ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g"),
+            danish:  new RegExp(`\\s+ved ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g"),
+            german:  new RegExp(`\\s+bei ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g"),
+            spanish: new RegExp(`\\s+en ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g"),
+            russian: new RegExp(`\\s+в ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g"),
+            chinese: new RegExp(`\\s+在 ${preventSQL}([^-:)]*?)\\(.*?\\)`, "g")
         };
 
         // look for the language(s) in the stack trace
@@ -213,9 +217,8 @@
             }
 
             if (hli.test(lines[i])) {
-                
                 // Frame
-                var regFrame = new RegExp('(\\S*)' + languageSet.at + ' .*?\\)'),
+                var regFrame = new RegExp('(\\S*)' + languageSet.at + ' ' + preventSQL + '[^-:)]*?\\(.*?\\)'),
                     partsFrame = String(regFrame.exec(lines[i]));
 
                 if (partsFrame.substring(partsFrame.length - 1) == ',') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netstack.js",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "A simple and easy JavaScript library for highlighting .NET stack traces",
   "main": "netstack.js",
   "scripts": {