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

Avoid using custom exceptions in the decoder #119

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Avoid using custom exceptions in the decoder #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/fallback/ConditionFailedException.java
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/fallback/FallbackInitialHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.handler.codec.DecoderException;
import lombok.Getter;
import lombok.val;
Expand Down Expand Up @@ -94,15 +95,15 @@ public void connected(final ChannelWrapper channelWrapper) throws Exception {
public void handle(final StatusRequest statusRequest) throws Exception {
// Fix status packet spam exploit
if (receivedStatusPacket) {
throw new ConditionFailedException("Duplicate status packet");
throw new CorruptedFrameException("Duplicate status packet");
}
receivedStatusPacket = true;
// Run the rest of the method asynchronously
CompletableFuture.runAsync(() -> {
// The channel always stays open because the client sends
// a StatusRequest and a Ping packet after one another
if (!isConnected()) {
throw new ConditionFailedException("Not connected anymore");
throw new CorruptedFrameException("Not connected anymore");
}
try {
super.handle(statusRequest);
Expand All @@ -119,7 +120,7 @@ public void handle(final LoginRequest loginRequest) throws Exception {

// Fix login packet spam exploit
if (receivedLoginPacket || user != null) {
throw new ConditionFailedException("Duplicate login packet");
throw new CorruptedFrameException("Duplicate login packet");
}
receivedLoginPacket = true;
// Cache protocol version so other handlers don't throw NPEs
Expand Down