Changeset fc8eefcd in mod_gnutls

Timestamp:

Dec 2, 2019, 2:09:59 PM (11 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

d9b0936

Parents:

03426e0

git-author:

Fiona Klute <fiona.klute@…> (12/02/19 14:00:48)

git-committer:

Fiona Klute <fiona.klute@…> (12/02/19 14:09:59)

Message:

https-test-client.py: Cleanly shut down the connection subprocess

The call to self.sock.shutdown(socket.SHUT_WR) effectively closes the
subprocess' stdin, telling gnutls-cli to shut down. The wait allows it
and the filter process time to clean up remaining data.

File:

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

test/https-test-client.py

@@ -67 +67 @@
             # Critical: "event" is a bitwise OR of the POLL* constants
             for x, event in poller.poll():
-                print(f'fd {x}: {event}')
                 if event & select.POLLIN or event & select.POLLPRI:
                     data = in_stream.read()
-                    print(f'read {len(data)} bytes')
                     if cert_log in data:
                         data = data.replace(cert_log, b'')
-                        print('skip')
                     out_stream.send(data)
                 if event & select.POLLHUP or event & select.POLLRDHUP:
@@ -79 +76 @@
                     # might be in the list returned by poll() first.
                     run_loop = False
-                    print('received HUP')
-                sys.stdout.flush()
-
-        print('filter process cleanin up')
-        sys.stdout.flush()
 
         in_stream.close()
@@ -102 +94 @@
         s_remote.close()
         self.sock = s_local
-        print(f'socket created {self.sock}')
-        sys.stdout.flush()
 
     def close(self):
-        traceback.print_stack()
-        # Wait for the process to stop, send SIGKILL if necessary
-        self._sproc.terminate()
-        self.returncode = self._sproc.wait(self.timeout)
-        if self.returncode == None:
-            self._sproc.kill()
+        # close socket to subprocess for writing
+        if self.sock:
+            self.sock.shutdown(socket.SHUT_WR)
+
+        # Wait for the process to stop, send SIGTERM/SIGKILL if
+        # necessary
+        try:
             self.returncode = self._sproc.wait(self.timeout)
-
-        # filter process receives HUP on socket when the subprocess
+        except subprocess.TimeoutExpired:
+            try:
+                self._sproc.terminate()
+                self.returncode = self._sproc.wait(self.timeout)
+            except subprocess.TimeoutExpired:
+                self._sproc.kill()
+                self.returncode = self._sproc.wait(self.timeout)
+
+        # filter process receives HUP on pipe when the subprocess
         # terminates
         self._fproc.join()
 
-        print(f'socket closing {self.sock}')
+        # close the connection in the super class, which also calls
+        # self.sock.close()
         super().close()