diff options
Diffstat (limited to 'test/modules/http1/htdocs/cgi/upload.py')
-rwxr-xr-x | test/modules/http1/htdocs/cgi/upload.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/test/modules/http1/htdocs/cgi/upload.py b/test/modules/http1/htdocs/cgi/upload.py index 7dfc8eabba..0bdcbb8a6a 100755 --- a/test/modules/http1/htdocs/cgi/upload.py +++ b/test/modules/http1/htdocs/cgi/upload.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 import os import sys -import multipart from urllib import parse +import multipart # https://github.com/andrew-d/python-multipart (`apt install python3-multipart`) try: # Windows needs stdio set for binary mode. @@ -16,15 +16,23 @@ except ImportError: def get_request_params(): oforms = {} + ofiles = {} if "REQUEST_URI" in os.environ: qforms = parse.parse_qs(parse.urlsplit(os.environ["REQUEST_URI"]).query) for name, values in qforms.items(): oforms[name] = values[0] - myenv = os.environ.copy() - myenv['wsgi.input'] = sys.stdin.buffer - mforms, ofiles = multipart.parse_form_data(environ=myenv) - for name, item in mforms.items(): - oforms[name] = item + if "HTTP_CONTENT_TYPE" in os.environ: + ctype = os.environ["HTTP_CONTENT_TYPE"] + if ctype == "application/x-www-form-urlencoded": + qforms = parse.parse_qs(parse.urlsplit(sys.stdin.read()).query) + for name, values in qforms.items(): + oforms[name] = values[0] + elif ctype.startswith("multipart/"): + def on_field(field): + oforms[field.field_name] = field.value + def on_file(file): + ofiles[field.field_name] = field.value + multipart.parse_form(headers={"Content-Type": ctype}, input_stream=sys.stdin.buffer, on_field=on_field, on_file=on_file) return oforms, ofiles |