Fix 100% CPU spin in TLS connections after timeout (#683)

Author: SvanT

HISTORY.rst

@@ -11,6 +11,7 @@ Version: 2.2.0 - XXXX-XX-XX
 
 * #676: Always return 200 for the ``OPTS UTF8`` and ``OPTS UTF-8 ON`` commands
   to ensure correct FTP client compatibility when UTF-8 is supported.
+* #683: Fix 100% CPU spin in TLS connections after timeout
 
 **Compatibility notes**
 

pyftpdlib/handlers/ftps/control.py

@@ -7,6 +7,7 @@
 from OpenSSL import SSL
 
 from pyftpdlib.handlers.ftp.control import FTPHandler
+from pyftpdlib.log import logger
 
 from .data import TLS_DTPHandler
 from .ssl import SSLConnectionMixin
@@ -160,6 +161,16 @@ def process_command(self, cmd, *args, **kwargs):
                 return
         FTPHandler.process_command(self, cmd, *args, **kwargs)
 
+    def handle_timeout(self):
+        """Called when client does not send any command within the time
+        specified in <timeout> attribute."""
+        if self._ssl_accepting:
+            logger.info("SSL handshake timeout")
+            # SSL handshake not complete - can't send response, just close
+            self.close()
+        else:
+            super().handle_timeout()
+
     def close(self):
         SSLConnectionMixin.close(self)
         FTPHandler.close(self)