Fix switch condition in Proxy listeners setup #32895
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
tigrato
approved these changes
Oct 3, 2023
strideynet
approved these changes
Oct 4, 2023
public-teleport-github-review-bot
bot
removed the request for review
from fheinecke
AntonAM
force-pushed
the
anton/fix-proxy-listeners-setup
branch
from
89f0e8c
to
420b00b
Compare
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.
This PR fixes switch condition in
setupProxyListeners()- it was an error introduced byproxy_protocolchanges (#31622). Original condition looked likecase cfg.Proxy.EnableProxyProtocol && !cfg.Proxy.DisableWebService && !cfg.Proxy.DisableTLS:- so we used this branch if PROXY protocol was enabled, but now it's taken when PROXY protocol is switched off as well. It seems that mistake was not that damaging and in most cases we ended up with same listeners setup, since we still provided correctPROXYProtocolModeto multiplexer and it was off when required. Here we restore original default switch flow for unspecifiedproxy_protocolsetting.