Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/ftplib.py
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,10 @@ def parse229(resp, peer):
if len(parts) != 5:
raise error_proto(resp)
host = peer[0]
port = int(parts[3])
try:
port = int(parts[3])
except ValueError:
raise error_proto(resp) from None
return host, port


Expand Down
12 changes: 12 additions & 0 deletions Lib/test/test_ftplib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,18 @@ def test__all__(self):
'ftpcp', 'test'}
support.check__all__(self, ftplib, not_exported=not_exported)

def test_parse229(self):
peer = ('127.0.0.1', 21)
self.assertEqual(
ftplib.parse229('229 Entering Extended Passive Mode (|||6400|)', peer),
('127.0.0.1', 6400)
)
# Non-numeric or empty port must raise error_proto
with self.assertRaises(ftplib.error_proto):
ftplib.parse229('229 Entering Extended Passive Mode (|||invalid|)', peer)
with self.assertRaises(ftplib.error_proto):
ftplib.parse229('229 Entering Extended Passive Mode (||||)', peer)


class CommandLineTest(TestCase):
"""Tests for the ftplib command-line interface."""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``ftplib.parse229()`` now raises :exc:`ftplib.error_proto` instead of :exc:`ValueError` when encountering a malformed or non-numeric port in EPSV responses.
Loading