Skip to content

Added support for lacking content-disposition and lacking filename #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for lacking content-disposition and lacking filename #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,13 @@ Now, having this two key values then you can implement it:
var boundary = "----WebKitFormBoundaryDtbT5UpPj83kllfw";
var parts = multipart.Parse(body,boundary);

for(var i=0;i<parts.length;i++){
for(let part of parts){
var part = parts[i];
// will be:
// { filename: 'A.txt', type: 'text/plain',
// { name: 'userfile', filename: 'A.txt', type: 'text/plain',
// data: <Buffer 41 41 41 41 42 42 42 42> }
// In the event of multiple files with the same "name" attribute, a part will be an array of files. Such as during a multi file upload.
// If no filename is supplied it will be ignored, if no name is supplied it will be null
}
```

Expand Down
90 changes: 64 additions & 26 deletions multipart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,66 @@
var parts = multipart.Parse(body,boundary);

// each part is:
// { filename: 'A.txt', type: 'text/plain', data: <Buffer 41 41 41 41 42 42 42 42> }
// [ 'userfile': { filename: 'A.txt', name:'userfile', type: 'text/plain', data: <Buffer 41 41 41 41 42 42 42 42> } ]

author: Cristian Salazar ([email protected]) www.chileshift.cl
Twitter: @AmazonAwsChile
*/
exports.Parse = function(multipartBodyBuffer,boundary){
var process = function(part){
// will transform this object:
// { header: 'Content-Disposition: form-data; name="uploads[]"; filename="A.txt"',
// info: 'Content-Type: text/plain',
// { headers: [
// 'Content-Disposition: form-data; name="uploads[]"; filename="A.txt"',
// 'Content-Type: text/plain'
// ]
// part: 'AAAABBBB' }
// into this one:
// { filename: 'A.txt', type: 'text/plain', data: <Buffer 41 41 41 41 42 42 42 42> }
var obj = function(str){
var k = str.split('=');
var a = k[0].trim();
var b = JSON.parse(k[1].trim());
var o = {};
Object.defineProperty( o , a ,
{ value: b, writable: true, enumerable: true, configurable: true })
return o;
// into this one: ( Assumed the return value? )
// { filename: 'A.txt', name: 'userfile', type: 'text/plain', data: <Buffer 41 41 41 41 42 42 42 42> }
let file = {
data: new Buffer(part.part),
name: null,
};

//Content-Disposition: form-data; name="uploads[]"; filename="A.txt"
// Process our headers
for (let header of part.headers) {
if (header == '') continue;
let ex = header.split(":");

switch (ex[0].toLowerCase()) {
case 'content-type':
file.type = ex[1].trim();
break;
case 'content-id':
file.id = ex[1].trim();
break;
case 'content-disposition':
ex.splice(0,1); // Remove the header field name.
for (let param of ex[0].split(" ")) {
// Trim the ; if its there.
if (param.substr(-1) == ";") {
param = param.substr(0,param.length-1);
}
let pex = param.split("=");
if (pex[0].toLowerCase() == "name") {
pex.splice(0,1);
file.name = pex.join("=").trim().replace(/"/g,'');
} else if (pex[0].toLowerCase() == "filename") {
pex.splice(0,1);
file.filename = pex.join("=").trim().replace(/"/g,'');
}
}
break;
}
}
var header = part.header.split(';');
var file = obj(header[2]);
var contentType = part.info.split(':')[1].trim();
Object.defineProperty( file , 'type' ,
{ value: contentType, writable: true, enumerable: true, configurable: true })
Object.defineProperty( file , 'data' ,
{ value: new Buffer(part.part), writable: true, enumerable: true, configurable: true })

return file;
}

var prev = null;
var lastline='';
var header = '';
var info = ''; var state=0; var buffer=[];
var headers = [];
var state=0; var buffer=[];
var allParts = [];

for(i=0;i<multipartBodyBuffer.length;i++){
Expand All @@ -64,12 +89,12 @@ exports.Parse = function(multipartBodyBuffer,boundary){
lastline='';
}else
if((1 == state) && newLineDetected){
header = lastline;
headers.push(lastline.trim());
state=2;
lastline='';
}else
if((2 == state) && newLineDetected){
info = lastline;
headers.push(lastline.trim());
state=3;
lastline='';
}else
Expand All @@ -83,7 +108,7 @@ exports.Parse = function(multipartBodyBuffer,boundary){
if(((("--"+boundary) == lastline))){
var j = buffer.length - lastline.length;
var part = buffer.slice(0,j-1);
var p = { header : header , info : info , part : part };
var p = { headers: headers, part: part };
allParts.push(process(p));
buffer = []; lastline=''; state=5; header=''; info='';
}else{
Expand All @@ -96,13 +121,26 @@ exports.Parse = function(multipartBodyBuffer,boundary){
state=1;
}
}
return allParts;

let parts = {};
for (let part of allParts) {
if (!parts[part.name]) {
parts[part.name] = part;
} else {
parts[part.name] = [ parts[part.name] ];
parts[part.name].push(part);
}
}

return parts;
};

// read the boundary from the content-type header sent by the http client
// this value may be similar to:
// 'multipart/form-data; boundary=----WebKitFormBoundaryvm5A9tzU1ONaGP5B',
exports.getBoundary = function(header){
// Just incase someone just wants to throw the headers our way.
if (header['content-type']) header = header['content-type'];
var items = header.split(';');
if(items)
for(i=0;i<items.length;i++){
Expand Down