Skip to content

Don't quote the multipart boundary header. #63

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

Merged
merged 2 commits into from
Mar 7, 2017
Merged

Don't quote the multipart boundary header. #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0c6d86
Don't quote the multipart boundary header.
nex3 Mar 6, 2017
95fa014
Only use valid token characters in the boundary.
nex3 Mar 6, 2017
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 0.11.3+12

* Don't quote the boundary header for `MultipartRequest`. This is more
compatible with server quirks.

## 0.11.3+11

* Fix the SDK constraint to only include SDK versions that support importing
`dart:io` everywhere.

## 0.11.3+10

* Stop using `dart:mirrors`.
Expand Down
21 changes: 13 additions & 8 deletions lib/src/multipart_request.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class MultipartRequest extends BaseRequest {
ByteStream finalize() {
// TODO(nweiz): freeze fields and files
var boundary = _boundaryString();
headers['content-type'] = 'multipart/form-data; boundary="$boundary"';
headers['content-type'] = 'multipart/form-data; boundary=$boundary';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll have to remove 39 (') and 61 (=) in _BOUNDARY_CHARACTERS for this to really work. I'd actually leave just alpha-numerics, 95 (underscore) and 45 (hyphen). I think all others play some special role in URL encoding, so I'd leave them out just in case.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here are the suspicious ones:

39: '
40: (
41: )
43: +
44: ,
46: .
47: /
58: :
61: =
63: ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to go alphanumeric-only unless we absolutely have to, but I've removed all the characters that aren't valid in MIME tokens.

super.finalize();

var controller = new StreamController<List<int>>(sync: true);
Expand Down Expand Up @@ -117,14 +117,19 @@ class MultipartRequest extends BaseRequest {
return new ByteStream(controller.stream);
}

/// All character codes that are valid in multipart boundaries. From
/// http://tools.ietf.org/html/rfc2046#section-5.1.1.
/// All character codes that are valid in multipart boundaries. This is the
/// intersection of the characters allowed in the `bcharsnospace` production
/// defined in [RFC 2046][] and those allowed in the `token` production
/// defined in [RFC 1521][].
///
/// [RFC 2046]: http://tools.ietf.org/html/rfc2046#section-5.1.1.
/// [RFC 1521]: https://tools.ietf.org/html/rfc1521#section-4
static const List<int> _BOUNDARY_CHARACTERS = const <int>[
39, 40, 41, 43, 95, 44, 45, 46, 47, 58, 61, 63, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 120, 121, 122
39, 43, 95, 44, 45, 46, 58, 61, 63, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
122
];

/// Returns the header string for a field. The return value is guaranteed to
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: http
version: 0.11.3+11
version: 0.11.3+12
author: "Dart Team <[email protected]>"
homepage: https://github.com/dart-lang/http
description: A composable, Future-based API for making HTTP requests.
Expand Down