fix tls proxy due to select only affecting underlying socket

dfangl · dfangl · commit 41b04b0d8b74 · 2023-07-25T18:43:29.000+02:00
diff --git a/localstack/utils/server/proxy_server.py b/localstack/utils/server/proxy_server.py
@@ -17,6 +17,7 @@
 LOG = logging.getLogger(__name__)
 
 BUFFER_SIZE = 2**10  # 1024
+TLS_BUFFER_SIZE = 16384  # 16 KB, max TLS record size
 
 PortOrUrl = Union[str, int]
 
@@ -140,7 +141,7 @@ def _handle_socket(self, source_socket: ssl.SSLSocket, client_address: str) -> N
                         s_read, _, _ = select.select(sockets, [], [])
 
                         for s in s_read:
-                            data = s.recv(BUFFER_SIZE)
+                            data = s.recv(TLS_BUFFER_SIZE)
                             if not data:
                                 return
 
@@ -152,6 +153,9 @@ def _handle_socket(self, source_socket: ssl.SSLSocket, client_address: str) -> N
             LOG.warning(
                 "Error while proxying SSL request: %s", e, exc_info=LOG.isEnabledFor(logging.DEBUG)
             )
+        finally:
+            source_socket.close()
+            LOG.debug("Connection finished!")
 
     def do_run(self):
         context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
@@ -168,6 +172,8 @@ def do_run(self):
                     try:
                         conn, addr = ssock.accept()
                         self.thread_pool.submit(self._handle_socket, conn, addr)
+                    except ssl.SSLZeroReturnError:
+                        pass
                     except Exception as e:
                         LOG.exception("Error accepting socket: %s", e)
 
