mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 07:16:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-translatedatetimeformat-xss' of https://github.com/mikecat/CyberChef into v10

Browse source
This commit is contained in:
n1474335 2023-03-17 18:12:50 +00:00
commit 4c7fe147bc
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core/operations/TranslateDateTimeFormat.mjs
View file

@ -5,6 +5,7 @@
*/ */
import Operation from "../Operation.mjs"; import Operation from "../Operation.mjs";
import Utils from "../Utils.mjs";
import moment from "moment-timezone"; import moment from "moment-timezone";
import {DATETIME_FORMATS, FORMAT_EXAMPLES} from "../lib/DateTime.mjs"; import {DATETIME_FORMATS, FORMAT_EXAMPLES} from "../lib/DateTime.mjs";
@ -24,7 +25,8 @@ class TranslateDateTimeFormat extends Operation {
this.description = "Parses a datetime string in one format and re-writes it in another.<br><br>Run with no input to see the relevant format string examples."; this.description = "Parses a datetime string in one format and re-writes it in another.<br><br>Run with no input to see the relevant format string examples.";
this.infoURL = "https://momentjs.com/docs/#/parsing/string-format/"; this.infoURL = "https://momentjs.com/docs/#/parsing/string-format/";
this.inputType = "string"; this.inputType = "string";
this.outputType = "html"; this.outputType = "string";
this.presentType = "html";
this.args = [ this.args = [
{ {
"name": "Built in formats", "name": "Built in formats",
@ -53,12 +55,14 @@ class TranslateDateTimeFormat extends Operation {
"value": ["UTC"].concat(moment.tz.names()) "value": ["UTC"].concat(moment.tz.names())
} }
]; ];
this.invalidFormatMessage = "Invalid format.";
} }
/** /**
* @param {string} input * @param {string} input
* @param {Object[]} args * @param {Object[]} args
* @returns {html} * @returns {string}
*/ */
run(input, args) { run(input, args) {
const [inputFormat, inputTimezone, outputFormat, outputTimezone] = args.slice(1); const [inputFormat, inputTimezone, outputFormat, outputTimezone] = args.slice(1);
@ -68,12 +72,22 @@ class TranslateDateTimeFormat extends Operation {
date = moment.tz(input, inputFormat, inputTimezone); date = moment.tz(input, inputFormat, inputTimezone);
if (!date || date.format() === "Invalid date") throw Error; if (!date || date.format() === "Invalid date") throw Error;
} catch (err) { } catch (err) {
return `Invalid format.\n\n${FORMAT_EXAMPLES}`; return this.invalidFormatMessage;
} }
return date.tz(outputTimezone).format(outputFormat.replace(/[<>]/g, "")); return date.tz(outputTimezone).format(outputFormat.replace(/[<>]/g, ""));
} }
/**
* @param {string} data
* @returns {html}
*/
present(data) {
if (data === this.invalidFormatMessage) {
return `${data}\n\n${FORMAT_EXAMPLES}`;
}
return Utils.escapeHtml(data);
}
} }
export default TranslateDateTimeFormat; export default TranslateDateTimeFormat;