Changeset 4fe52e6 in mod_gnutls for test

Timestamp:

Jan 23, 2020, 8:02:50 AM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

4f2c988

Parents:

f94938c

Message:

Use gnutls-cli inline command to test TLS session resumption

This makes it possible to resume at any point during the connection,
not just at the start (before any request) like "--resume" does.

Location:

test

Files:

• mgstest/tests.py (modified) (2 diffs)
• tests/14_resume_session/test.yml (modified) (2 diffs)

test/mgstest/tests.py

@@ -180 +180 @@
                 elif type(act) is TestReq10:
                     act.run(command, timeout, conn_log, response_log)
+                elif type(act) is Resume:
+                    act.run(conn, command)
                 else:
                     raise TypeError(f'Unsupported action requested: {act!r}')
@@ -424 +426 @@
 
 
+class Resume(yaml.YAMLObject):
+    """Test action to close and resume the TLS session.
+
+    Send the gnutls-cli inline command "^resume^" to close and resume
+    the TLS session. "inline-commands" must be present in
+    gnutls_params of the parent connection. This action does not need
+    any arguments, but you must specify with an explicitly empty
+    dictionary for YAML parsing to work, like this:
+
+      !resume {}
+
+    """
+    yaml_tag = '!resume'
+    def run(self, conn, command):
+        if not '--inline-commands' in command:
+            raise ValueError('gnutls_params must include "inline-commands" '
+                             'to use the resume action!')
+        if not type(conn) is HTTPSubprocessConnection:
+            raise TypeError('Resume action works only with '
+                            'HTTPSubprocessConnection.')
+        conn.sock.send(b'^resume^\n')
+
+
+
 def filter_cert_log(in_stream, out_stream):
     """Filter to stop an erroneous gnutls-cli log message.

test/tests/14_resume_session/test.yml

@@ -2 +2 @@
 gnutls_params:
   - x509cafile=authority/x509.pem
-  - resume
+  - inline-commands
 actions:
   - !request
@@ -11 +11 @@
         exactly: |
           test
+  - !resume {}
+  - !request
+    path: /test.txt
+    expect:
+      status: 200
+      body:
+        exactly: |
+          test