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

Fixed spelling errors, syntax errors, and improved the test for script decoding

Browse source
This commit is contained in:
bwhitn 2017-08-29 10:46:34 -07:00
parent 0fc2a219a7
commit 934ed1af09
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/operations/MS.js
View file

@ -1,5 +1,5 @@
/**
* Decodes Microsft Encoded Script files that can be read and executed by cscript.exe/wscript.exe.
* Decodes Microsoft Encoded Script files that can be read and executed by cscript.exe/wscript.exe.
* This is a conversion of a Python script that was originally created by Didier Stevens (https://DidierStevens.com).
*
* @author bmwhitn [brian.m.whitney@outlook.com]
@ -215,17 +215,18 @@ const MS = {
],
/**
* @private
* @param {string} data
* @returns {string}
*/
decode: function (data) {
_decode: function (data) {
let result = [];
let index = -1;
data = data.replace(/@&/g, String.fromCharCode(10));
data = data.replace(/@#/g, String.fromCharCode(13));
data = data.replace(/@\*/g, ">");
data = data.replace(/@!/g, "<");
data = data.replace(/@\$/g, "@");
data = data.replace(/@&/g, String.fromCharCode(10))
.replace(/@#/g, String.fromCharCode(13))
.replace(/@\*/g, ">")
.replace(/@!/g, "<")
.replace(/@\$/g, "@");
for (let i = 0; i < data.length; i++) {
let byte = data.charCodeAt(i);
let char = data.charAt(i);
@ -241,15 +242,17 @@ const MS = {
},
/**
* Microsoft Script Decoder operation
*
* @param {string} input
* @param {Object[]} args
* @returns {string}
*/
runDecodeScript: function (input, args) {
let matcher = /#@~\^......==(.+)......==\^#~@/;
let matcher = /#@~\^.{6}==(.+).{6}==\^#~@/;
let encodedData = matcher.exec(input);
if (encodedData){
return MS.decode(encodedData[1]);
return MS._decode(encodedData[1]);
} else {
return "";
}