fix: new exclusion system

skidfuscatordev · Dec 18, 2024 · 18d4aae · 18d4aae
1 parent 43bb9fb
commit 18d4aae
Show file tree

Hide file tree

Showing 17 changed files with 1,313 additions and 14 deletions.
diff --git a/dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultConfig.java b/dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultConfig.java
@@ -18,7 +18,11 @@ public DefaultConfig(Config config, String path) {
     }
 
     public List<String> getExemptions() {
-        return getStringList("exempt", Arrays.asList(DefaultExempts.DEFAULT_EXEMPTS));
+        return getStringList("exempt", new ArrayList<>());
+    }
+
+    public List<String> getExemptionsv2() {
+        return getStringList("exclude", Arrays.asList(DefaultExempts.DEFAULT_EXEMPTS_V2));
     }
 
     public boolean getBoolean(String path, final boolean dflt) {

diff --git a/dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultExempts.java b/dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultExempts.java
@@ -69,4 +69,73 @@ public class DefaultExempts {
             "class{^org\\/w3c}",
             "class{^software\\/amazon}",
     };
+
+    public static final String[] DEFAULT_EXEMPTS_V2 = {
+            // Original mappings
+            "@class com.apache.*",
+            "@class com.google.*",
+            "@class com.sun.*",
+            "@class java.*",
+            "@class javax.*",
+            "@class jdk.*",
+            "@class kotlin.*",
+            "@class org.apache.*",
+            "@class org.bouncycastle.*",
+            "@class org.eclipse.*",
+            "@class org.hibernate.*",
+            "@class org.jcp.*",
+            "@class org.joda.*",
+            "@class org.json.*",
+            "@class org.jsoup.*",
+            "@class org.mapleir.*",
+            "@class org.objectweb.*",
+            "@class org.slf4j.*",
+            "@class org.springframework.*",
+            "@class org.xml.*",
+            "@class org.yaml.*",
+            "@class sun.*",
+            "@class net.minecraft.*",
+            "@class net.sf.*",
+            "@class net.sourceforge.*",
+            "@class net.dv8tion.*",
+            "@class it.unimi.dsi.fastutil.*",
+
+            // Additional common dependencies
+            "@class com.fasterxml.*",
+            "@class com.iwebpp.*",
+            "@class com.neovisionaries.*",
+            "@class com.sun.*",
+            "@class gnu.*",
+            "@class okhttp3.*",
+            "@class okio.*",
+            "@class org.apache.*",
+            "@class org.intellij.*",
+            "@class org.jetbrains.*",
+            "@class org.java_websocket.*",
+            "@class org.slf4j.*",
+            "@class tomp2p.*",
+
+            // Additional useful frameworks and libraries
+            "@class ch.qos.logback.*",
+            "@class com.squareup.*",
+            "@class com.thoughtworks.*",
+            "@class io.netty.*",
+            "@class jakarta.*",
+            "@class net.bytebuddy.*",
+            "@class org.aspectj.*",
+            "@class org.assertj.*",
+            "@class org.checkerframework.*",
+            "@class org.codehaus.*",
+            "@class org.hamcrest.*",
+            "@class org.junit.*",
+            "@class org.mockito.*",
+            "@class org.mozilla.*",
+            "@class org.objenesis.*",
+            "@class org.openjfx.*",
+            "@class org.postgresql.*",
+            "@class org.reactivestreams.*",
+            "@class org.skyscreamer.*",
+            "@class org.w3c.*",
+            "@class software.amazon.*"
+    };
 }
diff --git a/dev.skidfuscator.obfuscator/build.gradle b/dev.skidfuscator.obfuscator/build.gradle
@@ -31,12 +31,21 @@ dependencies {
     implementation 'org.yaml:snakeyaml:1.33'
 
     testImplementation files("$buildDir/classes/jasm/test")
+    testImplementation 'org.mockito:mockito-core:4.2.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }
 
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [
+            '--add-exports', 'java.base/jdk.internal.reflect=ALL-UNNAMED',
+            '--add-exports', 'java.base/jdk.internal.util=ALL-UNNAMED'
+    ]
+}
+
 test {
     useJUnitPlatform()
 }
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
@@ -23,6 +23,7 @@
 import dev.skidfuscator.obfuscator.event.impl.transform.method.*;
 import dev.skidfuscator.obfuscator.event.impl.transform.skid.*;
 import dev.skidfuscator.obfuscator.exempt.ExemptManager;
+import dev.skidfuscator.obfuscator.exempt.v2.ExclusionParser;
 import dev.skidfuscator.obfuscator.hierarchy.Hierarchy;
 import dev.skidfuscator.obfuscator.hierarchy.SkidHierarchy;
 import dev.skidfuscator.obfuscator.io.apk.ApkInputSource;
@@ -447,11 +448,7 @@ protected void _importConfig() {
     protected void _importExempt() {
         /* Importation and exemptions */
         LOGGER.post("Importing exemptions...");
-        /*
-         * This is the parsing bit. We initiate a progress bar and
-         * simply just call the exempt analysis which builds the
-         * exclusion call and caches it.
-         */
+
         try(final ProgressWrapper progressBar = ProgressUtil.progressCheck(
                 config.getExemptions().size(),
                 "Imported " + config.getExemptions().size() + " exclusions"
@@ -462,6 +459,16 @@ protected void _importExempt() {
             }
         }
 
+        try(final ProgressWrapper progressBar = ProgressUtil.progressCheck(
+                config.getExemptionsv2().size(),
+                "Imported " + config.getExemptions().size() + " exclusions v2"
+        )) {
+            for (String s : config.getExemptionsv2()) {
+                exemptAnalysis.add(ExclusionParser.parsePatternExclusion(s));
+                progressBar.tick();
+            }
+        }
+
         LOGGER.log("Imported: \n " + exemptAnalysis.toString());
         LOGGER.log("Finished importing exemptions");
     }

diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/Exclusion.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/Exclusion.java
@@ -34,8 +34,10 @@ public boolean test(final ClassNode classNode) {
      * @return the boolean
      */
     public boolean test(final MethodNode methodNode) {
-        assert testers.containsKey(ExclusionType.METHOD) : "Trying to test with null method tester";
+        if (test(methodNode.getOwnerClass()))
+            return true;
 
+        assert testers.containsKey(ExclusionType.METHOD) : "Trying to test with null method tester";
         return testers.poll(ExclusionType.METHOD).test(methodNode);
     }
 
@@ -46,8 +48,10 @@ public boolean test(final MethodNode methodNode) {
      * @return the boolean
      */
     public boolean test(final FieldNode fieldNode) {
-        assert testers.containsKey(ExclusionType.FIELD) : "Trying to test with null field tester";
+        if (test(fieldNode.getOwnerClass()))
+            return true;
 
+        assert testers.containsKey(ExclusionType.FIELD) : "Trying to test with null field tester";
         return testers.poll(ExclusionType.FIELD).test(fieldNode);
     }
 

diff --git a/...idfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExemptManager.java b/...idfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExemptManager.java
@@ -19,6 +19,10 @@ public void add(String exempt) {
         globalExempt.add(exempt);
     }
 
+    public void add(Exclusion exclusion) {
+        globalExempt.add(exclusion);
+    }
+
     public void add(ClassNode exclusion) {
         globalExempt.add(exclusion);
     }

diff --git a/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/SimpleExemptAnalysis.java b/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/SimpleExemptAnalysis.java
@@ -28,6 +28,10 @@ public void add(final String exclusionStr) {
         //System.out.println(this);
     }
 
+    public void add(final Exclusion exclusion) {
+        exclusions.add(exclusion);
+    }
+
     @Override
     public void add(ClassNode exclusion) {
         classCache.put(exclusion, true);