encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-21 14:05:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix boundary detection regex not handling spaces inside boundary marker correctly

Browse Source
This commit is contained in:
Levi Cameron 2017-05-31 13:12:06 +10:00
parent 1c44ef2b11
commit 6b8d6019ea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/static/rest_framework/js/ajax-form.js
View File

@ -42,7 +42,9 @@ function doAjaxSubmit(e) {
// We need to add a boundary parameter to the header // We need to add a boundary parameter to the header
// We assume the first valid-looking boundary line in the body is correct // We assume the first valid-looking boundary line in the body is correct
// regex is from RFC 2046 appendix A // regex is from RFC 2046 appendix A
var re = /^--([0-9A-Z'()+_,-./:=?]{1,70})[ \f\t\v\u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]*$/im; var boundaryCharNoSpace = "[0-9A-Z'()+_,-./:=?";
var boundaryChar = boundaryCharNoSpace + ' ';
var re = new RegExp('^--([' + boundaryChar + ']{0,69}[' + boundaryCharNoSpace + '])[\\s]*?$', 'im');
var boundary = data.match(re); var boundary = data.match(re);
if (boundary !== null) { if (boundary !== null) {
contentType += '; boundary="' + boundary[1] + '"'; contentType += '; boundary="' + boundary[1] + '"';