Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-09-28 04:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't patch keys on server-side

Browse Source
This commit is contained in:
creeper123123321 2022-11-14 17:02:29 -03:00
parent 13a50efff0
commit c8e9132e68
11 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gradle.properties
View File

@ -1,11 +1,12 @@
# suppress inspection "UnusedProperty" for whole file
# rip my ram
org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication
org.gradle.parallel=true
org.gradle.jvmargs=-Xms32M -Xmx3G -XX:+UseG1GC -XX:+UseStringDeduplication
loader_version=0.14.9
loader_version=0.14.10
viaver_version=4.4.3-SNAPSHOT
yaml_version=1.33
# example: 1.19.1-rc2
modrinth_mc_snapshot=
# example: 1.19-Snapshot
curseforge_mc_snapshot=

4
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java
View File

@ -12,7 +12,7 @@ import com.viaversion.fabric.common.util.JLoggerToLog4j;
import com.viaversion.fabric.mc119.commands.VRCommandHandler;
import com.viaversion.fabric.mc119.platform.FabricPlatform;
import com.viaversion.fabric.mc119.platform.VFLoader;
import com.viaversion.fabric.mc119.signatures1_19_0.ProtocolPatcher1_19_0;
import com.viaversion.fabric.mc119.signatures1_19.ProtocolPatcher1_19;
import com.viaversion.viaversion.ViaManagerImpl;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.data.MappingDataLoader;
@ -84,7 +84,7 @@ public class ViaFabric implements ModInitializer {
config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric")
.resolve("viafabric.yml").toFile());
ProtocolPatcher1_19_0.patch();
ProtocolPatcher1_19.patchIfClient();
INIT_FUTURE.complete(null);
}

12
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19_0/ArgumentSignatureDataMapMixin.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19/client/ArgumentSignatureDataMapMixin.java
View File

@ -1,7 +1,7 @@
package com.viaversion.fabric.mc119.mixin.signatures1_19_0;
package com.viaversion.fabric.mc119.mixin.signatures1_19.client;
import com.viaversion.fabric.mc119.signatures1_19_0.MessageSigner1_19_0;
import com.viaversion.fabric.mc119.signatures1_19_0.ProtocolPatcher1_19_0;
import com.viaversion.fabric.mc119.signatures1_19.MessageSigner1_19;
import com.viaversion.fabric.mc119.signatures1_19.ProtocolPatcher1_19;
import net.minecraft.command.argument.DecoratableArgumentList;
import net.minecraft.network.encryption.Signer;
import net.minecraft.network.message.ArgumentSignatureDataMap;
@ -20,12 +20,12 @@ import java.util.stream.Collectors;
public class ArgumentSignatureDataMapMixin {
@Inject(method = "sign", at = @At("HEAD"), cancellable = true)
private static void injectSign(DecoratableArgumentList<?> arguments, ArgumentSignatureDataMap.ArgumentSigner signer, CallbackInfoReturnable<ArgumentSignatureDataMap> cir) {
if (!ProtocolPatcher1_19_0.shouldPatchKeys) return;
if (!ProtocolPatcher1_19.shouldPatchKeys) return;
final List<ArgumentSignatureDataMap.Entry> list = ArgumentSignatureDataMap.toNameValuePairs(arguments)
.stream().map(entry -> {
final MessageMetadata metadata = MessageSigner1_19_0.pollLastMetadata();
final MessageSignatureData messageSignatureData = MessageSigner1_19_0.sign((Signer) signer,
final MessageMetadata metadata = MessageSigner1_19.pollLastMetadata();
final MessageSignatureData messageSignatureData = MessageSigner1_19.sign((Signer) signer,
Text.literal(entry.getFirst()), metadata.sender(), metadata.timestamp(), metadata.salt());
return new ArgumentSignatureDataMap.Entry(entry.getFirst(), messageSignatureData);

12
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19_0/ClientPlayerEntityMixin.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19/client/ClientPlayerEntityMixin.java
View File

@ -1,8 +1,8 @@
package com.viaversion.fabric.mc119.mixin.signatures1_19_0;
package com.viaversion.fabric.mc119.mixin.signatures1_19.client;
import com.mojang.brigadier.ParseResults;
import com.viaversion.fabric.mc119.signatures1_19_0.MessageSigner1_19_0;
import com.viaversion.fabric.mc119.signatures1_19_0.ProtocolPatcher1_19_0;
import com.viaversion.fabric.mc119.signatures1_19.MessageSigner1_19;
import com.viaversion.fabric.mc119.signatures1_19.ProtocolPatcher1_19;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.command.CommandSource;
@ -25,13 +25,13 @@ public class ClientPlayerEntityMixin {
@Inject(method = "signChatMessage", at = @At("HEAD"), cancellable = true)
public void injectSignChatMessage(MessageMetadata metadata, DecoratedContents content, LastSeenMessageList lastSeenMessages, CallbackInfoReturnable<MessageSignatureData> cir) {
if (!ProtocolPatcher1_19_0.shouldPatchKeys) return;
if (!ProtocolPatcher1_19.shouldPatchKeys) return;
try {
final Signer signer = this.client.getProfileKeys().getSigner();
if (signer != null) {
cir.setReturnValue(MessageSigner1_19_0.sign(signer, content.decorated(), metadata.sender(),
cir.setReturnValue(MessageSigner1_19.sign(signer, content.decorated(), metadata.sender(),
metadata.timestamp(), metadata.salt()));
}
} catch (Exception ignored) {
@ -41,6 +41,6 @@ public class ClientPlayerEntityMixin {
@Inject(method = "signArguments", at = @At(value = "HEAD"))
public void injectSignArguments(MessageMetadata signer, ParseResults<CommandSource> parseResults, @Nullable Text preview, LastSeenMessageList lastSeenMessages, CallbackInfoReturnable<ArgumentSignatureDataMap> cir) {
MessageSigner1_19_0.track(signer);
MessageSigner1_19.track(signer);
}
}

10
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19_0/PlayerPublicKeyChPublicKeyDataMixin.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19/client/PlayerPublicKeyChPublicKeyDataMixin.java
View File

@ -1,7 +1,7 @@
package com.viaversion.fabric.mc119.mixin.signatures1_19_0;
package com.viaversion.fabric.mc119.mixin.signatures1_19.client;
import com.viaversion.fabric.mc119.signatures1_19_0.IPublicKeyData;
import com.viaversion.fabric.mc119.signatures1_19_0.ProtocolPatcher1_19_0;
import com.viaversion.fabric.mc119.signatures1_19.IPublicKeyData;
import com.viaversion.fabric.mc119.signatures1_19.ProtocolPatcher1_19;
import net.minecraft.network.encryption.NetworkEncryptionUtils;
import net.minecraft.network.encryption.PlayerPublicKey;
import org.spongepowered.asm.mixin.Final;
@ -35,7 +35,7 @@ public class PlayerPublicKeyChPublicKeyDataMixin implements IPublicKeyData {
@Redirect(method = {"write", "verifyKey"}, at = @At(value = "FIELD", target = "Lnet/minecraft/network/encryption/PlayerPublicKey$PublicKeyData;keySignature:[B"))
public byte[] replaceKeys(PlayerPublicKey.PublicKeyData instance) {
if (this.key1_19_0 != null && ProtocolPatcher1_19_0.shouldPatchKeys) {
if (this.key1_19_0 != null && ProtocolPatcher1_19.shouldPatchKeys) {
return this.key1_19_0;
}
@ -44,7 +44,7 @@ public class PlayerPublicKeyChPublicKeyDataMixin implements IPublicKeyData {
@Inject(method = "toSerializedString", at = @At(value = "HEAD"), cancellable = true)
public void injectToSerializedString(UUID playerUuid, CallbackInfoReturnable<byte[]> cir) {
if (ProtocolPatcher1_19_0.shouldPatchKeys) {
if (ProtocolPatcher1_19.shouldPatchKeys) {
cir.setReturnValue((this.expiresAt.toEpochMilli() + NetworkEncryptionUtils.encodeRsaPublicKey(this.key)).getBytes(StandardCharsets.UTF_8));
}
}

4
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19_0/ProfileKeysMixin.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/signatures1_19/client/ProfileKeysMixin.java
View File

@ -1,7 +1,7 @@
package com.viaversion.fabric.mc119.mixin.signatures1_19_0;
package com.viaversion.fabric.mc119.mixin.signatures1_19.client;
import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
import com.viaversion.fabric.mc119.signatures1_19_0.IPublicKeyData;
import com.viaversion.fabric.mc119.signatures1_19.IPublicKeyData;
import net.minecraft.client.util.ProfileKeys;
import net.minecraft.network.encryption.PlayerPublicKey;
import org.spongepowered.asm.mixin.Mixin;

4
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/FabricVersionProvider.java
View File

@ -4,7 +4,7 @@ import com.viaversion.fabric.common.config.VFConfig;
import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider;
import com.viaversion.fabric.mc119.ViaFabric;
import com.viaversion.fabric.mc119.service.ProtocolAutoDetector;
import com.viaversion.fabric.mc119.signatures1_19_0.ProtocolPatcher1_19_0;
import com.viaversion.fabric.mc119.signatures1_19.ProtocolPatcher1_19;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import io.netty.channel.ChannelPipeline;
import net.minecraft.network.ClientConnection;
@ -31,7 +31,7 @@ public class FabricVersionProvider extends AbstractFabricVersionProvider {
@Override
public void onFinallySetVersion(int realClientsideVersion) {
ProtocolPatcher1_19_0.shouldPatchKeys = realClientsideVersion <= ProtocolVersion.v1_19.getVersion();
ProtocolPatcher1_19.shouldPatchKeys = realClientsideVersion <= ProtocolVersion.v1_19.getVersion();
}
@Override

3
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19_0/IPublicKeyData.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19/IPublicKeyData.java
View File

@ -1,8 +1,7 @@
package com.viaversion.fabric.mc119.signatures1_19_0;
package com.viaversion.fabric.mc119.signatures1_19;
import java.nio.ByteBuffer;
public interface IPublicKeyData {
void set1_19_0Key(final ByteBuffer byteBuffer);
}

4
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19_0/MessageSigner1_19_0.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19/MessageSigner1_19.java
View File

@ -1,4 +1,4 @@
package com.viaversion.fabric.mc119.signatures1_19_0;
package com.viaversion.fabric.mc119.signatures1_19;
import net.minecraft.network.encryption.Signer;
import net.minecraft.network.message.MessageMetadata;
@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.*;
public class MessageSigner1_19_0 {
public class MessageSigner1_19 {
public static final Deque<MessageMetadata> TRACKED_METADATA_LIST = new ArrayDeque<>();
public static MessageMetadata pollLastMetadata() {

21
viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19_0/ProtocolPatcher1_19_0.java → viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/signatures1_19/ProtocolPatcher1_19.java
View File

@ -1,4 +1,4 @@
package com.viaversion.fabric.mc119.signatures1_19_0;
package com.viaversion.fabric.mc119.signatures1_19;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.protocol.packet.State;
@ -7,17 +7,20 @@ import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.Protocol1_19_1To1_19;
import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader;
// This class modifies the 1.19.1 -> 1.19.0 transformers so that they simply pass through the original Minecraft key.
public class ProtocolPatcher1_19_0 {
public class ProtocolPatcher1_19 {
public static boolean shouldPatchKeys = false;
public static void patch() {
final Protocol1_19_1To1_19 protocol1_19_1To1_19 = Via.getManager().getProtocolManager().getProtocol(Protocol1_19_1To1_19.class);
public static void patchIfClient() {
if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) return;
assert protocol1_19_1To1_19 != null;
protocol1_19_1To1_19.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketRemapper() {
Protocol1_19_1To1_19 protocol = Via.getManager().getProtocolManager().getProtocol(Protocol1_19_1To1_19.class);
if (protocol == null) throw new AssertionError();
protocol.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketRemapper() {
@Override
public void registerMap() {
this.map(Type.STRING);
@ -26,13 +29,13 @@ public class ProtocolPatcher1_19_0 {
}
}, true);
protocol1_19_1To1_19.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketRemapper() {
protocol.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketRemapper() {
@Override
public void registerMap() {
}
}, true);
protocol1_19_1To1_19.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketRemapper() {
protocol.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketRemapper() {
@Override
public void registerMap() {
}

10
viafabric-mc119/src/main/resources/mixins.viafabric119.signatures.json
View File

@ -1,14 +1,14 @@
{
"required": true,
"compatibilityLevel": "JAVA_16",
"package": "com.viaversion.fabric.mc119.mixin.signatures1_19_0",
"package": "com.viaversion.fabric.mc119.mixin.signatures1_19",
"mixins": [
],
"client": [
"ArgumentSignatureDataMapMixin",
"PlayerPublicKeyChPublicKeyDataMixin",
"ClientPlayerEntityMixin",
"ProfileKeysMixin"
"client.ArgumentSignatureDataMapMixin",
"client.PlayerPublicKeyChPublicKeyDataMixin",
"client.ClientPlayerEntityMixin",
"client.ProfileKeysMixin"
],
"injectors": {
"defaultRequire": 0