txpkgupload

Merge lp://staging/~cjwatson/txpkgupload/ipv4-mapped-pasv into lp://staging/~lazr-developers/txpkgupload/trunk

  1. ipv4-mapped-pasv
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 46
Proposed branch: lp://staging/~cjwatson/txpkgupload/ipv4-mapped-pasv
Merge into: lp://staging/~lazr-developers/txpkgupload/trunk
Diff against target: 95 lines (+47/-2)
3 files modified
requirements.txt (+1/-1)
setup.py (+1/-0)
src/txpkgupload/twistedftp.py (+45/-1)
To merge this branch: bzr merge lp://staging/~cjwatson/txpkgupload/ipv4-mapped-pasv
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+369996@code.staging.launchpad.net

Commit message

Fix behaviour of PASV with IPv4-mapped addresses.

Description of the change

When receiving a connection to an IPv6 endpoint using an IPv4-mapped address (possible on some IPv6 stacks), PASV can work but needs to return a properly-encoded IPv4 address. Including the leading "::ffff:" in the response appears to confuse connection tracking in some firewalls.

This is a backport from a commit in https://github.com/twisted/twisted/pull/1149, with the only changes being minor adjustments to symbol names and using six.ensure_text rather than the private twisted.python.compat._coercedUnicode. As before, getting the tests backported here was unreasonably difficult, but the Twisted PR has reasonable coverage.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: