bugfix: the boundary string could not be parsed if no space was present before the boundary=xxx parameter in the Content-Type request header. thanks chenshu for reporting this issue in github openresty#2.

Author: agentzh

lib/resty/upload.lua

@@ -38,12 +38,12 @@ local function get_boundary()
  return nil
  end
 
- local m = match(header, ";%s+boundary=\"([^\"]+)\"")
+ local m = match(header, ";%s*boundary=\"([^\"]+)\"")
  if m then
  return m
  end
 
- return match(header, ";%s+boundary=([^\",;]+)")
+ return match(header, ";%s*boundary=([^\",;]+)")
 end
 
 

t/sanity.t

@@ -397,3 +397,133 @@ read: ["eof"]
 --- no_error_log
 [error]
 
+
+
+=== TEST 7: github issue #2: cannot parse boundary - no space before parameter (w/o quotes)
+--- http_config eval: $::HttpConfig
+--- config
+ location /t {
+ content_by_lua '
+ local upload = require "resty.upload"
+ local cjson = require "cjson"
+
+ local form, err = upload:new(5)
+ if not form then
+ ngx.say("cannot get form: ", err)
+ return
+ end
+
+ form:set_timeout(1000) -- 1 sec
+
+ while true do
+ local typ, res, err = form:read()
+ if not typ then
+ ngx.say("failed to read: ", err)
+ return
+ end
+
+ ngx.say("read: ", cjson.encode({typ, res}))
+
+ if typ == "eof" then
+ break
+ end
+ end
+
+ local typ, res, err = form:read()
+ ngx.say("read: ", cjson.encode({typ, res}))
+ ';
+ }
+--- more_headers
+Content-Type: multipart/form-data;boundary=---------------------------820127721219505131303151179
+--- request eval
+qq{POST /t\n-----------------------------820127721219505131303151179\r
+Content-Disposition: form-data; name="file1"; filename="a.txt"\r
+Content-Type: text/plain\r
+\r
+Hello, world\r\n-----------------------------820127721219505131303151179\r
+Content-Disposition: form-data; name="test"\r
+\r
+value\r
+\r\n-----------------------------820127721219505131303151179--\r
+}
+--- response_body
+read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
+read: ["header",["Content-Type","text\/plain","Content-Type: text\/plain"]]
+read: ["body","Hello"]
+read: ["body",", wor"]
+read: ["body","ld"]
+read: ["part_end"]
+read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
+read: ["body","value"]
+read: ["body","\r\n"]
+read: ["part_end"]
+read: ["eof"]
+read: ["eof"]
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: github issue #2: cannot parse boundary - no space before parameter (with quotes)
+--- http_config eval: $::HttpConfig
+--- config
+ location /t {
+ content_by_lua '
+ local upload = require "resty.upload"
+ local cjson = require "cjson"
+
+ local form, err = upload:new(5)
+ if not form then
+ ngx.say("cannot get form: ", err)
+ return
+ end
+
+ form:set_timeout(1000) -- 1 sec
+
+ while true do
+ local typ, res, err = form:read()
+ if not typ then
+ ngx.say("failed to read: ", err)
+ return
+ end
+
+ ngx.say("read: ", cjson.encode({typ, res}))
+
+ if typ == "eof" then
+ break
+ end
+ end
+
+ local typ, res, err = form:read()
+ ngx.say("read: ", cjson.encode({typ, res}))
+ ';
+ }
+--- more_headers
+Content-Type: multipart/form-data;boundary="---------------------------820127721219505131303151179"
+--- request eval
+qq{POST /t\n-----------------------------820127721219505131303151179\r
+Content-Disposition: form-data; name="file1"; filename="a.txt"\r
+Content-Type: text/plain\r
+\r
+Hello, world\r\n-----------------------------820127721219505131303151179\r
+Content-Disposition: form-data; name="test"\r
+\r
+value\r
+\r\n-----------------------------820127721219505131303151179--\r
+}
+--- response_body
+read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
+read: ["header",["Content-Type","text\/plain","Content-Type: text\/plain"]]
+read: ["body","Hello"]
+read: ["body",", wor"]
+read: ["body","ld"]
+read: ["part_end"]
+read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
+read: ["body","value"]
+read: ["body","\r\n"]
+read: ["part_end"]
+read: ["eof"]
+read: ["eof"]
+--- no_error_log
+[error]
+