middleware: Detect reverse proxy misconfigurations. #26046
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexmv
force-pushed
the
proxy-misconfiguration
branch
2 times, most recently
from
b1271f7
to
ab3c02b
Compare
alexmv
added
the
integration review
alexmv
force-pushed
the
proxy-misconfiguration
branch
from
ab3c02b
to
1cde046
Compare
|
This seems to reliably wedge the |
|
Oh, it apparently segfaults Python: |
|
CZO thread for the crash. |
alexmv
referenced
this pull request
Jun 26, 2023
Previously, `X-Forwarded-Proto` did not need to be set, and failure to set `loadbalancer.ips` would merely result in bad IP-address rate-limiting and incorrect access logs; after 0935d38, however, failure to do either of those, if Zulip is deployed with `http_only`, will lead to infinite redirect loops after login. These are accompanied by a misleading error, from Tornado, of: Forbidden (Origin checking failed - https://zulip.example.com does not match any trusted origins.): /json/events This is most common with Docker deployments, where deployments use another docker container, such as nginx or Traefik, to do SSL termination. See zulip/docker-zulip#403. Update the documentation to reinforce that `loadbalancer.ips` also controls trust of `X-Forwarded-Proto`, and that failure to set it will cause the application to not function correctly.
alexmv
force-pushed
the
proxy-misconfiguration
branch
2 times, most recently
from
8722517
to
1b73158
Compare
timabbott
reviewed
Jun 27, 2023
|
This lgtm; posted one small comment on readability. Given the intent to immediately backport this, it'd be great if @andersk did a read as well; I am not very good at reading the |
alexmv
force-pushed
the
proxy-misconfiguration
branch
from
1b73158
to
c9586d0
Compare
Having exactly 17 or 18 middlewares, on Python 3.11.0 and above, causes python to segfault when running tests with coverage; see python/cpython#106092 Work around this by adding one or two no-op middlewares if we would hit those unlucky numbers. We only add them in testing, since coverage is a requirement to trigger it, and there is no reason to burden production with additional wrapping.
Combine nginx and Django middlware to stop putting misleading warnings about `CSRF_TRUSTED_ORIGINS` when the issue is untrusted proxies. This attempts to, in the error logs, diagnose and suggest next steps to fix common proxy misconfigurations. See also zulip#24599 and zulip/docker-zulip#403.
alexmv
force-pushed
the
proxy-misconfiguration
branch
from
c9586d0
to
74f6a47
Compare
timabbott
added
the
backport candidate
andersk
approved these changes
Jun 30, 2023
|
Merged, thanks @alexmv! |
alexmv
removed
the
backport candidate
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Combine nginx and Django middlware to stop putting misleading warnings
about
CSRF_TRUSTED_ORIGINSwhen the issue is untrusted proxies.This attempts to, in the error logs, diagnose and suggest next steps
to fix common proxy misconfigurations.
See also #24599 and zulip/docker-zulip#403.
Self-review checklist
(variable names, code reuse, readability, etc.).
Communicate decisions, questions, and potential concerns.
Individual commits are ready for review (see commit discipline).
Completed manual review and testing of the following: