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

Tidied up CR preservation code

Browse source
This commit is contained in:
n1474335 2019-08-22 16:31:21 +01:00
parent c43f829854
commit 9774a4bd26
3 changed files with 64 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/web/html/index.html
View file

@ -563,21 +563,21 @@
<div class="checkbox option-item"> <div class="checkbox option-item">
<label for="imagePreview"> <label for="imagePreview">
<input type="checkbox" option="imagePreview" id="imagePreview"> <input type="checkbox" option="imagePreview" id="imagePreview">
Render a preview of the input if it's detected to be an image. Render a preview of the input if it's detected to be an image
</label> </label>
</div> </div>
<div class="checkbox option-item"> <div class="checkbox option-item">
<label for="syncTabs"> <label for="syncTabs">
<input type="checkbox" option="syncTabs" id="syncTabs"> <input type="checkbox" option="syncTabs" id="syncTabs">
Keep the current tab in sync between the input and output. Keep the current tab in sync between the input and output
</label> </label>
</div> </div>
<div class="checkbox option-item"> <div class="checkbox option-item">
<label for="preserveCR" data-toggle="tooltip" data-placement="right" data-html="true" title="As HTML textareas don't support carriage returns, editing input must be turned off to preserve them.<br><br>When this option is enabled, editing will be disabled when an input with carriage returns is detected to preserve them. Otherwise, editing will remain enabled but carriage returns will not be preserved."> <label for="preserveCR" data-toggle="tooltip" data-placement="right" data-html="true" title="As HTML textareas don't support carriage returns, editing input must be turned off to preserve them.<br><br>When this option is enabled, editing is disabled for pasted text that contains carriage returns. Otherwise, editing will remain enabled but carriage returns will not be preserved.">
<input type="checkbox" option="preserveCR" id="preserveCR"> <input type="checkbox" option="preserveCR" id="preserveCR">
Preserve carriage returns. Preserve carriage returns when pasting an input
</label> </label>
</div> </div>
</div> </div>

101
src/web/waiters/InputWaiter.mjs
View file

@ -728,30 +728,46 @@ class InputWaiter {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const pastedData = e.clipboardData.getData("Text"); const self = this;
const preserve = await this.preserveCarriageReturns(pastedData); /**
* Triggers the input file/binary data overlay
if (pastedData.length < (this.app.options.ioDisplayThreshold * 1024) && !preserve) { *
// Pasting normally fires the inputChange() event before * @param {string} pastedData
// changing the value, so instead change it here ourselves */
// and manually fire inputChange() function triggerOverlay(pastedData) {
const inputText = document.getElementById("input-text");
const selStart = inputText.selectionStart;
const selEnd = inputText.selectionEnd;
const startVal = inputText.value.slice(0, selStart);
const endVal = inputText.value.slice(selEnd);
inputText.value = startVal + pastedData + endVal;
inputText.setSelectionRange(selStart + pastedData.length, selStart + pastedData.length);
this.debounceInputChange(e);
} else {
const file = new File([pastedData], "PastedData", { const file = new File([pastedData], "PastedData", {
type: "text/plain", type: "text/plain",
lastModified: Date.now() lastModified: Date.now()
}); });
this.loadUIFiles([file]); self.loadUIFiles([file]);
}
const pastedData = e.clipboardData.getData("Text");
const inputText = document.getElementById("input-text");
const selStart = inputText.selectionStart;
const selEnd = inputText.selectionEnd;
const startVal = inputText.value.slice(0, selStart);
const endVal = inputText.value.slice(selEnd);
const val = startVal + pastedData + endVal;
if (val.length >= (this.app.options.ioDisplayThreshold * 1024)) {
// Data too large to display, use overlay
triggerOverlay(val);
return false; return false;
} else if (await this.preserveCarriageReturns(val)) {
// Data contains a carriage return and the user doesn't wish to edit it, use overlay
// We check this in a separate condition to make sure it is not run unless absolutely
// necessary.
triggerOverlay(val);
return false;
} else {
// Pasting normally fires the inputChange() event before
// changing the value, so instead change it here ourselves
// and manually fire inputChange()
inputText.value = val;
inputText.setSelectionRange(selStart + pastedData.length, selStart + pastedData.length);
this.debounceInputChange(e);
} }
} }
@ -839,33 +855,34 @@ class InputWaiter {
* preserved, so display an overlay so it can't be edited * preserved, so display an overlay so it can't be edited
*/ */
async preserveCarriageReturns(input) { async preserveCarriageReturns(input) {
if (input.indexOf("\r") >= 0) { if (input.indexOf("\r") < 0) return false;
const optionsStr = "This behaviour can be changed in the <a href='#' onclick='document.getElementById(\"options\").click()'>options</a>";
if (!this.app.options.userSetCR) { const optionsStr = "This behaviour can be changed in the <a href='#' onclick='document.getElementById(\"options\").click()'>Options pane</a>";
let preserve = await new Promise(function(resolve, reject) { if (!this.app.options.userSetCR) {
this.app.confirm( // User has not set a CR preference yet
"Carriage Return Detected", let preserve = await new Promise(function(resolve, reject) {
"A carriage return was detected in your input. As HTML textareas can't display carriage returns, editing must be turned off to preserve them. <br>Alternatively, you can enable editing but your carriage returns will not be preserved.<br><br>This preference will be saved, and can be toggled in the options.", this.app.confirm(
"Preserve Carriage Returns", "Carriage Return Detected",
"Enable Editing", resolve, this); "A <a href='https://wikipedia.org/wiki/Carriage_return'>carriage return</a> (<code>\\r</code>, <code>0x0d</code>) was detected in your input. As HTML textareas <a href='https://html.spec.whatwg.org/multipage/form-elements.html#the-textarea-element'>can't display carriage returns</a>, editing must be turned off to preserve them. <br>Alternatively, you can enable editing but your carriage returns will not be preserved.<br><br>This preference will be saved but can be toggled in the options pane.",
}.bind(this)); "Preserve Carriage Returns",
if (preserve === undefined) { "Enable Editing", resolve, this);
this.app.alert(`Not preserving carriage returns. ${optionsStr}`, 4000); }.bind(this));
preserve = false; if (preserve === undefined) {
} // The confirm pane was closed without picking a specific choice
this.manager.options.updateOption("preserveCR", preserve); this.app.alert(`Not preserving carriage returns.\n${optionsStr}`, 5000);
this.manager.options.updateOption("userSetCR", true); preserve = false;
} else {
if (this.app.options.preserveCR) {
this.app.alert(`A carriage return was detected in your input, so editing has been disabled to preserve it. ${optionsStr}`, 6000);
} else {
this.app.alert(`A carriage return was detected in your input. Editing is remaining enabled, but any carriage returns will be removed. ${optionsStr}`, 6000);
}
} }
return this.app.options.preserveCR; this.manager.options.updateOption("preserveCR", preserve);
this.manager.options.updateOption("userSetCR", true);
} else { } else {
return false; if (this.app.options.preserveCR) {
this.app.alert(`A carriage return (\\r, 0x0d) was detected in your input, so editing has been disabled to preserve it.<br>${optionsStr}`, 10000);
} else {
this.app.alert(`A carriage return (\\r, 0x0d) was detected in your input. Editing is remaining enabled, but carriage returns will not be preserved.<br>${optionsStr}`, 10000);
}
} }
return this.app.options.preserveCR;
} }
/** /**

2
src/web/waiters/OutputWaiter.mjs
View file

@ -546,7 +546,7 @@ class OutputWaiter {
"Cancel zipping", "Cancel zipping",
resolve, this); resolve, this);
}.bind(this)); }.bind(this));
if (!cancel && cancel !== undefined) { if (!cancel) {
this.terminateZipWorker(); this.terminateZipWorker();
} }
} }