morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

1.20.4 (#325)

Browse Source
This commit is contained in:
Avilad
2024-02-22 12:41:08 -06:00
committed by GitHub
parent bf6f7c5e64
commit 52bf7cce6e
11 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilLogin.java
View File

@@ -6,12 +6,17 @@ import com.google.common.collect.Iterables;
import com.google.gson.*;
import com.mojang.authlib.Environment;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.SignatureState;
import com.mojang.authlib.exceptions.AuthenticationException;
import com.mojang.authlib.minecraft.InsecurePublicKeyException;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTextures;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.yggdrasil.TextureUrlChecker;
import com.mojang.authlib.yggdrasil.ServicesKeyInfo;
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
import com.mojang.authlib.yggdrasil.YggdrasilServicesKeyInfo;
import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
import com.mojang.util.UUIDTypeAdapter;
import meteordevelopment.meteorclient.utils.network.Http;
@@ -31,7 +36,7 @@ import java.util.*;
import static meteordevelopment.meteorclient.MeteorClient.mc;
public class CustomYggdrasilLogin {
public static Environment localYggdrasilApi = new Environment("/api", "/sessionserver", "/minecraftservices", "Custom-Yggdrasil");
public static Environment localYggdrasilApi = new Environment("/sessionserver", "/minecraftservices", "Custom-Yggdrasil");
public static Session login(String name, String password, String server) throws AuthenticationException {
try {
@@ -61,7 +66,7 @@ public class CustomYggdrasilLogin {
public static class LocalYggdrasilMinecraftSessionService extends YggdrasilMinecraftSessionService {
private static final Logger LOGGER = LogManager.getLogger();
private final PublicKey publicKey;
private final ServicesKeyInfo publicKey;
private final Gson gson = new GsonBuilder().registerTypeAdapter(UUID.class, new UUIDTypeAdapter()).create();
public LocalYggdrasilMinecraftSessionService(YggdrasilAuthenticationService service, String serverUrl) {
@@ -71,50 +76,53 @@ public class CustomYggdrasilLogin {
this.publicKey = getPublicKey(json.get("signaturePublickey").getAsString());
}
private static PublicKey getPublicKey(String key) {
private static ServicesKeyInfo getPublicKey(String key) {
key = key.replace("-----BEGIN PUBLIC KEY-----", "").replace("-----END PUBLIC KEY-----", "");
try {
byte[] byteKey = Base64.getDecoder().decode(key.replace("\n", ""));
X509EncodedKeySpec spec = new X509EncodedKeySpec(byteKey);
KeyFactory factory = KeyFactory.getInstance("RSA");
return factory.generatePublic(spec);
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
return YggdrasilServicesKeyInfo.parse(byteKey);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
return null;
}
@Override
public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(final GameProfile profile, final boolean requireSecure) {
final Property textureProperty = Iterables.getFirst(profile.getProperties().get("textures"), null);
if (textureProperty == null)
return new HashMap<>();
if (requireSecure) {
if (!textureProperty.hasSignature()) {
LOGGER.error("Signature is missing from textures payload");
throw new InsecurePublicKeyException("Signature is missing from textures payload");
}
if (!textureProperty.isSignatureValid(publicKey)) {
LOGGER.error("Textures payload has been tampered with (signature invalid)");
throw new InsecurePublicKeyException("Textures payload has been tampered with (signature invalid)");
}
private SignatureState getPropertySignatureState(final Property property) {
if (!property.hasSignature()) {
return SignatureState.UNSIGNED;
}
if (!publicKey.validateProperty(property)) {
return SignatureState.INVALID;
}
return SignatureState.SIGNED;
}
@Override
public MinecraftProfileTextures unpackTextures(final Property packedTextures) {
final String value = packedTextures.value();
final SignatureState signatureState = getPropertySignatureState(packedTextures);
final MinecraftTexturesPayload result;
try {
final String json = new String(org.apache.commons.codec.binary.Base64.decodeBase64(textureProperty.value()), StandardCharsets.UTF_8);
final String json = new String(Base64.getDecoder().decode(value), StandardCharsets.UTF_8);
result = gson.fromJson(json, MinecraftTexturesPayload.class);
} catch (final JsonParseException e) {
} catch (final JsonParseException | IllegalArgumentException e) {
LOGGER.error("Could not decode textures payload", e);
return new HashMap<>();
return MinecraftProfileTextures.EMPTY;
}
if (result == null || result.textures() == null)
return new HashMap<>();
if (result == null || result.textures() == null || result.textures().isEmpty()) {
return MinecraftProfileTextures.EMPTY;
}
return result.textures();
final Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> textures = result.textures();
return new MinecraftProfileTextures(
textures.get(MinecraftProfileTexture.Type.SKIN),
textures.get(MinecraftProfileTexture.Type.CAPE),
textures.get(MinecraftProfileTexture.Type.ELYTRA),
signatureState
);
}
}