Issue #26309: Shut down SocketServer request if verify_request() is false
Based on patch by Aviv Palivoda.
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 33f7fb4..80130b7 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -296,6 +296,8 @@
except:
self.handle_error(request, client_address)
self.shutdown_request(request)
+ else:
+ self.shutdown_request(request)
def handle_timeout(self):
"""Called if no new request arrives within self.timeout.
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 714ca4a..73754c6 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -326,6 +326,29 @@
SocketServer.TCPServer((HOST, -1),
SocketServer.StreamRequestHandler)
+ def test_shutdown_request_called_if_verify_request_false(self):
+ # Issue #26309: BaseServer should call shutdown_request even if
+ # verify_request is False
+ result = {"shutdown_called": False}
+
+ class MyServer(SocketServer.TCPServer):
+ def verify_request(self, request, client_address):
+ return False
+
+ def shutdown_request(self, request):
+ result["shutdown_called"] = True
+ SocketServer.TCPServer.shutdown_request(self, request)
+
+ def connect_to_server(proto, addr):
+ s = socket.socket(proto, socket.SOCK_STREAM)
+ s.connect(addr)
+ s.close()
+
+ self.run_server(MyServer,
+ SocketServer.StreamRequestHandler,
+ connect_to_server)
+ self.assertEqual(result["shutdown_called"], True)
+
def test_main():
if imp.lock_held():
diff --git a/Misc/NEWS b/Misc/NEWS
index 7635529..d83ac5b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,10 @@
Library
-------
+- Issue #26309: In the "socketserver" module, shut down the request (closing
+ the connected socket) when verify_request() returns false. Based on patch
+ by Aviv Palivoda.
+
- Issue #25939: On Windows open the cert store readonly in ssl.enum_certificates.
- Issue #24303: Fix random EEXIST upon multiprocessing semaphores creation with