Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-12-27 17:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented legacy public key signature

Browse Source
This commit is contained in:
FlorianMichael 2023-05-05 20:24:20 +02:00
parent 193b0c2735
commit d0debf1d94
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/florianmichael/viafabricplus/injection/access/IKeyPairResponse.java Normal file
View File

@ -0,0 +1,8 @@
package de.florianmichael.viafabricplus.injection.access;
import java.nio.ByteBuffer;
public interface IKeyPairResponse {
ByteBuffer viafabricplus_getLegacyPublicKeySignature();
}

20
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java Normal file
View File

@ -0,0 +1,20 @@
package de.florianmichael.viafabricplus.injection.mixin.fixes.authlib;
import com.google.gson.annotations.SerializedName;
import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
import de.florianmichael.viafabricplus.injection.access.IKeyPairResponse;
import org.spongepowered.asm.mixin.Mixin;
import java.nio.ByteBuffer;
@Mixin(KeyPairResponse.class)
public class MixinKeyPairResponse implements IKeyPairResponse {
@SerializedName("publicKeySignature")
private ByteBuffer viafabricplus_legacyKeySignature;
@Override
public ByteBuffer viafabricplus_getLegacyPublicKeySignature() {
return this.viafabricplus_legacyKeySignature;
}
}

4
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
View File

@ -18,6 +18,7 @@
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
import de.florianmichael.viafabricplus.injection.access.IKeyPairResponse;
import de.florianmichael.viafabricplus.injection.access.IPublicKeyData;
import net.minecraft.client.util.ProfileKeysImpl;
import net.minecraft.network.encryption.PlayerPublicKey;
@ -31,7 +32,6 @@ public class MixinProfileKeysImpl {
@Inject(method = "decodeKeyPairResponse", at = @At("RETURN"))
private static void trackLegacyKey(KeyPairResponse keyPairResponse, CallbackInfoReturnable<PlayerPublicKey.PublicKeyData> cir) {
// ((IPublicKeyData) (Object) cir.getReturnValue()).viafabricplus_setV1Key(keyPairResponse.getLegacyPublicKeySignature());
// TODO | Track Key
((IPublicKeyData) (Object) cir.getReturnValue()).viafabricplus_setV1Key(((IKeyPairResponse) keyPairResponse).viafabricplus_getLegacyPublicKeySignature());
}
}

3
src/main/resources/viafabricplus.mixins.json
View File

@ -158,7 +158,8 @@
"fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread",
"jsonwebtoken.MixinClasses",
"jsonwebtoken.MixinDefaultCompressionCodecResolver",
"jsonwebtoken.MixinDefaultJwtParserBuilder"
"jsonwebtoken.MixinDefaultJwtParserBuilder",
"fixes.authlib.MixinKeyPairResponse"
],
"injectors": {
"defaultRequire": 1