Skip to content

gh-127478: Enhancement to support FTP connection with NAT scenario #127477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

gh-127478: Enhancement to support FTP connection with NAT scenario #127477

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
655aef4
Update ftplib.py
yugandhar2587 Dec 1, 2024
88a5531
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 1, 2024
94eee2e
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 1, 2024
6f08557
remove NEWS from Documentation
yugandhar2587 Dec 1, 2024
d267711
Merge branch 'accept229_with_pasv' of https://github.com/yugandhar258…
yugandhar2587 Dec 1, 2024
4fae73e
retry with EPSV when error occured with PASV
yugandhar2587 Dec 1, 2024
b730f06
Merge branch 'main' into accept229_with_pasv
yugandhar2587 Dec 1, 2024
886b326
changes per review suggestions
yugandhar2587 Dec 1, 2024
3a98d1c
Merge branch 'accept229_with_pasv' of https://github.com/yugandhar258…
yugandhar2587 Dec 1, 2024
11601b2
Update 2024-12-01-16-43-38.gh-issue-127478.fHI_y9.rst
yugandhar2587 Dec 1, 2024
03bfb66
Merge branch 'main' into accept229_with_pasv
yugandhar2587 Dec 2, 2024
d6cc6ff
Update ftplib.py
yugandhar2587 Dec 2, 2024
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
13 changes: 8 additions & 5 deletions Lib/ftplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,14 @@ def makeport(self):
def makepasv(self):
"""Internal: Does the PASV or EPSV handshake -> (address, port)"""
if self.af == socket.AF_INET:
untrusted_host, port = parse227(self.sendcmd('PASV'))
if self.trust_server_pasv_ipv4_address:
host = untrusted_host
else:
host = self.sock.getpeername()[0]
try:
untrusted_host, port = parse227(self.sendcmd('PASV'))
if self.trust_server_pasv_ipv4_address:
host = untrusted_host
else:
host = self.sock.getpeername()[0]
except:
host, port = parse229(self.sendcmd('EPSV'), self.sock.getpeername())
else:
host, port = parse229(self.sendcmd('EPSV'), self.sock.getpeername())
return host, port
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-12-01-16-43-38.gh-issue-127478.fHI_y9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support "229 Entering Extended Passive Mode" response in :meth:`ftplib.FTP.sendcmd`.
Loading