[2.7] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) (GH-8791) · python/cpython@2ec530c · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75.3k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2ec530c

Browse filesBrowse the repository at this point in the historyBrowse files

tiran

authored

[2.7] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) (GH-8791)

Read from data socket to avoid "[SSL] shutdown while in init" exception during shutdown of the dummy server. Signed-off-by: Christian Heimes <christian@python.org> <!-- issue-number: [bpo-34391](https://www.bugs.python.org/issue34391) --> https://bugs.python.org/issue34391 <!-- /issue-number -->. (cherry picked from commit 1590c39) Co-authored-by: Christian Heimes <christian@python.org>

1 parent 00aebab commit 2ec530c
Copy full SHA for 2ec530c

2 files changed

+6Lines changed: 6 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test
  • test_ftplib.py
• Misc/NEWS.d/next/Tests
  • 2018-08-16-18-48-47.bpo-34391.ouNfxC.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_ftplib.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_ftplib.py

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -675,20 +675,25 @@ def test_data_connection(self):
675	675	# clear text
676	676	sock = self.client.transfercmd('list')
677	677	self.assertNotIsInstance(sock, ssl.SSLSocket)
	678	+ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
678	679	sock.close()
679	680	self.assertEqual(self.client.voidresp(), "226 transfer complete")
680	681
681	682	# secured, after PROT P
682	683	self.client.prot_p()
683	684	sock = self.client.transfercmd('list')
684	685	self.assertIsInstance(sock, ssl.SSLSocket)
	686	+ # consume from SSL socket to finalize handshake and avoid
	687	+ # "SSLError [SSL] shutdown while in init"
	688	+ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
685	689	sock.close()
686	690	self.assertEqual(self.client.voidresp(), "226 transfer complete")
687	691
688	692	# PROT C is issued, the connection must be in cleartext again
689	693	self.client.prot_c()
690	694	sock = self.client.transfercmd('list')
691	695	self.assertNotIsInstance(sock, ssl.SSLSocket)
	696	+ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
692	697	sock.close()
693	698	self.assertEqual(self.client.voidresp(), "226 transfer complete")
694	699

Collapse file

‎Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Fix ftplib test for TLS 1.3 by reading from data socket.

0 commit comments

Comments

0 (0)