Skip to content
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

Whitelist LoginPayloadResponse in UpstreamBridge#shouldHandle #3761

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Whitelist LoginPayloadResponse in UpstreamBridge#shouldHandle #3761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ba3ee
Whitelist LoginPayloadResponse in UpstreamBridge#shouldHandle
Outfluencer Nov 19, 2024
228b84f
Never forward LoginPayloadResponses to the Backend
Outfluencer Nov 19, 2024
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
3 changes: 3 additions & 0 deletions proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,9 @@ public void handle(LoginPayloadResponse response) throws Exception
}
Preconditions.checkState( future != null, "Unexpected custom LoginPayloadResponse" );
future.complete( response.getData() );

// we should never pass this to the backend
throw CancelSendSignal.INSTANCE;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void writabilityChanged(ChannelWrapper channel) throws Exception
@Override
public boolean shouldHandle(PacketWrapper packet) throws Exception
{
return con.getServer() != null || packet.packet instanceof PluginMessage || packet.packet instanceof CookieResponse;
return con.getServer() != null || packet.packet instanceof PluginMessage || packet.packet instanceof CookieResponse || packet.packet instanceof LoginPayloadResponse;
}

@Override
Expand Down