Merge 1.19.4 into 1.20
This commit is contained in:
embeddedt
commit
ce8c6e0283
|
|
@ -1,201 +1,73 @@
|
||||||
package org.embeddedt.modernfix.util;
|
package org.embeddedt.modernfix.util;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
|
||||||
import org.embeddedt.modernfix.ModernFix;
|
import org.embeddedt.modernfix.ModernFix;
|
||||||
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
|
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.spongepowered.asm.mixin.MixinEnvironment;
|
||||||
|
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
|
||||||
import org.spongepowered.asm.mixin.transformer.ClassInfo;
|
import org.spongepowered.asm.mixin.transformer.ClassInfo;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.security.CodeSigner;
|
import java.util.Collection;
|
||||||
import java.util.*;
|
import java.util.Map;
|
||||||
import java.util.jar.Attributes;
|
|
||||||
|
|
||||||
public class ClassInfoManager {
|
public class ClassInfoManager {
|
||||||
private static Map<String, ClassInfo> classInfoCache = null;
|
private static boolean hasRun = false;
|
||||||
public static void clear() {
|
public static void clear() {
|
||||||
if(!ModernFixMixinPlugin.instance.isOptionEnabled("perf.clear_mixin_classinfo.ClassInfoManager"))
|
if (!ModernFixMixinPlugin.instance.isOptionEnabled("perf.clear_mixin_classinfo.ClassInfoManager") || hasRun)
|
||||||
return;
|
return;
|
||||||
if(classInfoCache == null) {
|
hasRun = true;
|
||||||
try {
|
ModernFix.resourceReloadExecutor().execute(ClassInfoManager::doClear);
|
||||||
Field field = ClassInfo.class.getDeclaredField("cache");
|
}
|
||||||
field.setAccessible(true);
|
|
||||||
classInfoCache = (Map<String, ClassInfo>)field.get(null);
|
private static Field accessible(Field f) {
|
||||||
} catch(ReflectiveOperationException | RuntimeException e) {
|
f.setAccessible(true);
|
||||||
e.printStackTrace();
|
return f;
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
}
|
private static void doClear() {
|
||||||
|
Map<String, ClassInfo> classInfoCache;
|
||||||
|
Field mixinField, stateField, classNodeField, methodsField, fieldsField;
|
||||||
|
Class<?> stateClz;
|
||||||
try {
|
try {
|
||||||
classInfoCache.entrySet().removeIf(entry -> !entry.getKey().equals("java/lang/Object") && (entry.getValue() == null || !entry.getValue().isMixin()));
|
Field field = accessible(ClassInfo.class.getDeclaredField("cache"));
|
||||||
} catch(RuntimeException e) {
|
classInfoCache = (Map<String, ClassInfo>) field.get(null);
|
||||||
|
mixinField = accessible(ClassInfo.class.getDeclaredField("mixin"));
|
||||||
|
methodsField = accessible(ClassInfo.class.getDeclaredField("methods"));
|
||||||
|
fieldsField = accessible(ClassInfo.class.getDeclaredField("fields"));
|
||||||
|
stateClz = Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo$State");
|
||||||
|
stateField = accessible(Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo").getDeclaredField("state"));
|
||||||
|
classNodeField = accessible(stateClz.getDeclaredField("classNode"));
|
||||||
|
} catch (ReflectiveOperationException | RuntimeException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
MixinEnvironment.getDefaultEnvironment().audit();
|
||||||
|
try {
|
||||||
|
ClassNode emptyNode = new ClassNode();
|
||||||
|
classInfoCache.entrySet().removeIf(entry -> {
|
||||||
|
if(entry.getKey().equals("java/lang/Object"))
|
||||||
|
return false;
|
||||||
|
ClassInfo mixinClz = entry.getValue();
|
||||||
|
try {
|
||||||
|
if(mixinClz.isMixin()) {
|
||||||
|
// clear classNode in MixinInfo.State
|
||||||
|
IMixinInfo theInfo = (IMixinInfo) mixinField.get(mixinClz);
|
||||||
|
Object state = stateField.get(theInfo);
|
||||||
|
if (state != null)
|
||||||
|
classNodeField.set(state, emptyNode);
|
||||||
|
}
|
||||||
|
// clear fields, methods
|
||||||
|
((Collection<?>)methodsField.get(mixinClz)).clear();
|
||||||
|
((Collection<?>)fieldsField.get(mixinClz)).clear();
|
||||||
|
} catch (ReflectiveOperationException | RuntimeException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
} catch (RuntimeException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
ModernFix.LOGGER.warn("Cleared mixin data structures");
|
||||||
// Clear manifest entries
|
|
||||||
int numManifestsCleared = 0;
|
|
||||||
// TODO port
|
|
||||||
/*
|
|
||||||
for(IModFileInfo mod : ModList.get().getModFiles()) {
|
|
||||||
Manifest manifest = mod.getFile().getSecureJar().moduleDataProvider().getManifest();
|
|
||||||
if(manifest.getEntries() instanceof HashMap<String, Attributes> entryMap) {
|
|
||||||
for (Map.Entry<String, Attributes> entry : entryMap.entrySet()) {
|
|
||||||
Attributes attributes = entry.getValue();
|
|
||||||
if (attributes.size() == 1 && attributes.getValue("SHA-256-Digest") != null) {
|
|
||||||
try {
|
|
||||||
entry.setValue(EmptyAttributes.INSTANCE);
|
|
||||||
numManifestsCleared++;
|
|
||||||
} catch (RuntimeException ignored) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
||||||
if(numManifestsCleared > 0)
|
|
||||||
ModernFix.LOGGER.info("Cleared {} manifest attributes", numManifestsCleared);
|
|
||||||
|
|
||||||
try {
|
|
||||||
clearSecureJarStructs();
|
|
||||||
} catch(Throwable e) {
|
|
||||||
ModernFix.LOGGER.error("Couldn't clear Jar structs", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void clearSecureJarStructs() throws Throwable {
|
|
||||||
/*
|
|
||||||
// Clear Jar signing data
|
|
||||||
Unsafe unsafe;
|
|
||||||
Field f = Unsafe.class.getDeclaredField("theUnsafe");
|
|
||||||
f.setAccessible(true);
|
|
||||||
unsafe = (Unsafe)f.get(null);
|
|
||||||
|
|
||||||
Field statusDataField, pendingSignersField, verifiedSignersField;
|
|
||||||
statusDataField = Jar.class.getDeclaredField("statusData");
|
|
||||||
pendingSignersField = Jar.class.getDeclaredField("pendingSigners");
|
|
||||||
verifiedSignersField = Jar.class.getDeclaredField("verifiedSigners");
|
|
||||||
|
|
||||||
long statusDataOffset = unsafe.objectFieldOffset(statusDataField);
|
|
||||||
long pendingSignersOffset = unsafe.objectFieldOffset(pendingSignersField);
|
|
||||||
long verifiedSignersOffset = unsafe.objectFieldOffset(verifiedSignersField);
|
|
||||||
|
|
||||||
for(IModFileInfo mod : ModList.get().getModFiles()) {
|
|
||||||
SecureJar secureJar = mod.getFile().getSecureJar();
|
|
||||||
if(secureJar instanceof Jar) {
|
|
||||||
unsafe.putObject(secureJar, statusDataOffset, LyingStatusDataMap.INSTANCE);
|
|
||||||
unsafe.putObject(secureJar, pendingSignersOffset, EmptyCodeSignerTable.INSTANCE);
|
|
||||||
unsafe.putObject(secureJar, verifiedSignersOffset, EmptyCodeSignerTable.INSTANCE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
static class EmptyCodeSignerTable extends Hashtable<String, CodeSigner[]> {
|
|
||||||
public static final EmptyCodeSignerTable INSTANCE = new EmptyCodeSignerTable();
|
|
||||||
private static final CodeSigner[] VAL = new CodeSigner[0];
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized CodeSigner[] put(String key, CodeSigner[] value) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized boolean isEmpty() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized boolean containsKey(Object key) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized CodeSigner[] get(Object key) {
|
|
||||||
return VAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This map is used to replace the statusData map.
|
|
||||||
*
|
|
||||||
* The lying in containsKey is intentionally done to force certain code paths to run in Jar.
|
|
||||||
* Otherwise the security information might be recomputed many times.
|
|
||||||
*/
|
|
||||||
static class LyingStatusDataMap implements Map<String, Object> {
|
|
||||||
public static final LyingStatusDataMap INSTANCE = new LyingStatusDataMap();
|
|
||||||
@Override
|
|
||||||
public int size() {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isEmpty() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean containsKey(Object o) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean containsValue(Object o) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object get(Object o) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Object put(String s, Object o) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object remove(Object o) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void putAll(@NotNull Map<? extends String, ?> map) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void clear() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public Set<String> keySet() {
|
|
||||||
return Collections.emptySet();
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public Collection<Object> values() {
|
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public Set<Entry<String, Object>> entrySet() {
|
|
||||||
return Collections.emptySet();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static class EmptyAttributes extends Attributes {
|
|
||||||
public static final EmptyAttributes INSTANCE = new EmptyAttributes();
|
|
||||||
EmptyAttributes() {
|
|
||||||
super(1);
|
|
||||||
this.map = ImmutableMap.of();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user