fix(obf): fixed exclusions properly

Author: terminalsin

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java

@@ -127,7 +127,7 @@ public Integer call()  {
                 "                               │ "              + topMemory +            " │",
                 "                               └───────────────────────────────────────────┘",
                 "",
-                "                      Author: Ghast     Version: 2.0.5     Today: "
+                "                      Author: Ghast     Version: 2.0.6     Today: "
                         + DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())),
                 ""
         };

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

@@ -186,9 +186,9 @@ public void run() {
                 .build();
         LOGGER.log("Finished resolving predicate analysis!");
 
+        _importExempt();
         _importClasspath();
         _importJvm();
-        _importExempt();
 
         if (!session.isFuckIt()) {
             _verify();
@@ -292,6 +292,7 @@ public void run() {
         LOGGER.log("Finished dumping classes...");
         EventBus.end();
 
+        _cleanup();
         _dump();
 
         SkidProgressBar.RENDER_THREAD.shutdown();
@@ -362,6 +363,7 @@ protected void _importExempt() {
                         progressBar.tick();
                     }
                 }
+                LOGGER.log("Imported: \n " + exemptAnalysis.toString());
             } catch (IOException ex) {
                 /*
                  * If there's any error, it can pose significant issues with
@@ -522,7 +524,7 @@ protected void _loadTransformer() {
 
     public List<Transformer> getTransformers() {
         return Arrays.asList(
-                /*new StringTransformer(this),
+                new StringTransformer(this),
                 //new NegationTransformer(this),
                 //new FlatteningFlowTransformer(this),
                 new NumberTransformer(this),
@@ -531,7 +533,7 @@ public List<Transformer> getTransformers() {
                 new BasicConditionTransformer(this),
                 new BasicExceptionTransformer(this),
                 new BasicRangeTransformer(this),
-                new AhegaoTransformer(this)*/
+                new AhegaoTransformer(this)
                 //new SimpleOutlinerTransformer()
                 //
         );
@@ -561,6 +563,13 @@ private void _verify() {
         LOGGER.log("Finished verification!");
     }
 
+    protected void _cleanup() {
+        this.hierarchy = null;
+        this.irFactory = null;
+        this.predicateAnalysis = null;
+        System.gc();
+    }
+
     protected void _dump() {
         LOGGER.post("Dumping jar...");
         try {

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java

@@ -78,9 +78,23 @@ public boolean test(ClassNode var) {
                                             .match("private", var.isPrivate())
                                             .check();
 
+                                    assert initialMatch : "Failed initial match: " + parsed + " got:" + var;
+                                    assert !var.getName().contains(".") : "Got weird name: " + var.getName();
 
-                                    return initialMatch
+                                    final boolean ret =  initialMatch
                                             && (regex.matcher(var.getName()).find() || parsed.equals(var.getName()));
+
+                                    if (var.getName().equals("jda")) {
+                                        System.out.println("JDA! " + var.getName() + " --> " + ret);
+                                    }
+
+                                    assert var.getName().contains("jda") == ret : "name: " + var.getName() + " parser: " + parsed;
+                                    return ret;
+                                }
+
+                                @Override
+                                public String toString() {
+                                    return regex.pattern();
                                 }
                             });
 
@@ -109,11 +123,11 @@ public boolean test(MethodNode var) {
                                         return false;
                                     }
 
-                                    if (descRegex != null && !descRegex.matcher(var.getDesc()).matches()) {
+                                    if (descRegex != null && !descRegex.matcher(var.getDesc()).lookingAt()) {
                                         return false;
                                     }
 
-                                    return regexMethod.matcher(var.getName()).find() || parsed.equals(var.getName());
+                                    return regexMethod.matcher(var.getName()).lookingAt() || parsed.equals(var.getName());
                                             //&& regexClazz.matcher(var.owner.getDisplayName()).matches();
                                 }
 
@@ -144,8 +158,8 @@ public boolean test(FieldNode var) {
                                             .check();
 
                                     return initialMatch
-                                            && regexField.matcher(var.getDisplayName()).matches()
-                                            && regexClazz.matcher(var.owner.getDisplayName()).matches();
+                                            && regexField.matcher(var.getDisplayName()).lookingAt()
+                                            && regexClazz.matcher(var.owner.getDisplayName()).lookingAt();
                                 }
                             });
                             break;

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/hierarchy/SkidHierarchy.java

@@ -83,7 +83,10 @@ public void accept(ClassNode node) {
                 }
             }
 
-            node.getMethods().stream().sorted(new Comparator<MethodNode>() {
+            node.getMethods()
+                    .stream()
+                    .filter(e -> !skidfuscator.getExemptAnalysis().isExempt(e))
+                    .sorted(new Comparator<MethodNode>() {
                 @Override
                 public int compare(MethodNode o1, MethodNode o2) {
                     final Parameter parameter1 = new Parameter(o1.getDesc());
@@ -187,14 +190,16 @@ public void cache() {
         this.annotations = new HashMap<>();
 
         try (ProgressWrapper progressBar = ProgressUtil.progress(skidfuscator.getClassSource().size())){
-            nodes = skidfuscator.getClassSource()
+            nodes = skidfuscator
+                    .getClassSource()
                     .getClassTree()
                     .vertices()
                     .stream()
                     .filter(e -> {
                         progressBar.tick();
                         return skidfuscator.getClassSource().isApplicationClass(e.getName());
                     })
+                    .filter(e -> !skidfuscator.getExemptAnalysis().isExempt(e))
                     .collect(Collectors.toList());
         }
 

dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/exclusion/StringExclusionTest.java

@@ -0,0 +1,23 @@
+package dev.skidfuscator.test.exclusion;
+
+import dev.skidfuscator.obfuscator.exempt.ExemptAnalysis;
+import dev.skidfuscator.obfuscator.exempt.SimpleExemptAnalysis;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class StringExclusionTest {
+    private ExemptAnalysis analysis;
+
+    @BeforeEach
+    public void init() {
+        this.analysis = new SimpleExemptAnalysis();
+    }
+
+    @Test
+    public void testJda() {
+        final String jdaExempt = "^jda\\/";
+        final String[] jdaClasses = {};
+    }
+
+}

gradle/wrapper/gradle-wrapper.properties

@@ -3,3 +3,5 @@ distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+gradle.publish.key=MWBasmHJWf7vbXU6rKeT07cRfXIshv5C
+gradle.publish.secret=1nhGe7kmqKJfxmo1PZjjpCSo2ALAYF2X