Skip to content

Commit 9d070fd

Browse files
gh-162128: Raise error_proto on malformed port in ftplib.parse229
1 parent 5e18bfc commit 9d070fd

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎Lib/ftplib.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,10 @@ def parse229(resp, peer):
845845
if len(parts) != 5:
846846
raise error_proto(resp)
847847
host = peer[0]
848-
port = int(parts[3])
848+
try:
849+
port = int(parts[3])
850+
except ValueError:
851+
raise error_proto(resp) from None
849852
return host, port
850853

851854

‎Lib/test/test_ftplib.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,18 @@ def test__all__(self):
11901190
'ftpcp', 'test'}
11911191
support.check__all__(self, ftplib, not_exported=not_exported)
11921192

1193+
def test_parse229(self):
1194+
peer = ('127.0.0.1', 21)
1195+
self.assertEqual(
1196+
ftplib.parse229('229 Entering Extended Passive Mode (|||6400|)', peer),
1197+
('127.0.0.1', 6400)
1198+
)
1199+
# Non-numeric or empty port must raise error_proto
1200+
with self.assertRaises(ftplib.error_proto):
1201+
ftplib.parse229('229 Entering Extended Passive Mode (|||invalid|)', peer)
1202+
with self.assertRaises(ftplib.error_proto):
1203+
ftplib.parse229('229 Entering Extended Passive Mode (||||)', peer)
1204+
11931205

11941206
class CommandLineTest(TestCase):
11951207
"""Tests for the ftplib command-line interface."""
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
:func:`ftplib.parse229` now raises :exc:`ftplib.error_proto` instead of :exc:`ValueError` when encountering a malformed or non-numeric port in EPSV responses.

0 commit comments

Comments
 (0)