Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 14:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AlexAndHisScripts/CyberChef into AlexAndHisScripts-master

Browse Source
This commit is contained in:
n1474335 2022-03-28 17:14:57 +01:00
commit f3c83b2009
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/lib/Charts.mjs
View File

@ -6,6 +6,7 @@
*/ */
import OperationError from "../errors/OperationError.mjs"; import OperationError from "../errors/OperationError.mjs";
import Utils from "../Utils.mjs";
/** /**
* @constant * @constant
@ -128,7 +129,7 @@ export function getScatterValuesWithColour(input, recordDelimiter, fieldDelimite
if (Number.isNaN(x)) throw new OperationError("Values must be numbers in base 10."); if (Number.isNaN(x)) throw new OperationError("Values must be numbers in base 10.");
if (Number.isNaN(y)) throw new OperationError("Values must be numbers in base 10."); if (Number.isNaN(y)) throw new OperationError("Values must be numbers in base 10.");
return [x, y, colour]; return [x, y, Utils.escapeHtml(colour)];
}); });
return { headings, values }; return { headings, values };

2
src/core/operations/ScatterChart.mjs
View File

@ -87,7 +87,7 @@ class ScatterChart extends Operation {
const recordDelimiter = Utils.charRep(args[0]), const recordDelimiter = Utils.charRep(args[0]),
fieldDelimiter = Utils.charRep(args[1]), fieldDelimiter = Utils.charRep(args[1]),
columnHeadingsAreIncluded = args[2], columnHeadingsAreIncluded = args[2],
fillColour = args[5], fillColour = Utils.escapeHtml(args[5]),
radius = args[6], radius = args[6],
colourInInput = args[7], colourInInput = args[7],
dimension = 500; dimension = 500;

5
src/core/operations/SeriesChart.mjs
View File

@ -72,7 +72,10 @@ class SeriesChart extends Operation {
fieldDelimiter = Utils.charRep(args[1]), fieldDelimiter = Utils.charRep(args[1]),
xLabel = args[2], xLabel = args[2],
pipRadius = args[3], pipRadius = args[3],
seriesColours = args[4].split(","), // Escape HTML from all colours to prevent reflected XSS. See https://github.com/gchq/CyberChef/issues/1265
seriesColours = args[4].split(",").map((colour) => {
return Utils.escapeHtml(colour)
}),
svgWidth = 500, svgWidth = 500,
interSeriesPadding = 20, interSeriesPadding = 20,
xAxisHeight = 50, xAxisHeight = 50,