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

Add tests and handle decompress returning string or array

Browse source
This commit is contained in:
Matt C 2022-09-19 17:33:55 +01:00
parent d502dd9857
commit 98a70c2dd2
3 changed files with 65 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/operations/LZMACompress.mjs
View file

@ -8,6 +8,7 @@ import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs";
import { compress } from "@blu3r4y/lzma";
import {isWorkerEnvironment} from "../Utils.mjs";
/**
* LZMA Compress operation
@ -43,7 +44,7 @@ class LZMACompress extends Operation {
* @param {Object[]} args
* @returns {ArrayBuffer}
*/
run(input, args) {
async run(input, args) {
const mode = Number(args[0]);
return new Promise((resolve, reject) => {
compress(new Uint8Array(input), mode, (result, error) => {
@ -53,7 +54,7 @@ class LZMACompress extends Operation {
// The compression returns as an Int8Array, but we can just get the unsigned data from the buffer
resolve(new Int8Array(result).buffer);
}, (percent) => {
self.sendStatusMessage(`Compressing input: ${(percent*100).toFixed(2)}%`);
if (isWorkerEnvironment()) self.sendStatusMessage(`Compressing input: ${(percent*100).toFixed(2)}%`);
});
});
}

14
src/core/operations/LZMADecompress.mjs
View file

@ -7,6 +7,7 @@
import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs";
import {decompress} from "@blu3r4y/lzma";
import Utils, {isWorkerEnvironment} from "../Utils.mjs";
/**
* LZMA Decompress operation
@ -32,16 +33,21 @@ class LZMADecompress extends Operation {
* @param {Object[]} args
* @returns {ArrayBuffer}
*/
run(input, args) {
async run(input, args) {
return new Promise((resolve, reject) => {
decompress(new Uint8Array(input), (result, error) => {
if (error) {
reject(new OperationError(`Failed to decompress input: ${error.message}`));
}
// The decompression returns as an Int8Array, but we can just get the unsigned data from the buffer
resolve(new Int8Array(result).buffer);
// The decompression returns either a String or an untyped unsigned int8 array, but we can just get the unsigned data from the buffer
if (typeof result == "string") {
resolve(Utils.strToArrayBuffer(result));
} else {
resolve(new Int8Array(result).buffer);
}
}, (percent) => {
self.sendStatusMessage(`Decompressing input: ${(percent*100).toFixed(2)}%`);
if (isWorkerEnvironment()) self.sendStatusMessage(`Decompressing input: ${(percent*100).toFixed(2)}%`);
});
});
}