Fix trusted proxy ping source detection#22
Open
frederickbaier wants to merge 2 commits into
Open
Conversation
This file contains hidden or 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
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.
Why
A local SimpleCloud/system ping is used to read the real player count for the current proxy. The previous detection only compared the remote ping address with
InetAddress.getLocalHost(), which misses valid internal bindings such as192.168.102.10. When that detection fails, the MOTD slot/player-count rewriting is applied to the internal ping response, so the cloud sees the combined proxy count as if it belonged to each proxy. In multi-proxy setups this can make the network appear full too early and prevent joins.What changed
TrustedPingSourceMatcherused by both Velocity and BungeeCord ping listeners.trusted-ping-sourcesconfig entries supporting exact IPs and CIDR ranges for deployments where another trusted internal host performs the ping./scproxy reloadbehavior can pick up changed trusted source entries because listeners read the config through the existing config provider.Compatibility
This is intentionally additive:
Verification
sh gradlew build