comparison mercurial/hgweb/server.py @ 36803:8e1556ac01bb

hgweb: validate WSGI environment dict

The wsgiref.validate module contains useful functions for validating
that various WSGI data structures are proper.

This commit adds validation of the environment dict to our built-in
HTTP server, which turns an HTTP request into an environment dict.

The check discovered that we weren't always setting QUERY_STRING,
which would cause the cgi module to fall back to sys.argv. So we
change things to always set QUERY_STRING.

The check passes on Python 2 and 3.

Differential Revision: https://phab.mercurial-scm.org/D2731

36802:7fc80c982656

import errno
import os
import socket
import sys
import traceback

from ..i18n import _

from .. import (
    encoding,

        env[r'REQUEST_URI'] = self.path
        env[r'SCRIPT_NAME'] = pycompat.sysstr(self.server.prefix)
        env[r'PATH_INFO'] = pycompat.sysstr(path[len(self.server.prefix):])
        env[r'REMOTE_HOST'] = self.client_address[0]
        env[r'REMOTE_ADDR'] = self.client_address[0]
        if query:
            env[r'QUERY_STRING'] = query

        if pycompat.ispy3:
            if self.headers.get_content_type() is None:
                env[r'CONTENT_TYPE'] = self.headers.get_default_type()
            else:

                                             socketserver.ThreadingMixIn)
        env[r'wsgi.multiprocess'] = isinstance(self.server,
                                              socketserver.ForkingMixIn)
        env[r'wsgi.run_once'] = 0

        self.saved_status = None
        self.saved_headers = []
        self.length = None
        self._chunked = None
        for chunk in self.server.application(env, self._start_response):

36803:8e1556ac01bb

import errno
import os
import socket
import sys
import traceback
import wsgiref.validate

from ..i18n import _

from .. import (
    encoding,

        env[r'REQUEST_URI'] = self.path
        env[r'SCRIPT_NAME'] = pycompat.sysstr(self.server.prefix)
        env[r'PATH_INFO'] = pycompat.sysstr(path[len(self.server.prefix):])
        env[r'REMOTE_HOST'] = self.client_address[0]
        env[r'REMOTE_ADDR'] = self.client_address[0]
        env[r'QUERY_STRING'] = query or r''

        if pycompat.ispy3:
            if self.headers.get_content_type() is None:
                env[r'CONTENT_TYPE'] = self.headers.get_default_type()
            else:

                                             socketserver.ThreadingMixIn)
        env[r'wsgi.multiprocess'] = isinstance(self.server,
                                              socketserver.ForkingMixIn)
        env[r'wsgi.run_once'] = 0

        wsgiref.validate.check_environ(env)

        self.saved_status = None
        self.saved_headers = []
        self.length = None
        self._chunked = None
        for chunk in self.server.application(env, self._start_response):