diff options
Diffstat (limited to 'tests/test_formparser.py')
| -rw-r--r-- | tests/test_formparser.py | 590 |
1 files changed, 342 insertions, 248 deletions
diff --git a/tests/test_formparser.py b/tests/test_formparser.py index 5f80ab5f..6d858386 100644 --- a/tests/test_formparser.py +++ b/tests/test_formparser.py @@ -10,106 +10,133 @@ """ import csv import io -import pytest - -from os.path import join, dirname +from os.path import dirname +from os.path import join -from tests import strict_eq +import pytest +from . import strict_eq from werkzeug import formparser -from werkzeug.test import create_environ, Client -from werkzeug.wrappers import Request, Response -from werkzeug.exceptions import RequestEntityTooLarge +from werkzeug._compat import BytesIO +from werkzeug._compat import PY2 from werkzeug.datastructures import MultiDict -from werkzeug.formparser import parse_form_data, FormDataParser -from werkzeug._compat import BytesIO, PY2 +from werkzeug.exceptions import RequestEntityTooLarge +from werkzeug.formparser import FormDataParser +from werkzeug.formparser import parse_form_data +from werkzeug.test import Client +from werkzeug.test import create_environ +from werkzeug.wrappers import Request +from werkzeug.wrappers import Response @Request.application def form_data_consumer(request): - result_object = request.args['object'] - if result_object == 'text': - return Response(repr(request.form['text'])) + result_object = request.args["object"] + if result_object == "text": + return Response(repr(request.form["text"])) f = request.files[result_object] - return Response(b'\n'.join(( - repr(f.filename).encode('ascii'), - repr(f.name).encode('ascii'), - repr(f.content_type).encode('ascii'), - f.stream.read() - ))) + return Response( + b"\n".join( + ( + repr(f.filename).encode("ascii"), + repr(f.name).encode("ascii"), + repr(f.content_type).encode("ascii"), + f.stream.read(), + ) + ) + ) def get_contents(filename): - with open(filename, 'rb') as f: + with open(filename, "rb") as f: return f.read() class TestFormParser(object): - def test_limiting(self): - data = b'foo=Hello+World&bar=baz' - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='application/x-www-form-urlencoded', - method='POST') + data = b"foo=Hello+World&bar=baz" + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="application/x-www-form-urlencoded", + method="POST", + ) req.max_content_length = 400 - strict_eq(req.form['foo'], u'Hello World') + strict_eq(req.form["foo"], u"Hello World") - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='application/x-www-form-urlencoded', - method='POST') + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="application/x-www-form-urlencoded", + method="POST", + ) req.max_form_memory_size = 7 - pytest.raises(RequestEntityTooLarge, lambda: req.form['foo']) + pytest.raises(RequestEntityTooLarge, lambda: req.form["foo"]) - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='application/x-www-form-urlencoded', - method='POST') + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="application/x-www-form-urlencoded", + method="POST", + ) req.max_form_memory_size = 400 - strict_eq(req.form['foo'], u'Hello World') - - data = (b'--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\n' - b'Hello World\r\n' - b'--foo\r\nContent-Disposition: form-field; name=bar\r\n\r\n' - b'bar=baz\r\n--foo--') - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') + strict_eq(req.form["foo"], u"Hello World") + + data = ( + b"--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\n" + b"Hello World\r\n" + b"--foo\r\nContent-Disposition: form-field; name=bar\r\n\r\n" + b"bar=baz\r\n--foo--" + ) + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) req.max_content_length = 4 - pytest.raises(RequestEntityTooLarge, lambda: req.form['foo']) + pytest.raises(RequestEntityTooLarge, lambda: req.form["foo"]) - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) req.max_content_length = 400 - strict_eq(req.form['foo'], u'Hello World') + strict_eq(req.form["foo"], u"Hello World") - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) req.max_form_memory_size = 7 - pytest.raises(RequestEntityTooLarge, lambda: req.form['foo']) + pytest.raises(RequestEntityTooLarge, lambda: req.form["foo"]) - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) req.max_form_memory_size = 400 - strict_eq(req.form['foo'], u'Hello World') + strict_eq(req.form["foo"], u"Hello World") def test_missing_multipart_boundary(self): - data = (b'--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\n' - b'Hello World\r\n' - b'--foo\r\nContent-Disposition: form-field; name=bar\r\n\r\n' - b'bar=baz\r\n--foo--') - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data', - method='POST') + data = ( + b"--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\n" + b"Hello World\r\n" + b"--foo\r\nContent-Disposition: form-field; name=bar\r\n\r\n" + b"bar=baz\r\n--foo--" + ) + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data", + method="POST", + ) assert req.form == {} def test_parse_form_data_put_without_content(self): @@ -119,24 +146,23 @@ class TestFormParser(object): # containing an entity-body SHOULD include a Content-Type header field # defining the media type of that body." In the case where either # headers are omitted, parse_form_data should still work. - env = create_environ('/foo', 'http://example.org/', method='PUT') + env = create_environ("/foo", "http://example.org/", method="PUT") stream, form, files = formparser.parse_form_data(env) - strict_eq(stream.read(), b'') + strict_eq(stream.read(), b"") strict_eq(len(form), 0) strict_eq(len(files), 0) def test_parse_form_data_get_without_content(self): - env = create_environ('/foo', 'http://example.org/', method='GET') + env = create_environ("/foo", "http://example.org/", method="GET") stream, form, files = formparser.parse_form_data(env) - strict_eq(stream.read(), b'') + strict_eq(stream.read(), b"") strict_eq(len(form), 0) strict_eq(len(files), 0) @pytest.mark.parametrize( - ("no_spooled", "size"), - ((False, 100), (False, 3000), (True, 100), (True, 3000)), + ("no_spooled", "size"), ((False, 100), (False, 3000), (True, 100), (True, 3000)) ) def test_default_stream_factory(self, no_spooled, size, monkeypatch): if no_spooled: @@ -144,8 +170,7 @@ class TestFormParser(object): data = b"a,b,c\n" * size req = Request.from_values( - data={"foo": (BytesIO(data), "test.txt")}, - method="POST" + data={"foo": (BytesIO(data), "test.txt")}, method="POST" ) file_storage = req.files["foo"] @@ -162,268 +187,338 @@ class TestFormParser(object): file_storage.close() def test_streaming_parse(self): - data = b'x' * (1024 * 600) + data = b"x" * (1024 * 600) class StreamMPP(formparser.MultiPartParser): - def parse(self, file, boundary, content_length): - i = iter(self.parse_lines(file, boundary, content_length, - cap_at_buffer=False)) + i = iter( + self.parse_lines( + file, boundary, content_length, cap_at_buffer=False + ) + ) one = next(i) two = next(i) - return self.cls(()), {'one': one, 'two': two} + return self.cls(()), {"one": one, "two": two} class StreamFDP(formparser.FormDataParser): - - def _sf_parse_multipart(self, stream, mimetype, - content_length, options): + def _sf_parse_multipart(self, stream, mimetype, content_length, options): form, files = StreamMPP( - self.stream_factory, self.charset, self.errors, + self.stream_factory, + self.charset, + self.errors, max_form_memory_size=self.max_form_memory_size, - cls=self.cls).parse(stream, options.get('boundary').encode('ascii'), - content_length) + cls=self.cls, + ).parse(stream, options.get("boundary").encode("ascii"), content_length) return stream, form, files + parse_functions = {} parse_functions.update(formparser.FormDataParser.parse_functions) - parse_functions['multipart/form-data'] = _sf_parse_multipart + parse_functions["multipart/form-data"] = _sf_parse_multipart class StreamReq(Request): form_data_parser_class = StreamFDP - req = StreamReq.from_values(data={'foo': (BytesIO(data), 'test.txt')}, - method='POST') - strict_eq('begin_file', req.files['one'][0]) - strict_eq(('foo', 'test.txt'), req.files['one'][1][1:]) - strict_eq('cont', req.files['two'][0]) - strict_eq(data, req.files['two'][1]) + + req = StreamReq.from_values( + data={"foo": (BytesIO(data), "test.txt")}, method="POST" + ) + strict_eq("begin_file", req.files["one"][0]) + strict_eq(("foo", "test.txt"), req.files["one"][1][1:]) + strict_eq("cont", req.files["two"][0]) + strict_eq(data, req.files["two"][1]) def test_parse_bad_content_type(self): parser = FormDataParser() - assert parser.parse('', 'bad-mime-type', 0) == \ - ('', MultiDict([]), MultiDict([])) + assert parser.parse("", "bad-mime-type", 0) == ( + "", + MultiDict([]), + MultiDict([]), + ) def test_parse_from_environ(self): parser = FormDataParser() - stream, _, _ = parser.parse_from_environ({'wsgi.input': ''}) + stream, _, _ = parser.parse_from_environ({"wsgi.input": ""}) assert stream is not None class TestMultiPart(object): - def test_basic(self): - resources = join(dirname(__file__), 'multipart') + resources = join(dirname(__file__), "multipart") client = Client(form_data_consumer, Response) repository = [ - ('firefox3-2png1txt', '---------------------------186454651713519341951581030105', [ - (u'anchor.png', 'file1', 'image/png', 'file1.png'), - (u'application_edit.png', 'file2', 'image/png', 'file2.png') - ], u'example text'), - ('firefox3-2pnglongtext', '---------------------------14904044739787191031754711748', [ - (u'accept.png', 'file1', 'image/png', 'file1.png'), - (u'add.png', 'file2', 'image/png', 'file2.png') - ], u'--long text\r\n--with boundary\r\n--lookalikes--'), - ('opera8-2png1txt', '----------zEO9jQKmLc2Cq88c23Dx19', [ - (u'arrow_branch.png', 'file1', 'image/png', 'file1.png'), - (u'award_star_bronze_1.png', 'file2', 'image/png', 'file2.png') - ], u'blafasel öäü'), - ('webkit3-2png1txt', '----WebKitFormBoundaryjdSFhcARk8fyGNy6', [ - (u'gtk-apply.png', 'file1', 'image/png', 'file1.png'), - (u'gtk-no.png', 'file2', 'image/png', 'file2.png') - ], u'this is another text with ümläüts'), - ('ie6-2png1txt', '---------------------------7d91b03a20128', [ - (u'file1.png', 'file1', 'image/x-png', 'file1.png'), - (u'file2.png', 'file2', 'image/x-png', 'file2.png') - ], u'ie6 sucks :-/') + ( + "firefox3-2png1txt", + "---------------------------186454651713519341951581030105", + [ + (u"anchor.png", "file1", "image/png", "file1.png"), + (u"application_edit.png", "file2", "image/png", "file2.png"), + ], + u"example text", + ), + ( + "firefox3-2pnglongtext", + "---------------------------14904044739787191031754711748", + [ + (u"accept.png", "file1", "image/png", "file1.png"), + (u"add.png", "file2", "image/png", "file2.png"), + ], + u"--long text\r\n--with boundary\r\n--lookalikes--", + ), + ( + "opera8-2png1txt", + "----------zEO9jQKmLc2Cq88c23Dx19", + [ + (u"arrow_branch.png", "file1", "image/png", "file1.png"), + (u"award_star_bronze_1.png", "file2", "image/png", "file2.png"), + ], + u"blafasel öäü", + ), + ( + "webkit3-2png1txt", + "----WebKitFormBoundaryjdSFhcARk8fyGNy6", + [ + (u"gtk-apply.png", "file1", "image/png", "file1.png"), + (u"gtk-no.png", "file2", "image/png", "file2.png"), + ], + u"this is another text with ümläüts", + ), + ( + "ie6-2png1txt", + "---------------------------7d91b03a20128", + [ + (u"file1.png", "file1", "image/x-png", "file1.png"), + (u"file2.png", "file2", "image/x-png", "file2.png"), + ], + u"ie6 sucks :-/", + ), ] for name, boundary, files, text in repository: folder = join(resources, name) - data = get_contents(join(folder, 'request.txt')) + data = get_contents(join(folder, "request.http")) for filename, field, content_type, fsname in files: response = client.post( - '/?object=' + field, + "/?object=" + field, data=data, content_type='multipart/form-data; boundary="%s"' % boundary, - content_length=len(data)) - lines = response.get_data().split(b'\n', 3) - strict_eq(lines[0], repr(filename).encode('ascii')) - strict_eq(lines[1], repr(field).encode('ascii')) - strict_eq(lines[2], repr(content_type).encode('ascii')) + content_length=len(data), + ) + lines = response.get_data().split(b"\n", 3) + strict_eq(lines[0], repr(filename).encode("ascii")) + strict_eq(lines[1], repr(field).encode("ascii")) + strict_eq(lines[2], repr(content_type).encode("ascii")) strict_eq(lines[3], get_contents(join(folder, fsname))) response = client.post( - '/?object=text', + "/?object=text", data=data, content_type='multipart/form-data; boundary="%s"' % boundary, - content_length=len(data)) - strict_eq(response.get_data(), repr(text).encode('utf-8')) + content_length=len(data), + ) + strict_eq(response.get_data(), repr(text).encode("utf-8")) def test_ie7_unc_path(self): client = Client(form_data_consumer, Response) - data_file = join(dirname(__file__), 'multipart', 'ie7_full_path_request.txt') + data_file = join(dirname(__file__), "multipart", "ie7_full_path_request.http") data = get_contents(data_file) - boundary = '---------------------------7da36d1b4a0164' + boundary = "---------------------------7da36d1b4a0164" response = client.post( - '/?object=cb_file_upload_multiple', + "/?object=cb_file_upload_multiple", data=data, content_type='multipart/form-data; boundary="%s"' % boundary, - content_length=len(data)) - lines = response.get_data().split(b'\n', 3) - strict_eq(lines[0], - repr(u'Sellersburg Town Council Meeting 02-22-2010doc.doc').encode('ascii')) + content_length=len(data), + ) + lines = response.get_data().split(b"\n", 3) + strict_eq( + lines[0], + repr(u"Sellersburg Town Council Meeting 02-22-2010doc.doc").encode("ascii"), + ) def test_end_of_file(self): # This test looks innocent but it was actually timeing out in # the Werkzeug 0.5 release version (#394) data = ( - b'--foo\r\n' + b"--foo\r\n" b'Content-Disposition: form-data; name="test"; filename="test.txt"\r\n' - b'Content-Type: text/plain\r\n\r\n' - b'file contents and no end' + b"Content-Type: text/plain\r\n\r\n" + b"file contents and no end" + ) + data = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", ) - data = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') assert not data.files assert not data.form def test_broken(self): data = ( - '--foo\r\n' + "--foo\r\n" 'Content-Disposition: form-data; name="test"; filename="test.txt"\r\n' - 'Content-Transfer-Encoding: base64\r\n' - 'Content-Type: text/plain\r\n\r\n' - 'broken base 64' - '--foo--' - ) - _, form, files = formparser.parse_form_data(create_environ( - data=data, method='POST', content_type='multipart/form-data; boundary=foo' - )) + "Content-Transfer-Encoding: base64\r\n" + "Content-Type: text/plain\r\n\r\n" + "broken base 64" + "--foo--" + ) + _, form, files = formparser.parse_form_data( + create_environ( + data=data, + method="POST", + content_type="multipart/form-data; boundary=foo", + ) + ) assert not files assert not form - pytest.raises(ValueError, formparser.parse_form_data, - create_environ(data=data, method='POST', - content_type='multipart/form-data; boundary=foo'), - silent=False) + pytest.raises( + ValueError, + formparser.parse_form_data, + create_environ( + data=data, + method="POST", + content_type="multipart/form-data; boundary=foo", + ), + silent=False, + ) def test_file_no_content_type(self): data = ( - b'--foo\r\n' + b"--foo\r\n" b'Content-Disposition: form-data; name="test"; filename="test.txt"\r\n\r\n' - b'file contents\r\n--foo--' + b"file contents\r\n--foo--" ) - data = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') - assert data.files['test'].filename == 'test.txt' - strict_eq(data.files['test'].read(), b'file contents') + data = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) + assert data.files["test"].filename == "test.txt" + strict_eq(data.files["test"].read(), b"file contents") def test_extra_newline(self): # this test looks innocent but it was actually timeing out in # the Werkzeug 0.5 release version (#394) data = ( - b'\r\n\r\n--foo\r\n' + b"\r\n\r\n--foo\r\n" b'Content-Disposition: form-data; name="foo"\r\n\r\n' - b'a string\r\n' - b'--foo--' + b"a string\r\n" + b"--foo--" + ) + data = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", ) - data = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') assert not data.files - strict_eq(data.form['foo'], u'a string') + strict_eq(data.form["foo"], u"a string") def test_headers(self): - data = (b'--foo\r\n' - b'Content-Disposition: form-data; name="foo"; filename="foo.txt"\r\n' - b'X-Custom-Header: blah\r\n' - b'Content-Type: text/plain; charset=utf-8\r\n\r\n' - b'file contents, just the contents\r\n' - b'--foo--') - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') - foo = req.files['foo'] - strict_eq(foo.mimetype, 'text/plain') - strict_eq(foo.mimetype_params, {'charset': 'utf-8'}) - strict_eq(foo.headers['content-type'], foo.content_type) - strict_eq(foo.content_type, 'text/plain; charset=utf-8') - strict_eq(foo.headers['x-custom-header'], 'blah') + data = ( + b"--foo\r\n" + b'Content-Disposition: form-data; name="foo"; filename="foo.txt"\r\n' + b"X-Custom-Header: blah\r\n" + b"Content-Type: text/plain; charset=utf-8\r\n\r\n" + b"file contents, just the contents\r\n" + b"--foo--" + ) + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) + foo = req.files["foo"] + strict_eq(foo.mimetype, "text/plain") + strict_eq(foo.mimetype_params, {"charset": "utf-8"}) + strict_eq(foo.headers["content-type"], foo.content_type) + strict_eq(foo.content_type, "text/plain; charset=utf-8") + strict_eq(foo.headers["x-custom-header"], "blah") def test_nonstandard_line_endings(self): - for nl in b'\n', b'\r', b'\r\n': - data = nl.join(( - b'--foo', - b'Content-Disposition: form-data; name=foo', - b'', - b'this is just bar', - b'--foo', - b'Content-Disposition: form-data; name=bar', - b'', - b'blafasel', - b'--foo--' - )) - req = Request.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; ' - 'boundary=foo', method='POST') - strict_eq(req.form['foo'], u'this is just bar') - strict_eq(req.form['bar'], u'blafasel') + for nl in b"\n", b"\r", b"\r\n": + data = nl.join( + ( + b"--foo", + b"Content-Disposition: form-data; name=foo", + b"", + b"this is just bar", + b"--foo", + b"Content-Disposition: form-data; name=bar", + b"", + b"blafasel", + b"--foo--", + ) + ) + req = Request.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) + strict_eq(req.form["foo"], u"this is just bar") + strict_eq(req.form["bar"], u"blafasel") def test_failures(self): def parse_multipart(stream, boundary, content_length): parser = formparser.MultiPartParser(content_length) return parser.parse(stream, boundary, content_length) - pytest.raises(ValueError, parse_multipart, BytesIO(), b'broken ', 0) - data = b'--foo\r\n\r\nHello World\r\n--foo--' - pytest.raises(ValueError, parse_multipart, BytesIO(data), b'foo', len(data)) + pytest.raises(ValueError, parse_multipart, BytesIO(), b"broken ", 0) - data = b'--foo\r\nContent-Disposition: form-field; name=foo\r\n' \ - b'Content-Transfer-Encoding: base64\r\n\r\nHello World\r\n--foo--' - pytest.raises(ValueError, parse_multipart, BytesIO(data), b'foo', len(data)) + data = b"--foo\r\n\r\nHello World\r\n--foo--" + pytest.raises(ValueError, parse_multipart, BytesIO(data), b"foo", len(data)) - data = b'--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\nHello World\r\n' - pytest.raises(ValueError, parse_multipart, BytesIO(data), b'foo', len(data)) + data = ( + b"--foo\r\nContent-Disposition: form-field; name=foo\r\n" + b"Content-Transfer-Encoding: base64\r\n\r\nHello World\r\n--foo--" + ) + pytest.raises(ValueError, parse_multipart, BytesIO(data), b"foo", len(data)) - x = formparser.parse_multipart_headers(['foo: bar\r\n', ' x test\r\n']) - strict_eq(x['foo'], 'bar\n x test') - pytest.raises(ValueError, formparser.parse_multipart_headers, - ['foo: bar\r\n', ' x test']) + data = ( + b"--foo\r\nContent-Disposition: form-field; name=foo\r\n\r\nHello World\r\n" + ) + pytest.raises(ValueError, parse_multipart, BytesIO(data), b"foo", len(data)) + + x = formparser.parse_multipart_headers(["foo: bar\r\n", " x test\r\n"]) + strict_eq(x["foo"], "bar\n x test") + pytest.raises( + ValueError, formparser.parse_multipart_headers, ["foo: bar\r\n", " x test"] + ) def test_bad_newline_bad_newline_assumption(self): class ISORequest(Request): - charset = 'latin1' - contents = b'U2vlbmUgbORu' - data = b'--foo\r\nContent-Disposition: form-data; name="test"\r\n' \ - b'Content-Transfer-Encoding: base64\r\n\r\n' + \ - contents + b'\r\n--foo--' - req = ISORequest.from_values(input_stream=BytesIO(data), - content_length=len(data), - content_type='multipart/form-data; boundary=foo', - method='POST') - strict_eq(req.form['test'], u'Sk\xe5ne l\xe4n') + charset = "latin1" + + contents = b"U2vlbmUgbORu" + data = ( + b'--foo\r\nContent-Disposition: form-data; name="test"\r\n' + b"Content-Transfer-Encoding: base64\r\n\r\n" + contents + b"\r\n--foo--" + ) + req = ISORequest.from_values( + input_stream=BytesIO(data), + content_length=len(data), + content_type="multipart/form-data; boundary=foo", + method="POST", + ) + strict_eq(req.form["test"], u"Sk\xe5ne l\xe4n") def test_empty_multipart(self): environ = {} - data = b'--boundary--' - environ['REQUEST_METHOD'] = 'POST' - environ['CONTENT_TYPE'] = 'multipart/form-data; boundary=boundary' - environ['CONTENT_LENGTH'] = str(len(data)) - environ['wsgi.input'] = BytesIO(data) + data = b"--boundary--" + environ["REQUEST_METHOD"] = "POST" + environ["CONTENT_TYPE"] = "multipart/form-data; boundary=boundary" + environ["CONTENT_LENGTH"] = str(len(data)) + environ["wsgi.input"] = BytesIO(data) stream, form, files = parse_form_data(environ, silent=False) rv = stream.read() - assert rv == b'' + assert rv == b"" assert form == MultiDict() assert files == MultiDict() class TestMultiPartParser(object): - def test_constructor_not_pass_stream_factory_and_cls(self): parser = formparser.MultiPartParser() @@ -443,7 +538,7 @@ class TestMultiPartParser(object): data = ( b"--foo\r\n" b"Content-Type: text/plain; charset=utf-8\r\n" - b'Content-Disposition: form-data; name=rfc2231;\r\n' + b"Content-Disposition: form-data; name=rfc2231;\r\n" b" filename*0*=ascii''a%20b%20;\r\n" b" filename*1*=c%20d%20;\r\n" b' filename*2="e f.txt"\r\n\r\n' @@ -453,25 +548,24 @@ class TestMultiPartParser(object): input_stream=BytesIO(data), content_length=len(data), content_type="multipart/form-data; boundary=foo", - method="POST" + method="POST", ) assert request.files["rfc2231"].filename == "a b c d e f.txt" assert request.files["rfc2231"].read() == b"file contents" class TestInternalFunctions(object): - def test_line_parser(self): - assert formparser._line_parse('foo') == ('foo', False) - assert formparser._line_parse('foo\r\n') == ('foo', True) - assert formparser._line_parse('foo\r') == ('foo', True) - assert formparser._line_parse('foo\n') == ('foo', True) + assert formparser._line_parse("foo") == ("foo", False) + assert formparser._line_parse("foo\r\n") == ("foo", True) + assert formparser._line_parse("foo\r") == ("foo", True) + assert formparser._line_parse("foo\n") == ("foo", True) def test_find_terminator(self): - lineiter = iter(b'\n\n\nfoo\nbar\nbaz'.splitlines(True)) + lineiter = iter(b"\n\n\nfoo\nbar\nbaz".splitlines(True)) find_terminator = formparser.MultiPartParser()._find_terminator line = find_terminator(lineiter) - assert line == b'foo' - assert list(lineiter) == [b'bar\n', b'baz'] - assert find_terminator([]) == b'' - assert find_terminator([b'']) == b'' + assert line == b"foo" + assert list(lineiter) == [b"bar\n", b"baz"] + assert find_terminator([]) == b"" + assert find_terminator([b""]) == b"" |