mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-11 08:41:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing content-type issue

Browse source
This commit is contained in:
bwhitn 2018-12-01 11:41:14 -05:00
parent 72111cd2bb
commit 78ba4d4fd3
1 changed files with 51 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/core/lib/Mime.mjs
View file

@ -83,9 +83,14 @@ class Mime {
*/ */
_walkMime(parentObj) { _walkMime(parentObj) {
let new_line_length = this.rn ? 2 : 1; let new_line_length = this.rn ? 2 : 1;
let contType = null, fileName = null, charEnc = null, contDispoObj = null; let contType = null,
fileName = null,
charEnc = null,
contDispoObj = null,
contTypeObj = null;
if (parentObj.header.hasOwnProperty("content-type")) { if (parentObj.header.hasOwnProperty("content-type")) {
let contTypeObj = Mime._decodeComplexField(parentObj.header["content-type"][0]); contTypeObj = Mime._decodeComplexField(parentObj.header["content-type"][0]);
}
if (parentObj.header.hasOwnProperty("content-disposition")) { if (parentObj.header.hasOwnProperty("content-disposition")) {
contDispoObj = Mime._decodeComplexField(parentObj.header["content-disposition"][0]) contDispoObj = Mime._decodeComplexField(parentObj.header["content-disposition"][0])
if (contDispoObj != null && contDispoObj.hasOwnProperty("filename")) { if (contDispoObj != null && contDispoObj.hasOwnProperty("filename")) {
@ -102,6 +107,9 @@ class Mime {
if (fileName == null && contTypeObj.hasOwnProperty("name")) { if (fileName == null && contTypeObj.hasOwnProperty("name")) {
fileName = contTypeObj.name; fileName = contTypeObj.name;
} }
} else {
contType = "text/plain";
charEnc = "us-ascii";
} }
if (contType.startsWith("multipart/")) { if (contType.startsWith("multipart/")) {
let output_sections = []; let output_sections = [];
@ -128,8 +136,6 @@ class Mime {
} }
return [{type: contType, data: parentObj.body, name: fileName}]; return [{type: contType, data: parentObj.body, name: fileName}];
} }
throw new OperationError("Invalid Mime section");
}
/** /**
* Takes a string and decodes quoted words inside them * Takes a string and decodes quoted words inside them
@ -193,22 +199,6 @@ class Mime {
break; break;
case "quoted-printable": case "quoted-printable":
input = Utils.byteArrayToUtf8(decodeQuotedPrintable(input)); input = Utils.byteArrayToUtf8(decodeQuotedPrintable(input));
break;
case "x-uuencode":
//TODO: need to trim before and after;
let match = /^\s*begin[^\n]+\n(.*)\r?\n`\r?\nend\s*$/gs.exec(input);
let lineReg = /\r?\n?.(.*)$/gm;
let line = null;
let lines = [];
while ((line = lineReg.exec(match[1]))) {
lines.push(fromBase64(line[1], " -_"));
}
if (match) {
input = lines.join("");
} else {
throw new OperationError("Invalid uuencoding");
}
break;
} }
if (charEnc && MIME_FORMAT.hasOwnProperty(charEnc.toLowerCase())) { if (charEnc && MIME_FORMAT.hasOwnProperty(charEnc.toLowerCase())) {
input = cptable.utils.decode(MIME_FORMAT[charEnc.toLowerCase()], input); input = cptable.utils.decode(MIME_FORMAT[charEnc.toLowerCase()], input);