Skip to content

Conversation

@tdjsnelling
Copy link
Contributor

What is the purpose of this pull request? (put an "X" next to item)

[ ] Documentation update
[X] Bug fix
[ ] New feature
[ ] Other, please explain:

What changes did you make? (Give an overview)

Added better parsing of the X-Forwarded-For header when trustProxy is enabled.

The X-Forwarded-For header can contain a comma-separated list of IP addresses, the first being the client IP and the rest being the addresses of the proxies that the request passed through.

https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#syntax

There was no handling for this in the server code, so if a list was passed in the header the IP regex test would fail and the peer doing the announce would not be added to the tracker.

This PR adds handling for when the header contains a comma-separated list, by splitting the header on , and setting the ip property to only the first value.

Which issue (if any) does this pull request address?

None

Is there anything you'd like reviewers to focus on?

I was unable to run the tests on an M1 macbook due to an arch error, so please check tests are passing.

@welcome
Copy link

welcome bot commented Feb 18, 2023

🙌 Thanks for opening this pull request! You're awesome.

Copy link
Member

@alxhotel alxhotel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alxhotel alxhotel merged commit bf8831c into webtorrent:master Mar 17, 2023
@welcome
Copy link

welcome bot commented Mar 17, 2023

🎉 Congrats on getting your first pull request landed!

@alxhotel
Copy link
Member

Thanks @tdjsnelling!

@webtorrent-bot
Copy link

🎉 This PR is included in version 10.0.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants