diff --git a/package-lock.json b/package-lock.json index f14aa3a3..127d5481 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "geodesy": "1.1.3", "highlight.js": "^11.7.0", "jimp": "^0.16.13", - "jquery": "3.6.3", + "jquery": "3.6.4", "js-crc": "^0.2.0", "js-sha3": "^0.8.0", "jsesc": "^3.0.2", @@ -58,7 +58,7 @@ "lodash": "^4.17.21", "loglevel": "^1.8.1", "loglevel-message-prefix": "^3.0.0", - "lz-string": "^1.4.4", + "lz-string": "^1.5.0", "lz4js": "^0.2.0", "markdown-it": "^13.0.1", "moment": "^2.29.4", @@ -84,7 +84,7 @@ "ssdeep.js": "0.0.3", "stream-browserify": "^3.0.0", "tesseract.js": "3.0.3", - "ua-parser-js": "^1.0.33", + "ua-parser-js": "^1.0.34", "unorm": "^1.6.0", "utf8": "^3.0.0", "vkbeautify": "^0.99.3", @@ -104,7 +104,7 @@ "@codemirror/language": "^6.6.0", "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", - "@codemirror/view": "^6.9.1", + "@codemirror/view": "^6.9.2", "autoprefixer": "^10.4.13", "babel-loader": "^9.1.2", "babel-plugin-dynamic-import-node": "^2.3.3", @@ -129,17 +129,17 @@ "grunt-zip": "^0.20.0", "html-webpack-plugin": "^5.5.0", "imports-loader": "^4.0.1", - "mini-css-extract-plugin": "2.7.2", + "mini-css-extract-plugin": "2.7.3", "modify-source-webpack-plugin": "^3.0.0", - "nightwatch": "^2.6.15", + "nightwatch": "^2.6.16", "postcss": "^8.4.21", "postcss-css-variables": "^0.18.0", "postcss-import": "^15.1.0", "postcss-loader": "^7.0.2", "prompt": "^1.3.0", "sitemap": "^7.1.1", - "terser": "^5.16.5", - "webpack": "^5.75.0", + "terser": "^5.16.6", + "webpack": "^5.76.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-dev-server": "4.11.1", "webpack-node-externals": "^3.0.0", @@ -1884,9 +1884,9 @@ "dev": true }, "node_modules/@codemirror/view": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", - "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.2.tgz", + "integrity": "sha512-ci0r/v6aKOSlzOs7/STMTYP3jX/+YMq2dAfAJcLIB6uom4ThtrUlzeuS7GTRGNqJJ+qAJR1vGWfXgu4CO/0myQ==", "dev": true, "dependencies": { "@codemirror/state": "^6.1.4", @@ -8644,9 +8644,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "node_modules/jquery": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", - "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", + "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" }, "node_modules/js-crc": { "version": "0.2.0", @@ -9359,8 +9359,9 @@ } }, "node_modules/lz-string": { - "version": "1.4.4", - "license": "WTFPL", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "bin": { "lz-string": "bin/bin.js" } @@ -9558,9 +9559,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.3.tgz", + "integrity": "sha512-CD9cXeKeXLcnMw8FZdtfrRrLaM7gwCl4nKuKn2YkY2Bw5wdlB8zU2cCzw+w2zS9RFvbrufTBkMCJACNPwqQA0w==", "dev": true, "dependencies": { "schema-utils": "^4.0.0" @@ -9914,9 +9915,9 @@ } }, "node_modules/nightwatch": { - "version": "2.6.15", - "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-2.6.15.tgz", - "integrity": "sha512-mZFtts5RIdlVQbYy/LOWSD+qdwc9sRCyVIe4A1ijftO7Zr3QaobPPtW2gIRnP6gcWT0UvLPUk2IGheo9HZL0Rw==", + "version": "2.6.16", + "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-2.6.16.tgz", + "integrity": "sha512-U24L11WQlYS6TYdGx1h+xMfxw3jjhmoOjYEIBV3WQNwuWqpWzwIaG0gr3WonCwiEgKvSquLSuXhm5vd1U3JdiQ==", "dev": true, "dependencies": { "@nightwatch/chai": "5.0.2", @@ -12407,9 +12408,9 @@ } }, "node_modules/terser": { - "version": "5.16.5", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz", - "integrity": "sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz", + "integrity": "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -12758,9 +12759,9 @@ } }, "node_modules/ua-parser-js": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz", - "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==", + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.34.tgz", + "integrity": "sha512-K9mwJm/DaB6mRLZfw6q8IMXipcrmuT6yfhYmwhAkuh+81sChuYstYA+znlgaflUPaYUa3odxKPKGw6Vw/lANew==", "funding": [ { "type": "opencollective", @@ -13086,9 +13087,9 @@ "license": "BSD-2-Clause" }, "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -15030,9 +15031,9 @@ "dev": true }, "@codemirror/view": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", - "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.2.tgz", + "integrity": "sha512-ci0r/v6aKOSlzOs7/STMTYP3jX/+YMq2dAfAJcLIB6uom4ThtrUlzeuS7GTRGNqJJ+qAJR1vGWfXgu4CO/0myQ==", "dev": true, "requires": { "@codemirror/state": "^6.1.4", @@ -19645,9 +19646,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "jquery": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", - "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", + "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" }, "js-crc": { "version": "0.2.0" @@ -20192,7 +20193,9 @@ } }, "lz-string": { - "version": "1.4.4" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==" }, "lz4js": { "version": "0.2.0", @@ -20317,9 +20320,9 @@ } }, "mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.3.tgz", + "integrity": "sha512-CD9cXeKeXLcnMw8FZdtfrRrLaM7gwCl4nKuKn2YkY2Bw5wdlB8zU2cCzw+w2zS9RFvbrufTBkMCJACNPwqQA0w==", "dev": true, "requires": { "schema-utils": "^4.0.0" @@ -20552,9 +20555,9 @@ "version": "0.6.3" }, "nightwatch": { - "version": "2.6.15", - "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-2.6.15.tgz", - "integrity": "sha512-mZFtts5RIdlVQbYy/LOWSD+qdwc9sRCyVIe4A1ijftO7Zr3QaobPPtW2gIRnP6gcWT0UvLPUk2IGheo9HZL0Rw==", + "version": "2.6.16", + "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-2.6.16.tgz", + "integrity": "sha512-U24L11WQlYS6TYdGx1h+xMfxw3jjhmoOjYEIBV3WQNwuWqpWzwIaG0gr3WonCwiEgKvSquLSuXhm5vd1U3JdiQ==", "dev": true, "requires": { "@nightwatch/chai": "5.0.2", @@ -22239,9 +22242,9 @@ } }, "terser": { - "version": "5.16.5", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz", - "integrity": "sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz", + "integrity": "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -22489,9 +22492,9 @@ } }, "ua-parser-js": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz", - "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==" + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.34.tgz", + "integrity": "sha512-K9mwJm/DaB6mRLZfw6q8IMXipcrmuT6yfhYmwhAkuh+81sChuYstYA+znlgaflUPaYUa3odxKPKGw6Vw/lANew==" }, "uc.micro": { "version": "1.0.6" @@ -22713,9 +22716,9 @@ "version": "3.0.1" }, "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", diff --git a/package.json b/package.json index 0c57154a..c0d7949a 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@codemirror/language": "^6.6.0", "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", - "@codemirror/view": "^6.9.1", + "@codemirror/view": "^6.9.2", "autoprefixer": "^10.4.13", "babel-loader": "^9.1.2", "babel-plugin-dynamic-import-node": "^2.3.3", @@ -74,17 +74,17 @@ "grunt-zip": "^0.20.0", "html-webpack-plugin": "^5.5.0", "imports-loader": "^4.0.1", - "mini-css-extract-plugin": "2.7.2", + "mini-css-extract-plugin": "2.7.3", "modify-source-webpack-plugin": "^3.0.0", - "nightwatch": "^2.6.15", + "nightwatch": "^2.6.16", "postcss": "^8.4.21", "postcss-css-variables": "^0.18.0", "postcss-import": "^15.1.0", "postcss-loader": "^7.0.2", "prompt": "^1.3.0", "sitemap": "^7.1.1", - "terser": "^5.16.5", - "webpack": "^5.75.0", + "terser": "^5.16.6", + "webpack": "^5.76.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-dev-server": "4.11.1", "webpack-node-externals": "^3.0.0", @@ -124,7 +124,7 @@ "geodesy": "1.1.3", "highlight.js": "^11.7.0", "jimp": "^0.16.13", - "jquery": "3.6.3", + "jquery": "3.6.4", "js-crc": "^0.2.0", "js-sha3": "^0.8.0", "jsesc": "^3.0.2", @@ -139,7 +139,7 @@ "lodash": "^4.17.21", "loglevel": "^1.8.1", "loglevel-message-prefix": "^3.0.0", - "lz-string": "^1.4.4", + "lz-string": "^1.5.0", "lz4js": "^0.2.0", "markdown-it": "^13.0.1", "moment": "^2.29.4", @@ -165,7 +165,7 @@ "ssdeep.js": "0.0.3", "stream-browserify": "^3.0.0", "tesseract.js": "3.0.3", - "ua-parser-js": "^1.0.33", + "ua-parser-js": "^1.0.34", "unorm": "^1.6.0", "utf8": "^3.0.0", "vkbeautify": "^0.99.3", diff --git a/src/core/Utils.mjs b/src/core/Utils.mjs index 43b4ec67..14aaa8f4 100755 --- a/src/core/Utils.mjs +++ b/src/core/Utils.mjs @@ -827,7 +827,7 @@ class Utils { htmlStr = recursiveRemove(/]*>.*?<\/script[^>]*>/gi, htmlStr); htmlStr = recursiveRemove(/]*>.*?<\/style[^>]*>/gi, htmlStr); } - return htmlStr.replace(/<[^>]+>/g, ""); + return recursiveRemove(/<[^>]+>/g, htmlStr); } diff --git a/src/core/operations/PLISTViewer.mjs b/src/core/operations/PLISTViewer.mjs index 67a42359..9b4aada4 100644 --- a/src/core/operations/PLISTViewer.mjs +++ b/src/core/operations/PLISTViewer.mjs @@ -48,7 +48,7 @@ class PlistViewer extends Operation { .replace(//g, m => "true") .replace(/<\/plist>/g, "/plist") .replace(/.+<\/date>/g, m => `${m.slice(6, m.indexOf(/<\/integer>/g)-6)}`) - .replace(/(\s|.)+?<\/data>/g, m => `${m.slice(6, m.indexOf(/<\/data>/g)-6)}`) + .replace(/[\s\S]+?<\/data>/g, m => `${m.slice(6, m.indexOf(/<\/data>/g)-6)}`) .replace(/[ \t\r\f\v]/g, ""); /** diff --git a/src/core/vendor/gost/gostCoding.mjs b/src/core/vendor/gost/gostCoding.mjs index 758ff22a..ed42b3cc 100644 --- a/src/core/vendor/gost/gostCoding.mjs +++ b/src/core/vendor/gost/gostCoding.mjs @@ -311,7 +311,7 @@ var Hex = {// * @returns {CryptoOperationData} Decoded binary data */ decode: function (s, endean) { - s = s.replace(/[^A-fa-f0-9]/g, ''); + s = s.replace(/[^A-Fa-f0-9]/g, ''); var n = Math.ceil(s.length / 2), r = new Uint8Array(n); s = (s.length % 2 > 0 ? '0' : '') + s; if (endean && ((typeof endean !== 'string') || @@ -370,7 +370,7 @@ var Int16 = {// * @returns {CryptoOperationData} Decoded binary data */ decode: function (s) { - s = (s || '').replace(/[^\-A-fa-f0-9]/g, ''); + s = (s || '').replace(/[^\-A-Fa-f0-9]/g, ''); if (s.length === 0) s = '0'; // Signature diff --git a/src/web/HTMLCategory.mjs b/src/web/HTMLCategory.mjs index 95b8a4df..0414fd71 100755 --- a/src/web/HTMLCategory.mjs +++ b/src/web/HTMLCategory.mjs @@ -38,7 +38,7 @@ class HTMLCategory { * @returns {string} */ toHtml() { - const catName = "cat" + this.name.replace(/[\s/-:_]/g, ""); + const catName = "cat" + this.name.replace(/[\s/\-:_]/g, ""); let html = `