Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-09-29 06:30:16 +02:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Check if the resource pack hash looks like it might be a SHA-1 hash

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2021-06-07 15:32:36 -04:00
Ursprung 224e06d7ea
Commit 496372d7af
1 geänderte Dateien mit 5 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
Datei anzeigen

@ -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,7 +142,9 @@ 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()) {
builder.setHash(ByteBufUtil.decodeHexDump(packet.getHash())); if (PLAUSIBLE_SHA1_HASH.matcher(packet.getHash()).matches()) {
builder.setHash(ByteBufUtil.decodeHexDump(packet.getHash()));
}
} }
serverConn.getPlayer().queueResourcePack(builder.build()); serverConn.getPlayer().queueResourcePack(builder.build());