MirrorHub/authlib-injector
0
0
Fork 1
mirror of https://github.com/yushijinhun/authlib-injector.git synced 2024-11-15 06:11:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow whitelisted domains to be changed at runtime

Browse source
This commit is contained in:
yushijinhun 2019-01-24 20:27:39 +08:00
parent 754e151b41
commit 90d37f9d0f
No known key found for this signature in database
GPG key ID: 5BC167F73EA558E4
2 changed files with 52 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java
View file

@ -356,7 +356,8 @@ public final class AuthlibInjector {
transformer.units.add(new ConstantURLTransformUnit(urlProcessor)); transformer.units.add(new ConstantURLTransformUnit(urlProcessor));
transformer.units.add(new CitizensTransformer()); transformer.units.add(new CitizensTransformer());
transformer.units.add(new SkinWhitelistTransformUnit(config.getSkinDomains().toArray(new String[0]))); transformer.units.add(new SkinWhitelistTransformUnit());
SkinWhitelistTransformUnit.getWhitelistedDomains().addAll(config.getSkinDomains());
transformer.units.add(new YggdrasilKeyTransformUnit()); transformer.units.add(new YggdrasilKeyTransformUnit());
config.getDecodedPublickey().ifPresent(YggdrasilKeyTransformUnit.getPublicKeys()::add); config.getDecodedPublickey().ifPresent(YggdrasilKeyTransformUnit.getPublicKeys()::add);

122
src/main/java/moe/yushi/authlibinjector/transform/support/SkinWhitelistTransformUnit.java
View file

@ -16,26 +16,56 @@
*/ */
package moe.yushi.authlibinjector.transform.support; package moe.yushi.authlibinjector.transform.support;
import static org.objectweb.asm.Opcodes.AASTORE; import static org.objectweb.asm.Opcodes.ALOAD;
import static org.objectweb.asm.Opcodes.ANEWARRAY;
import static org.objectweb.asm.Opcodes.ASM7; import static org.objectweb.asm.Opcodes.ASM7;
import static org.objectweb.asm.Opcodes.DUP; import static org.objectweb.asm.Opcodes.IRETURN;
import static org.objectweb.asm.Opcodes.ICONST_0;
import static org.objectweb.asm.Opcodes.ICONST_1; import java.net.URI;
import static org.objectweb.asm.Opcodes.ICONST_2; import java.net.URISyntaxException;
import static org.objectweb.asm.Opcodes.SIPUSH; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.MethodVisitor;
import moe.yushi.authlibinjector.transform.CallbackMethod;
import moe.yushi.authlibinjector.transform.CallbackSupport;
import moe.yushi.authlibinjector.transform.TransformUnit; import moe.yushi.authlibinjector.transform.TransformUnit;
public class SkinWhitelistTransformUnit implements TransformUnit { public class SkinWhitelistTransformUnit implements TransformUnit {
private String[] skinWhitelist; private static final String[] DEFAULT_WHITELISTED_DOMAINS = {
".minecraft.net",
".mojang.com"
};
public SkinWhitelistTransformUnit(String[] skinWhitelist) { private static final List<String> WHITELISTED_DOMAINS = new CopyOnWriteArrayList<>();
this.skinWhitelist = skinWhitelist;
public static List<String> getWhitelistedDomains() {
return WHITELISTED_DOMAINS;
}
@CallbackMethod
public static boolean isWhitelistedDomain(String url) {
String domain;
try {
domain = new URI(url).getHost();
} catch (URISyntaxException e) {
throw new IllegalArgumentException("Invalid URL '" + url + "'");
}
for (String whitelisted : DEFAULT_WHITELISTED_DOMAINS) {
if (domain.endsWith(whitelisted)) {
return true;
}
}
for (String whitelisted : WHITELISTED_DOMAINS) {
if (domain.endsWith(whitelisted)) {
return true;
}
}
return false;
} }
@Override @Override
@ -45,68 +75,16 @@ public class SkinWhitelistTransformUnit implements TransformUnit {
@Override @Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
if ("<clinit>".equals(name)) { if ("isWhitelistedDomain".equals(name) && "(Ljava/lang/String;)Z".equals(desc)) {
return new MethodVisitor(ASM7, super.visitMethod(access, name, desc, signature, exceptions)) { ctx.markModified();
MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
int status = 0; mv.visitCode();
mv.visitVarInsn(ALOAD, 0);
@Override CallbackSupport.invoke(ctx, mv, SkinWhitelistTransformUnit.class, "isWhitelistedDomain");
public void visitInsn(int opcode) { mv.visitInsn(IRETURN);
if (status == 0 && opcode == ICONST_2) { mv.visitMaxs(-1, -1);
status++; mv.visitEnd();
} else if ((status == 2 || status == 6) && opcode == DUP) { return null;
status++;
} else if (status == 3 && opcode == ICONST_0) {
status++;
} else if ((status == 5 || status == 9) && opcode == AASTORE) {
status++;
if (status == 10) {
ctx.markModified();
super.visitIntInsn(SIPUSH, skinWhitelist.length + 2);
super.visitTypeInsn(ANEWARRAY, "java/lang/String");
super.visitInsn(DUP);
super.visitInsn(ICONST_0);
super.visitLdcInsn(".minecraft.net");
super.visitInsn(AASTORE);
super.visitInsn(DUP);
super.visitInsn(ICONST_1);
super.visitLdcInsn(".mojang.com");
super.visitInsn(AASTORE);
for (int i = 0; i < skinWhitelist.length; i++) {
super.visitInsn(DUP);
super.visitIntInsn(SIPUSH, i + 2);
super.visitLdcInsn(skinWhitelist[i]);
super.visitInsn(AASTORE);
}
}
} else if (status == 7 && opcode == ICONST_1) {
status++;
} else {
super.visitInsn(opcode);
}
}
@Override
public void visitTypeInsn(int opcode, String type) {
if (status == 1 && opcode == ANEWARRAY && "java/lang/String".equals(type)) {
status++;
} else {
super.visitTypeInsn(opcode, type);
}
}
@Override
public void visitLdcInsn(Object cst) {
if (status == 4 && ".minecraft.net".equals(cst)) {
status++;
} else if (status == 8 && ".mojang.com".equals(cst)) {
status++;
} else {
super.visitLdcInsn(cst);
}
}
};
} else { } else {
return super.visitMethod(access, name, desc, signature, exceptions); return super.visitMethod(access, name, desc, signature, exceptions);
} }