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

Merge branch 'dev/1.1.0' into dev/3.0.0

Browse Source 
# Conflicts:
#	build.gradle
This commit is contained in:
Andrew Steinborn
2021-06-07 15:32:52 -04:00
parent d7bf03b956 496372d7af
commit a65f720f9d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
View File

@@ -52,11 +52,13 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.handler.timeout.ReadTimeoutException; import io.netty.handler.timeout.ReadTimeoutException;
import java.util.Collection; import java.util.Collection;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
public class BackendPlaySessionHandler implements MinecraftSessionHandler { public class BackendPlaySessionHandler implements MinecraftSessionHandler {
private static final Pattern PLAUSIBLE_SHA1_HASH = Pattern.compile("^[a-z0-9]{40}$");
private static final Logger logger = LogManager.getLogger(BackendPlaySessionHandler.class); private static final Logger logger = LogManager.getLogger(BackendPlaySessionHandler.class);
private static final boolean BACKPRESSURE_LOG = Boolean private static final boolean BACKPRESSURE_LOG = Boolean
.getBoolean("velocity.log-server-backpressure"); .getBoolean("velocity.log-server-backpressure");
@@ -140,8 +142,10 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
.setShouldForce(packet.isRequired()); .setShouldForce(packet.isRequired());
// Why SpotBugs decides that this is unsafe I have no idea; // Why SpotBugs decides that this is unsafe I have no idea;
if (packet.getHash() != null && !Preconditions.checkNotNull(packet.getHash()).isEmpty()) { if (packet.getHash() != null && !Preconditions.checkNotNull(packet.getHash()).isEmpty()) {
if (PLAUSIBLE_SHA1_HASH.matcher(packet.getHash()).matches()) {
builder.setHash(ByteBufUtil.decodeHexDump(packet.getHash())); builder.setHash(ByteBufUtil.decodeHexDump(packet.getHash()));
} }
}
serverConn.getPlayer().queueResourcePack(builder.build()); serverConn.getPlayer().queueResourcePack(builder.build());
return true; return true;