mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 04:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

bpo-35998: Fix test_asyncio.test_start_tls_server_1() (GH-16815)

Browse source 
main() is now responsible to send the ANSWER, rather than
ServerProto. main() now waits until it got the HELLO before sending
the ANSWER over the new transport.

Previously, there was a race condition between main() replacing the
protocol and the protocol sending the ANSWER once it gets the HELLO.

TLSv1.3 was disabled for the test: reenable it.
This commit is contained in:
Victor Stinner 2019-10-16 02:36:42 +02:00 • committed by GitHub
parent 3f36043db2
commit fab4ef2df0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_asyncio/test_sslproto.py
View file

@ -497,14 +497,6 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
server_context = test_utils.simple_server_sslcontext() server_context = test_utils.simple_server_sslcontext()
client_context = test_utils.simple_client_sslcontext() client_context = test_utils.simple_client_sslcontext()
if (sys.platform.startswith('freebsd')
or sys.platform.startswith('win')
or sys.platform.startswith('darwin')):
# bpo-35031: Some FreeBSD and Windows buildbots fail to run this test
# as the eof was not being received by the server if the payload
# size is not big enough. This behaviour only appears if the
# client is using TLS1.3. Also seen on macOS.
client_context.options |= ssl.OP_NO_TLSv1_3
answer = None answer = None
def client(sock, addr): def client(sock, addr):
@ -521,9 +513,10 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
sock.close() sock.close()
class ServerProto(asyncio.Protocol): class ServerProto(asyncio.Protocol):
def __init__(self, on_con, on_con_lost): def __init__(self, on_con, on_con_lost, on_got_hello):
self.on_con = on_con self.on_con = on_con
self.on_con_lost = on_con_lost self.on_con_lost = on_con_lost
self.on_got_hello = on_got_hello
self.data = b'' self.data = b''
self.transport = None self.transport = None
@ -537,7 +530,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
def data_received(self, data): def data_received(self, data):
self.data += data self.data += data
if len(self.data) >= len(HELLO_MSG): if len(self.data) >= len(HELLO_MSG):
self.transport.write(ANSWER) self.on_got_hello.set_result(None)
def connection_lost(self, exc): def connection_lost(self, exc):
self.transport = None self.transport = None
@ -546,7 +539,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
else: else:
self.on_con_lost.set_exception(exc) self.on_con_lost.set_exception(exc)
async def main(proto, on_con, on_con_lost): async def main(proto, on_con, on_con_lost, on_got_hello):
tr = await on_con tr = await on_con
tr.write(HELLO_MSG) tr.write(HELLO_MSG)
@ -556,9 +549,11 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
tr, proto, server_context, tr, proto, server_context,
server_side=True, server_side=True,
ssl_handshake_timeout=self.TIMEOUT) ssl_handshake_timeout=self.TIMEOUT)
proto.replace_transport(new_tr) proto.replace_transport(new_tr)
await on_got_hello
new_tr.write(ANSWER)
await on_con_lost await on_con_lost
self.assertEqual(proto.data, HELLO_MSG) self.assertEqual(proto.data, HELLO_MSG)
new_tr.close() new_tr.close()
@ -566,7 +561,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
async def run_main(): async def run_main():
on_con = self.loop.create_future() on_con = self.loop.create_future()
on_con_lost = self.loop.create_future() on_con_lost = self.loop.create_future()
proto = ServerProto(on_con, on_con_lost) on_got_hello = self.loop.create_future()
proto = ServerProto(on_con, on_con_lost, on_got_hello)
server = await self.loop.create_server( server = await self.loop.create_server(
lambda: proto, '127.0.0.1', 0) lambda: proto, '127.0.0.1', 0)
@ -575,7 +571,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
with self.tcp_client(lambda sock: client(sock, addr), with self.tcp_client(lambda sock: client(sock, addr),
timeout=self.TIMEOUT): timeout=self.TIMEOUT):
await asyncio.wait_for( await asyncio.wait_for(
main(proto, on_con, on_con_lost), main(proto, on_con, on_con_lost, on_got_hello),
timeout=self.TIMEOUT) timeout=self.TIMEOUT)
server.close() server.close()

5
Misc/NEWS.d/next/Tests/2019-10-16-01-36-15.bpo-35998.G305Bf.rst Normal file
View file

@ -0,0 +1,5 @@
Fix a race condition in test_asyncio.test_start_tls_server_1(). Previously,
there was a race condition between the test main() function which replaces the
protocol and the test ServerProto protocol which sends ANSWER once it gets
HELLO. Now, only the test main() function is responsible to send data,
ServerProto no longer sends data.