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

add cookie security check and respect protocol limits #3731

Closed
wants to merge 5 commits into from
+5 −1
Closed

add cookie security check and respect protocol limits #3731

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92b7044
respect cookie protocol limit
Outfluencer Aug 23, 2024
a5aaa33
check for not requested cookies
Outfluencer Aug 23, 2024
59d14b0
space
Outfluencer Aug 23, 2024
c39f0d2
remove spaces
Outfluencer Aug 23, 2024
ac46a6f
Update InitialHandler.java
Outfluencer Aug 24, 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
2 changes: 1 addition & 1 deletion protocol/src/main/java/net/md_5/bungee/protocol/packet/CookieResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class CookieResponse extends DefinedPacket
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
cookie = readString( buf );
data = readNullable( DefinedPacket::readArray, buf );
data = readNullable( read -> DefinedPacket.readArray( read, 5120 ), buf );
}

@Override
Expand Down
4 changes: 4 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 @@ -716,6 +716,10 @@ public void handle(CookieResponse cookieResponse)

throw CancelSendSignal.INSTANCE;
}

// if there is no userCon we can't have a connection to a backend server that could have requested this cookie
// witch means that this cookie is invalid as the proxy also has not requested it
Outfluencer marked this conversation as resolved.
Show resolved Hide resolved
Preconditions.checkState( userCon != null, "not requested cookie received" );
}

@Override
Expand Down