fix(obfuscator): make entrypoint analysis properly iterate all blocks

Author: terminalsin

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/predicate/renderer/impl/IntegerBlockPredicateRenderer.java

@@ -88,6 +88,8 @@ void handle(final InitMethodTransformEvent event) {
                 .getLocals()
                 .get(methodNode.getCfg().getLocals().getMaxLocals() + 3);
 
+        methodNode.getEntryBlock();
+
         /*
          * The getter right now is quite simple:
          *

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/skidasm/SkidMethodNode.java

@@ -230,7 +230,8 @@ public BasicBlock getEntryBlock() {
 
         initBlock.setFlag(SkidBlock.FLAG_NO_OPAQUE, true);
 
-        cfg.getPredecessors(initBlock).forEach(vertex -> {
+
+        cfg.getAllChildren(initBlock).forEach(vertex -> {
             if (IntegerBlockPredicateRenderer.DEBUG) {
                 final Local debugLocal = cfg.getLocals().get(cfg.getLocals().getMaxLocals() + 2);
                 vertex.add(

dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/core/TestSkidfuscator.java

@@ -166,12 +166,20 @@ protected void _dump() {
                     } catch (Exception ex) {
                         ex.printStackTrace();
 
-                        final ClassWriter writer = resolver.buildClassWriter(tree, ClassWriter.COMPUTE_MAXS);
-                        e.node.accept(writer); // must use custom writer which overrides getCommonSuperclass
-                        bytes.set(writer.toByteArray());
-                        System.err.println("\rFailed to write " + e.getName()
-                                + "! Writing with COMPUTE_MAXS, " +
-                                "which may cause runtime abnormalities\n");
+                        try {
+                            final ClassWriter writer = resolver.buildClassWriter(tree, ClassWriter.COMPUTE_MAXS);
+                            e.node.accept(writer); // must use custom writer which overrides getCommonSuperclass
+                            bytes.set(writer.toByteArray());
+                            System.err.println("\rFailed to write " + e.getName()
+                                    + "! Writing with COMPUTE_MAXS, " +
+                                    "which may cause runtime abnormalities\n");
+                        } catch (Exception ex2) {
+                            System.err.println("\rFailed to write " + e.getName()
+                                    + "!");
+
+                            bytes.set(jarContents.getClassContents().namedMap().get(e.getName() + ".class").getData());
+                        }
+
                     }
                     dataMap.add(new Map.Entry<String, byte[]>() {
                         @Override

dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/EncryptionTest.java

@@ -11,10 +11,12 @@ public void simpleStringEncryptTest() {
         final String string = RandomUtil.randomAlphabeticalString(10);
 
         final Integer[] keysT = this._genKeys();
+
+        final BasicEncryptionGenerator generator = new BasicEncryptionGenerator(keysT);
         final int seed = this._genSeed();
 
-        final String encrypted = BasicEncryptionGenerator.encrypt(string, seed, keysT);
-        final String decrypted = BasicEncryptionGenerator.decrypt(encrypted, seed, keysT);
+        final String encrypted = generator.encrypt(string, seed);
+        final String decrypted = generator.decrypt(encrypted, seed);
 
         assert string.equals(decrypted) : "Encrypted string failed: " + string + " became " + decrypted;
         System.out.println("Passed Encryption Test #1");
@@ -25,10 +27,11 @@ public void simpleStringEncryptTestUTF8() {
         final String string = "Œüèé€ìàò";
 
         final Integer[] keysT = this._genKeys();
+        final BasicEncryptionGenerator generator = new BasicEncryptionGenerator(keysT);
         final int seed = this._genSeed();
 
-        final String encrypted = BasicEncryptionGenerator.encrypt(string, seed, keysT);
-        final String decrypted = BasicEncryptionGenerator.decrypt(encrypted, seed, keysT);
+        final String encrypted = generator.encrypt(string, seed);
+        final String decrypted = generator.decrypt(encrypted, seed);
 
         assert string.equals(decrypted) : "Encrypted string failed: " + string + " became " + decrypted;
         System.out.println("Passed Encryption Test #2");

org.mapleir.parent/org.mapleir.app-services/src/main/java/org/mapleir/app/service/ClassTree.java

@@ -103,19 +103,19 @@ private Collection<ClassNode> __getnodes(Collection<? extends FastGraphEdge<Clas
 	}
 
 	// returns a topoorder (supers first) traversal of the graph starting from cn.
-	public List<ClassNode> getAllParents(ClassNode cn) {
-		if(!containsVertex(cn)) {
+	public List<ClassNode> getAllParents(ClassNode d) {
+		if(!containsVertex(d)) {
 			return new ArrayList<>();
 		}
-		return SimpleDfs.topoorder(this, cn, false);
+		return SimpleDfs.topoorder(this, d, false);
 	}
 
 	// returns a postorder traversal of the graph starting from cn following edges in opposite direction.
-	public List<ClassNode> getAllChildren(ClassNode cn) {
-		if(!containsVertex(cn)) {
+	public List<ClassNode> getAllChildren(ClassNode d) {
+		if(!containsVertex(d)) {
 			return new ArrayList<>();
 		}
-		return SimpleDfs.postorder(this, cn, true);
+		return SimpleDfs.postorder(this, d, true);
 	}
 
 	/**

org.mapleir.parent/org.mapleir.stdlib/src/main/java/org/mapleir/stdlib/collections/graph/FastDirectedGraph.java

@@ -7,6 +7,7 @@
 
 import org.mapleir.dot4j.model.DotGraph;
 import org.mapleir.propertyframework.api.IPropertyDictionary;
+import org.mapleir.stdlib.collections.graph.algorithms.SimpleDfs;
 
 public abstract class FastDirectedGraph<N extends FastGraphVertex, E extends FastGraphEdge<N>> implements FastGraph<N, E>{
 
@@ -161,6 +162,20 @@ public Stream<N> getPredecessors(N v) {
 		return getReverseEdges(v).stream().map(E::src);
 	}
 
+	public List<N> getAllParents(N d) {
+		if(!containsVertex(d)) {
+			return new ArrayList<>();
+		}
+		return SimpleDfs.topoorder(this, d, false);
+	}
+
+	public List<N> getAllChildren(N d) {
+		if(!containsVertex(d)) {
+			return new ArrayList<>();
+		}
+		return SimpleDfs.postorder(this, d, true);
+	}
+
 	@Override
 	public int size() {
 		return map.size();