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

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

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

@ -83,53 +83,59 @@ 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")) {
contDispoObj = Mime._decodeComplexField(parentObj.header["content-disposition"][0])
if (contDispoObj != null && contDispoObj.hasOwnProperty("filename")) {
fileName = contDispoObj.filename;
}
}
if (contTypeObj != null) {
if (contTypeObj.hasOwnProperty("value")) {
contType = contTypeObj.value[0];
}
if (contTypeObj.hasOwnProperty("charset")) {
charEnc = contTypeObj.charset;
}
if (fileName == null && contTypeObj.hasOwnProperty("name")) {
fileName = contTypeObj.name;
}
}
if (contType.startsWith("multipart/")) {
let output_sections = [];
if (!contTypeObj.hasOwnProperty("boundary")) {
throw new OperationError("Invalid mulitpart section no boundary");
}
let mime_parts = this._splitMultipart(parentObj.body, contTypeObj.boundary, new_line_length);
mime_parts.forEach(function(mime_part){
let mimeObj = Mime._splitParseHead(mime_part);
if (!mimeObj.body) {
return [];
}
this._walkMime(mimeObj).forEach(function(part){
output_sections.push(part);
}, this);
}, this);
return output_sections;
}
if (parentObj.header.hasOwnProperty("content-transfer-encoding")) {
let contEncObj = Mime._decodeComplexField(parentObj.header["content-transfer-encoding"][0]);
if (contEncObj != null && contEncObj.hasOwnProperty("value")) {
parentObj.body = Mime._decodeMimeData(parentObj.body, charEnc, contEncObj.value[0]);
}
}
return [{type: contType, data: parentObj.body, name: fileName}];
} }
throw new OperationError("Invalid Mime section"); if (parentObj.header.hasOwnProperty("content-disposition")) {
} contDispoObj = Mime._decodeComplexField(parentObj.header["content-disposition"][0])
if (contDispoObj != null && contDispoObj.hasOwnProperty("filename")) {
fileName = contDispoObj.filename;
}
}
if (contTypeObj != null) {
if (contTypeObj.hasOwnProperty("value")) {
contType = contTypeObj.value[0];
}
if (contTypeObj.hasOwnProperty("charset")) {
charEnc = contTypeObj.charset;
}
if (fileName == null && contTypeObj.hasOwnProperty("name")) {
fileName = contTypeObj.name;
}
} else {
contType = "text/plain";
charEnc = "us-ascii";
}
if (contType.startsWith("multipart/")) {
let output_sections = [];
if (!contTypeObj.hasOwnProperty("boundary")) {
throw new OperationError("Invalid mulitpart section no boundary");
}
let mime_parts = this._splitMultipart(parentObj.body, contTypeObj.boundary, new_line_length);
mime_parts.forEach(function(mime_part){
let mimeObj = Mime._splitParseHead(mime_part);
if (!mimeObj.body) {
return [];
}
this._walkMime(mimeObj).forEach(function(part){
output_sections.push(part);
}, this);
}, this);
return output_sections;
}
if (parentObj.header.hasOwnProperty("content-transfer-encoding")) {
let contEncObj = Mime._decodeComplexField(parentObj.header["content-transfer-encoding"][0]);
if (contEncObj != null && contEncObj.hasOwnProperty("value")) {
parentObj.body = Mime._decodeMimeData(parentObj.body, charEnc, contEncObj.value[0]);
}
}
return [{type: contType, data: parentObj.body, name: fileName}];
}
/** /**
* 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);