From 40caf973abfbec14a0fad688e556ec6e1376dd38 Mon Sep 17 00:00:00 2001 From: Graham Date: Thu, 1 Aug 2019 16:15:08 +0100 Subject: [PATCH] Log warning if an unobfuscated name is remapped --- .../openrs2/deob/classpath/TypedRemapper.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java b/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java index 1c9a2d8f8e..98248d821a 100644 --- a/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java +++ b/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java @@ -15,8 +15,12 @@ import dev.openrs2.util.collect.DisjointSet; import dev.openrs2.util.collect.ForestDisjointSet; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Remapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TypedRemapper extends Remapper { + private static final Logger logger = LoggerFactory.getLogger(TypedRemapper.class); + public static final Set EXCLUDED_CLASSES = Set.of( "client", "jagex3/jagmisc/jagmisc", @@ -34,6 +38,7 @@ public final class TypedRemapper extends Remapper { public static final Set EXCLUDED_FIELDS = Set.of( "cache" ); + private static final int MAX_OBFUSCATED_NAME_LEN = 2; public static TypedRemapper create(ClassPath classPath) { var libraryClasses = classPath.getLibraryClasses(); @@ -45,9 +50,32 @@ public final class TypedRemapper extends Remapper { var fields = createFieldMapping(classPath, inheritedFieldSets, classes); var methods = createMethodMapping(classPath, inheritedMethodSets); + verifyMapping(classes); + verifyMemberMapping(fields); + verifyMemberMapping(methods); + return new TypedRemapper(classes, fields, methods); } + private static void verifyMapping(Map mapping) { + for (var entry : mapping.entrySet()) { + verifyMapping(entry.getKey(), entry.getValue()); + } + } + + private static void verifyMemberMapping(Map mapping) { + for (var entry : mapping.entrySet()) { + verifyMapping(entry.getKey().getName(), entry.getValue()); + } + } + + private static void verifyMapping(String name, String mappedName) { + name = name.replaceAll("^(?:loader|unpacker)_", ""); + if (name.length() > MAX_OBFUSCATED_NAME_LEN && !name.equals(mappedName)) { + logger.warn("Remapping probably unobfuscated name {} to {}", name, mappedName); + } + } + private static DisjointSet createInheritedFieldSets(List classes) { var disjointSet = new ForestDisjointSet(); var ancestorCache = new HashMap>();