Skip to content

remove boundary characters that pkg:http_parser cannot parse #72

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

Merged
merged 1 commit into from
Mar 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions lib/src/boundary_characters.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

/// 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
const List<int> BOUNDARY_CHARACTERS = const <int>[
39, 43, 95, 45, 46, 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
];
18 changes: 2 additions & 16 deletions lib/src/multipart_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'dart:convert';
import 'dart:math';

import 'base_request.dart';
import 'boundary_characters.dart';
import 'byte_stream.dart';
import 'multipart_file.dart';
import 'utils.dart';
Expand Down Expand Up @@ -117,21 +118,6 @@ class MultipartRequest extends BaseRequest {
return new ByteStream(controller.stream);
}

/// 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, 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
/// contain only ASCII characters.
String _headerForField(String name, String value) {
Expand Down Expand Up @@ -172,7 +158,7 @@ class MultipartRequest extends BaseRequest {
var prefix = "dart-http-boundary-";
var list = new List<int>.generate(_BOUNDARY_LENGTH - prefix.length,
(index) =>
_BOUNDARY_CHARACTERS[_random.nextInt(_BOUNDARY_CHARACTERS.length)],
BOUNDARY_CHARACTERS[_random.nextInt(BOUNDARY_CHARACTERS.length)],
growable: false);
return "$prefix${new String.fromCharCodes(list)}";
}
Expand Down
2 changes: 1 addition & 1 deletion test/io/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Future startServer() {
requestBody = requestBodyBytes;
}

var content = {
var content = <String, dynamic>{
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI, the reason for this change was strong mode inferred the map as Map<String, Object> and then complained about expression content['headers'][name] on line 98, saying that Object lacks operator[].

'method': request.method,
'path': request.uri.path,
'headers': {}
Expand Down
8 changes: 8 additions & 0 deletions test/multipart_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import 'dart:async';

import 'package:http/http.dart' as http;
import 'package:http/src/boundary_characters.dart';
import 'package:http_parser/http_parser.dart';
import 'package:unittest/unittest.dart';

Expand All @@ -18,6 +19,13 @@ void main() {
'''));
});

test('boundary characters', () {
var testBoundary = new String.fromCharCodes(BOUNDARY_CHARACTERS);
var contentType = new MediaType.parse('text/plain; boundary=${testBoundary}');
var boundary = contentType.parameters['boundary'];
expect(boundary, testBoundary);
});

test('with fields and files', () {
var request = new http.MultipartRequest('POST', dummyUrl);
request.fields['field1'] = 'value1';
Expand Down