mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for converting hex characters

Browse source
This commit is contained in:
mshwed 2019-08-28 13:34:03 -04:00 • committed by mshwed
parent 8166f981ae
commit c3994aa8e3
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/core/operations/MIMEDecoding.mjs
View file

@ -7,6 +7,7 @@
import Operation from "../Operation"; import Operation from "../Operation";
import OperationError from "../errors/OperationError"; import OperationError from "../errors/OperationError";
import Utils from "../Utils"; import Utils from "../Utils";
import {fromHex} from "../lib/Hex.mjs";
import { fromBase64 } from "../lib/Base64"; import { fromBase64 } from "../lib/Base64";
/** /**
@ -51,10 +52,6 @@ class MIMEDecoding extends Operation {
let mimeEncodedText = Utils.byteArrayToUtf8(input) let mimeEncodedText = Utils.byteArrayToUtf8(input)
// const encodedWordRegex = /(\=\?)(.*?)(\?\=)/g;
// let encodedWords = mimeEncodedText.match(encodedWordRegex);
let parsedString = ""; let parsedString = "";
let currentPos = 0; let currentPos = 0;
let pastPosition = 0; let pastPosition = 0;
@ -73,7 +70,8 @@ class MIMEDecoding extends Operation {
if (fillerText.indexOf('\n') > 0) console.log('LF detected', fillerText.indexOf('\n')); if (fillerText.indexOf('\n') > 0) console.log('LF detected', fillerText.indexOf('\n'));
if (fillerText.indexOf('\r\n') > 0) console.log('CRLF detected', fillerText.indexOf('\r\n')); if (fillerText.indexOf('\r\n') > 0) console.log('CRLF detected', fillerText.indexOf('\r\n'));
if (fillerText.indexOf('\x20') > 0) console.log('SPACE detected', fillerText.indexOf('\x20')); if (fillerText.indexOf('\x20') > 0) console.log('SPACE detected', fillerText.indexOf('\x20'));
if (fillerText.indexOf('\n\x20') > 0) console.log('newline SPACE detected', fillerText.indexOf('\x20'));
if (fillerText !== '\r\n') if (fillerText !== '\r\n')
parsedString += fillerText parsedString += fillerText
@ -90,20 +88,6 @@ class MIMEDecoding extends Operation {
} }
return parsedString; return parsedString;
// let cleansedWord;
// for (let word of encodedWords) {
// cleansedWord = word.replace('=?', '').replace('?=', '').split('?');
// let charset = cleansedWord[0];
// let encoding = cleansedWord[1];
// let encodedText = cleansedWord[2];
// if (encoding.toLowerCase() === 'b') {
// encodedText = fromBase64(encodedText);
// }
// console.log(cleansedWord);
// }
throw new OperationError("Test"); throw new OperationError("Test");
} }
@ -119,6 +103,14 @@ class MIMEDecoding extends Operation {
encodedText = fromBase64(encodedBlock); encodedText = fromBase64(encodedBlock);
} else { } else {
encodedText = encodedBlock; encodedText = encodedBlock;
let encodedChars = encodedText.indexOf("=");
if (encodedChars > 0) {
let extractedHex = encodedText.substring(encodedChars + 1, encodedChars + 3);
console.log("EXTRACTED HEX", extractedHex)
encodedText = encodedText.replace(`=${extractedHex}`, Utils.byteArrayToChars(fromHex(`=${extractedHex}`)))
}
encodedText = encodedText.replace("_", " ");
} }
return encodedText; return encodedText;