Skip to content

fix: Honor X-Real-IP #347

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

Merged
untitaker merged 2 commits into from
Apr 25, 2019
Merged

fix: Honor X-Real-IP #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
808b1d7
fix: Honor X-Real-IP
untitaker Apr 23, 2019
a10c6f3
fix: Mypy
untitaker Apr 23, 2019
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
22 changes: 14 additions & 8 deletions sentry_sdk/integrations/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ def _get_environ(environ):
"""
Returns our whitelisted environment variables.
"""
keys = ("SERVER_NAME", "SERVER_PORT")
keys = ["SERVER_NAME", "SERVER_PORT"]
if _should_send_default_pii():
keys += ("REMOTE_ADDR",) # type: ignore
# Add all three headers here to make debugging of proxy setup easier.
keys += ["REMOTE_ADDR", "HTTP_X_FORWARDED_FOR", "HTTP_X_REAL_IP"]

for key in keys:
if key in environ:
Expand Down Expand Up @@ -129,16 +130,21 @@ def _get_headers(environ):
def get_client_ip(environ):
# type: (Dict[str, str]) -> Optional[Any]
"""
Naively yank the first IP address in an X-Forwarded-For header
and assume this is correct.

Note: Don't use this in security sensitive situations since this
value may be forged from a client.
Infer the user IP address from various headers. This cannot be used in
security sensitive situations since the value may be forged from a client,
but it's good enough for the event payload.
"""
try:
return environ["HTTP_X_FORWARDED_FOR"].split(",")[0].strip()
except (KeyError, IndexError):
return environ.get("REMOTE_ADDR")
pass

try:
return environ["HTTP_X_REAL_IP"]
except KeyError:
pass

return environ.get("REMOTE_ADDR")


def _capture_exception(hub):
Expand Down