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.
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
Allow fully qualified multipart content-type header #1423
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| 'use strict' | ||
|
|
||
| var http = require('http') | ||
| , path = require('path') | ||
| , request = require('../index') | ||
| , fs = require('fs') | ||
| , tape = require('tape') | ||
|
|
||
|
|
||
| var localFile = path.join(__dirname, 'unicycle.jpg') | ||
| var cases = { | ||
| // based on body type | ||
| '+array -stream': { | ||
| options: { | ||
| multipart: [{name: 'field', body: 'value'}] | ||
| }, | ||
| expected: {chunked: false} | ||
| }, | ||
| '+array +stream': { | ||
| options: { | ||
| multipart: [{name: 'file', body: null}] | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
| // encoding overrides body value | ||
| '+array +encoding': { | ||
| options: { | ||
| headers: {'transfer-encoding': 'chunked'}, | ||
| multipart: [{name: 'field', body: 'value'}] | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
|
|
||
| // based on body type | ||
| '+object -stream': { | ||
| options: { | ||
| multipart: {data: [{name: 'field', body: 'value'}]} | ||
| }, | ||
| expected: {chunked: false} | ||
| }, | ||
| '+object +stream': { | ||
| options: { | ||
| multipart: {data: [{name: 'file', body: null}]} | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
| // encoding overrides body value | ||
| '+object +encoding': { | ||
| options: { | ||
| headers: {'transfer-encoding': 'chunked'}, | ||
| multipart: {data: [{name: 'field', body: 'value'}]} | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
|
|
||
| // based on body type | ||
| '+object -chunked -stream': { | ||
| options: { | ||
| multipart: {chunked: false, data: [{name: 'field', body: 'value'}]} | ||
| }, | ||
| expected: {chunked: false} | ||
| }, | ||
| '+object -chunked +stream': { | ||
| options: { | ||
| multipart: {chunked: false, data: [{name: 'file', body: null}]} | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
| // chunked overrides body value | ||
| '+object +chunked -stream': { | ||
| options: { | ||
| multipart: {chunked: true, data: [{name: 'field', body: 'value'}]} | ||
| }, | ||
| expected: {chunked: true} | ||
| }, | ||
| // encoding overrides chunked | ||
| '+object +encoding -chunked': { | ||
| options: { | ||
| headers: {'transfer-encoding': 'chunked'}, | ||
| multipart: {chunked: false, data: [{name: 'field', body: 'value'}]} | ||
| }, | ||
| expected: {chunked: true} | ||
| } | ||
| } | ||
|
|
||
| function runTest(t, test) { | ||
|
|
||
| var server = http.createServer(function(req, res) { | ||
|
|
||
| t.ok(req.headers['content-type'].match(/^multipart\/related; boundary=[^\s;]+$/)) | ||
|
|
||
| if (test.expected.chunked) { | ||
| t.ok(req.headers['transfer-encoding'] === 'chunked') | ||
| t.notOk(req.headers['content-length']) | ||
| } else { | ||
| t.ok(req.headers['content-length']) | ||
| t.notOk(req.headers['transfer-encoding']) | ||
| } | ||
|
|
||
| // temp workaround | ||
| var data = '' | ||
| req.setEncoding('utf8') | ||
|
|
||
| req.on('data', function(d) { | ||
| data += d | ||
| }) | ||
|
|
||
| req.on('end', function() { | ||
| // check for the fields traces | ||
| if (test.expected.chunked && data.indexOf('name: file') !== -1) { | ||
| // file | ||
| t.ok(data.indexOf('name: file') !== -1) | ||
| // check for unicycle.jpg traces | ||
| t.ok(data.indexOf('2005:06:21 01:44:12') !== -1) | ||
| } else { | ||
| // field | ||
| t.ok(data.indexOf('name: field') !== -1) | ||
| var parts = test.options.multipart.data || test.options.multipart | ||
| t.ok(data.indexOf(parts[0].body) !== -1) | ||
| } | ||
|
|
||
| res.writeHead(200) | ||
| res.end() | ||
| }) | ||
| }) | ||
|
|
||
| server.listen(6767, function() { | ||
| // @NOTE: multipartData properties must be set here | ||
| // so that file read stream does not leak in node v0.8 | ||
| var parts = test.options.multipart.data || test.options.multipart | ||
| if (parts[0].name === 'file') { | ||
| parts[0].body = fs.createReadStream(localFile) | ||
| } | ||
|
|
||
| request.post('http://localhost:6767', test.options, function (err, res, body) { | ||
| t.equal(err, null) | ||
| t.equal(res.statusCode, 200) | ||
| server.close(function () { | ||
| t.end() | ||
| }) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| Object.keys(cases).forEach(function (name) { | ||
| tape('multipart-encoding ' + name, function(t) { | ||
| runTest(t, cases[name]) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
([^\s;])+picks the first character of the boundary, should be([^\s;]+)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for pointing that out @assaf the bug was fixed here #1505 I had a faulty test for that case.