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

Added maxLength property for string arguments

Browse source
This commit is contained in:
n1474335 2022-11-25 16:11:14 +00:00
parent 157346b055
commit 320f79fe0d
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/operations/FromBase85.mjs
View file

@ -7,7 +7,7 @@
import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs";
import Utils from "../Utils.mjs";
import {alphabetName, ALPHABET_OPTIONS} from "../lib/Base85.mjs";
import {ALPHABET_OPTIONS} from "../lib/Base85.mjs";
/**
* From Base85 operation
@ -40,8 +40,9 @@ class FromBase85 extends Operation {
{
name: "All-zero group char",
type: "binaryShortString",
value: "z"
},
value: "z",
maxLength: 1
}
];
this.checks = [
{
@ -81,9 +82,8 @@ class FromBase85 extends Operation {
*/
run(input, args) {
const alphabet = Utils.expandAlphRange(args[0]).join(""),
encoding = alphabetName(alphabet),
removeNonAlphChars = args[1],
allZeroGroupChar = args[2],
allZeroGroupChar = typeof args[2] === "string" ? args[2].slice(0, 1) : "",
result = [];
if (alphabet.length !== 85 ||
@ -91,6 +91,10 @@ class FromBase85 extends Operation {
throw new OperationError("Alphabet must be of length 85");
}
if (allZeroGroupChar && alphabet.includes(allZeroGroupChar)) {
throw new OperationError("The all-zero group char cannot appear in the alphabet");
}
// Remove delimiters if present
const matches = input.match(/^<~(.+?)~>$/);
if (matches !== null) input = matches[1];
@ -109,7 +113,7 @@ class FromBase85 extends Operation {
let i = 0;
let block, blockBytes;
while (i < input.length) {
if (encoding === "Standard" && input[i] === allZeroGroupChar) {
if (input[i] === allZeroGroupChar) {
result.push(0, 0, 0, 0);
i++;
} else {