Release 2.1.16 (#409)

common/src/main/java/xyz/jonesdev/sonar/common/fallback/netty/FallbackVarInt21FrameDecoder.java

@@ -43,6 +43,7 @@ public final class FallbackVarInt21FrameDecoder extends ByteToMessageDecoder {
     // Skip any runs of 0x00 we might find
     final int packetStart = byteBuf.forEachByte(ByteProcessor.FIND_NON_NUL);
     if (packetStart == -1) {
+      byteBuf.clear();
       return;
     }
     byteBuf.readerIndex(packetStart);

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPreparer.java

@@ -111,7 +111,6 @@ public class FallbackPreparer {
   public FallbackPacket alreadyVerifying;
   public FallbackPacket reconnectedTooFast;
   public FallbackPacket protocolBlacklisted;
-  public FallbackPacket invalidUsername;
   public FallbackPacket unsupportedVersion;
   public FallbackPacket tooManyOnlinePerIP;
   public FallbackPacket[] xpCountdown;
@@ -189,7 +188,6 @@ public class FallbackPreparer {
     alreadyQueued = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getAlreadyQueued(), true));
     protocolBlacklisted = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getProtocolBlacklisted(), true));
     reconnectedTooFast = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getTooFastReconnect(), true));
-    invalidUsername = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getInvalidUsername(), true));
     unsupportedVersion = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getUnsupportedVersion(), true));
     tooManyOnlinePerIP = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getTooManyOnlinePerIp(), true));
 

common/src/main/java/xyz/jonesdev/sonar/common/fallback/verification/FallbackPreJoinHandler.java

@@ -157,9 +157,10 @@ public final class FallbackPreJoinHandler extends FallbackVerificationHandler {
 
   private void markSuccess() {
     if (user.channel().isActive()) {
-      // Check if the username matches the valid name regex to prevent UTF-16 names or other types of exploits
-      checkState(Sonar.get().getConfig().getVerification().getValidNameRegex().matcher(user.getUsername()).matches(),
-        "username " + user.getUsername() + " does not match regex");
+      if (!Sonar.get().getConfig().getVerification().getValidNameRegex().matcher(user.getUsername()).matches()) {
+        user.disconnect(Sonar.get().getConfig().getVerification().getInvalidUsername());
+        return;
+      }
 
       // Pass the player to the next verification handler
       final FallbackGravityHandler gravityHandler = new FallbackGravityHandler(user, this);

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev
-version=2.1.15
+version=2.1.16
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.