MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Tolerate broken brand sending by some bots.

Browse Source
This commit is contained in:
Andrew Steinborn
2020-06-24 22:32:44 -04:00
parent 28d2366c73
commit 51819b563f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java
View File

@@ -132,20 +132,30 @@ public class PluginMessageUtil {
checkArgument(isMcBrand(message), "message is not a brand plugin message"); checkArgument(isMcBrand(message), "message is not a brand plugin message");
String toAppend = " (" + version.getName() + ")"; String toAppend = " (" + version.getName() + ")";
String currentBrand = readBrandMessage(message.content());
ByteBuf rewrittenBuf = Unpooled.buffer(); ByteBuf rewrittenBuf = Unpooled.buffer();
if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0) { if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0) {
String currentBrand = ProtocolUtils.readString(message.content().slice());
ProtocolUtils.writeString(rewrittenBuf, currentBrand + toAppend); ProtocolUtils.writeString(rewrittenBuf, currentBrand + toAppend);
} else { } else {
String currentBrand = ProtocolUtils.readStringWithoutLength(message.content().slice());
rewrittenBuf.writeBytes((currentBrand + toAppend).getBytes()); rewrittenBuf.writeBytes((currentBrand + toAppend).getBytes());
} }
return new PluginMessage(message.getChannel(), rewrittenBuf); return new PluginMessage(message.getChannel(), rewrittenBuf);
} }
private static String readBrandMessage(ByteBuf content) {
// Some clients (mostly poorly-implemented bots) do not send validly-formed brand messages.
// In order to accommodate their broken behavior, we'll first try to read in the 1.8 format, and
// if that fails, treat it as a 1.7-format message (which has no prefixed length). (The message
// Velocity sends will be in the correct format depending on the protocol.)
try {
return ProtocolUtils.readString(content.slice());
} catch (Exception e) {
return ProtocolUtils.readStringWithoutLength(content.slice());
}
}
private static final Pattern INVALID_IDENTIFIER_REGEX = Pattern.compile("[^a-z0-9\\-_]*"); private static final Pattern INVALID_IDENTIFIER_REGEX = Pattern.compile("[^a-z0-9\\-_]*");
/** /**