Changeset 5c7e570 in mod_gnutls

Timestamp:

Dec 4, 2019, 3:52:56 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

1c2b936

Parents:

eed0c4b

Message:

https-test-client.py: Implement minimal HTTP/1.0 client

The test case 33_vhost_SNI_serveralias_missinghost checks if the
server correctly rejects requests with SNI but no "Host"
header. However, an HTTP/1.1 request without a Host header is invalid
and the server code rejects it before mod_gnutls can check the
request. This means we must use HTTP/1.0 in that test to get a useful
result.

File:

• test/https-test-client.py (modified) (3 diffs)

test/https-test-client.py

@@ -16 +16 @@
 # limitations under the License.
 
+import re
 import socket
 import subprocess
@@ -185 +186 @@
         return conn
 
+class TestRaw10(TestRequest):
+    """This is a minimal (and likely incomplete) HTTP/1.0 test client for
+    the one test case that strictly requires HTTP/1.0. All request
+    parameters (method, path, headers) MUST be specified in the config
+    file.
+
+    """
+    yaml_tag = '!raw10'
+    status_re = re.compile('^HTTP/([\d\.]+) (\d+) (.*)$')
+
+    def __init__(self, method, path, headers, expect):
+        self.method = method
+        self.path = path
+        self.headers = headers
+        self.expect = expect
+
+    def __repr__(self):
+        return (f'{self.__class__.__name__!s}'
+                f'(method={self.method!r}, path={self.path!r}, '
+                f'headers={self.headers!r}, expect={self.expect!r})')
+
+    def run(self, command, timeout=None):
+        req = f'{self.method} {self.path} HTTP/1.0\r\n'
+        for name, value in self.headers.items():
+            req = req + f'{name}: {value}\r\n'
+        req = req + f'\r\n'
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE,
+                                stdin=subprocess.PIPE, close_fds=True,
+                                bufsize=0)
+        try:
+            # Note: errs will be empty because stderr is not captured
+            outs, errs = proc.communicate(input=req.encode(),
+                                          timeout=timeout)
+        except TimeoutExpired:
+            proc.kill()
+            outs, errs = proc.communicate()
+
+        # first line of the received data must be the status
+        status, rest = outs.decode().split('\r\n', maxsplit=1)
+        # headers and body are separated by double newline
+        headers, body = rest.split('\r\n\r\n', maxsplit=1)
+        # log response for debugging
+        print(f'{status}\n{headers}\n\n{body}')
+
+        m = self.status_re.match(status)
+        if m:
+            status_code = int(m.group(2))
+            status_expect = self.expect.get('status')
+            if status_expect and not status_code == status_expect:
+                raise TestExpectationFailed('Unexpected status code: '
+                                            f'{status}, expected '
+                                            f'{status_expect}')
+        else:
+            raise TestExpectationFailed(f'Invalid status line: "{status}"')
+
+        if 'body' in self.expect:
+            self._check_body(body)
+
 # Override the default constructors. Pyyaml ignores default parameters
 # otherwise.
@@ -329 +388 @@
                 print(format_response(resp, body))
                 act.check_response(resp, body)
+            elif type(act) is TestRaw10:
+                act.run(command, conn.timeout)
             else:
                 raise TypeError(f'Unsupported action requested: {act!r}')