mirror of
https://abf.rosa.ru/djam/python38.git
synced 2025-02-23 15:22:50 +00:00
8058c8b2db
https://usn.ubuntu.com/4151-1/ * SECURITY UPDATE: incorrect email address parsing - CVE-2019-16056.patch: don't parse domains containing @ in Lib/email/_header_value_parser.py, Lib/email/_parseaddr.py, Lib/test/test_email/test__header_value_parser.py, Lib/test/test_email/test_email.py. * SECURITY UPDATE: XSS in documentation XML-RPC server - CVE-2019-16935.patch: escape the server_title in Lib/xmlrpc/server.py, Lib/test/test_docxmlrpc.py. * avoid_test_docxmlrpc_race.patch: avoid race in test_docxmlrpc server setup in Lib/test/test_docxmlrpc.py.
94 lines
2.9 KiB
Diff
94 lines
2.9 KiB
Diff
|
|
# HG changeset patch
|
|
# User Martin Panter <vadmium+py@gmail.com>
|
|
# Date 1471675858 0
|
|
# Node ID 397f0504417207f02b611092f444b5a24d3d1a41
|
|
# Parent 7ddbc22639435d234609181a14cba7182c58df5e
|
|
Issue #27614: Avoid race in test_docxmlrpc server setup
|
|
|
|
Index: python3.5-3.5.2/Lib/test/test_docxmlrpc.py
|
|
===================================================================
|
|
--- python3.5-3.5.2.orig/Lib/test/test_docxmlrpc.py 2019-10-08 09:06:31.993379083 -0400
|
|
+++ python3.5-3.5.2/Lib/test/test_docxmlrpc.py 2019-10-08 09:06:31.989379062 -0400
|
|
@@ -4,12 +4,8 @@ import re
|
|
import sys
|
|
from test import support
|
|
threading = support.import_module('threading')
|
|
-import time
|
|
-import socket
|
|
import unittest
|
|
|
|
-PORT = None
|
|
-
|
|
def make_request_and_skipIf(condition, reason):
|
|
# If we skip the test, we have to make a request because
|
|
# the server created in setUp blocks expecting one to come in.
|
|
@@ -24,13 +20,10 @@ def make_request_and_skipIf(condition, r
|
|
return decorator
|
|
|
|
|
|
-def server(evt, numrequests):
|
|
+def make_server():
|
|
serv = DocXMLRPCServer(("localhost", 0), logRequests=False)
|
|
|
|
try:
|
|
- global PORT
|
|
- PORT = serv.socket.getsockname()[1]
|
|
-
|
|
# Add some documentation
|
|
serv.set_server_title("DocXMLRPCServer Test Documentation")
|
|
serv.set_server_name("DocXMLRPCServer Test Docs")
|
|
@@ -67,43 +60,31 @@ def server(evt, numrequests):
|
|
serv.register_function(lambda x, y: x-y)
|
|
serv.register_function(annotation)
|
|
serv.register_instance(ClassWithAnnotation())
|
|
-
|
|
- while numrequests > 0:
|
|
- serv.handle_request()
|
|
- numrequests -= 1
|
|
- except socket.timeout:
|
|
- pass
|
|
- finally:
|
|
+ return serv
|
|
+ except:
|
|
serv.server_close()
|
|
- PORT = None
|
|
- evt.set()
|
|
+ raise
|
|
|
|
class DocXMLRPCHTTPGETServer(unittest.TestCase):
|
|
def setUp(self):
|
|
- self._threads = support.threading_setup()
|
|
# Enable server feedback
|
|
DocXMLRPCServer._send_traceback_header = True
|
|
|
|
- self.evt = threading.Event()
|
|
- threading.Thread(target=server, args=(self.evt, 1)).start()
|
|
-
|
|
- # wait for port to be assigned
|
|
- deadline = time.monotonic() + 10.0
|
|
- while PORT is None:
|
|
- time.sleep(0.010)
|
|
- if time.monotonic() > deadline:
|
|
- break
|
|
+ self.serv = make_server()
|
|
+ self.thread = threading.Thread(target=self.serv.serve_forever)
|
|
+ self.thread.start()
|
|
|
|
+ PORT = self.serv.server_address[1]
|
|
self.client = http.client.HTTPConnection("localhost:%d" % PORT)
|
|
|
|
def tearDown(self):
|
|
self.client.close()
|
|
|
|
- self.evt.wait()
|
|
-
|
|
# Disable server feedback
|
|
DocXMLRPCServer._send_traceback_header = False
|
|
- support.threading_cleanup(*self._threads)
|
|
+ self.serv.shutdown()
|
|
+ self.thread.join()
|
|
+ self.serv.server_close()
|
|
|
|
def test_valid_get_response(self):
|
|
self.client.request("GET", "/")
|