Publish some transformers

ThisTestUser · ThisTestUser · commit aaff183931e0 · 2020-05-11T17:01:11.000-04:00
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/Deobfuscator.java b/src/main/java/com/javadeobfuscator/deobfuscator/Deobfuscator.java
@@ -75,6 +75,13 @@ public Deobfuscator(Configuration configuration) {
      * Must enable for paramorphism obfuscated files.
      */
     private static final boolean PARAMORPHISM = false;
+    
+    public List<String> junkFiles = new ArrayList<>();
+    
+    /**
+     * Must enable for paramorphism v2 obfuscated files.
+     */
+    private static final boolean PARAMORPHISM_V2 = false;
 
     public ConstantPool getConstantPool(ClassNode classNode) {
         return this.constantPools.get(classNode);
@@ -168,7 +175,21 @@ private boolean isClassIgnored(ClassNode classNode) {
     }
 
     private void loadInput() throws IOException {
-    	if(PARAMORPHISM)
+    	if(PARAMORPHISM_V2)
+    	{
+    		//Load folder "classes"
+    		try(ZipFile zipIn = new ZipFile(configuration.getInput())) {
+	            Enumeration<? extends ZipEntry> e = zipIn.entries();
+	            while(e.hasMoreElements()) {
+	                ZipEntry next = e.nextElement();
+	                if(next.isDirectory() && next.getName().endsWith(".class/")) {
+	                	byte[] data = IOUtils.toByteArray(zipIn.getInputStream(next));
+	                	loadInput(next.getName().substring(0, next.getName().length() - 1), data);
+	                }else if(!next.isDirectory() && next.getName().contains(".class/"))
+	                	junkFiles.add(next.getName());
+	            }
+    		}
+    	}else if(PARAMORPHISM)
     	{
     		Map<String, String> classNameToName = new HashMap<>();
     		Map<String, byte[]> entries = new HashMap<>();
@@ -255,13 +276,19 @@ public void loadInput(String name, byte[] data) {
                     classpath.put(node.name, node);
                 }
             } catch (IllegalArgumentException x) {
-            	logger.error("Could not parse {} (is it a class file?)", name, x);
+            	if(PARAMORPHISM_V2)
+            		invaildClasses.put(name, data);
+            	else
+            		logger.error("Could not parse {} (is it a class file?)", name, x);
             } catch (ArrayIndexOutOfBoundsException x) {
-            	logger.error("Could not parse {} (is it a class file?)", name, x);
+            	if(PARAMORPHISM_V2)
+            		invaildClasses.put(name, data);
+            	else
+            		logger.error("Could not parse {} (is it a class file?)", name, x);
             }
         }
 
-        if (passthrough) {
+        if (passthrough && !junkFiles.contains(name)) {
             inputPassthrough.put(name, data);
         }
     }
@@ -316,11 +343,11 @@ public void start() throws Throwable {
                 logger.info("\t{}", message);
                 logger.info("Recommend transformers:");
 
-                Collection<Class<? extends Transformer>> recommended = rule.getRecommendTransformers();
+                Collection<Class<? extends Transformer<?>>> recommended = rule.getRecommendTransformers();
                 if (recommended == null) {
                     logger.info("\tNone");
                 } else {
-                    for (Class<? extends Transformer> transformer : recommended) {
+                    for (Class<? extends Transformer<?>> transformer : recommended) {
                         logger.info("\t{}", transformer.getName());
                     }
                 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/types/JavaMethodHandle.java b/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/types/JavaMethodHandle.java
@@ -16,7 +16,7 @@
 
 package com.javadeobfuscator.deobfuscator.executor.defined.types;
 
-public class JavaMethodHandle {
+public class JavaMethodHandle extends JavaHandle {
     public final String clazz;
     public final String name;
     public final String desc;
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/executor/values/JavaValue.java b/src/main/java/com/javadeobfuscator/deobfuscator/executor/values/JavaValue.java
@@ -20,19 +20,13 @@
 
 import com.google.common.primitives.Primitives;
 import com.javadeobfuscator.deobfuscator.executor.MethodExecutor;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaClass;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaConstantPool;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaConstructor;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaField;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaMethod;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaMethodHandle;
-import com.javadeobfuscator.deobfuscator.executor.defined.types.JavaThread;
+import com.javadeobfuscator.deobfuscator.executor.defined.types.*;
 import com.javadeobfuscator.deobfuscator.executor.exceptions.ExecutionException;
 
 public abstract class JavaValue {
-    
-    public boolean booleanValue() { 
-        throw new ExecutionException(new UnsupportedOperationException()); 
+
+    public boolean booleanValue() {
+        throw new ExecutionException(new UnsupportedOperationException());
     }
 
     public int intValue() {
@@ -56,6 +50,9 @@ public Object value() {
     }
 
     public <T> T as(Class<T> clazz) {
+    	//TODO: Fix this
+    	if(value() instanceof JavaValue)
+    		return ((JavaValue)value()).as(clazz);
         if (Primitives.unwrap(clazz) != clazz) {
             throw new ExecutionException("Cannot call as(Class<T> clazz) with a primitive class");
         }
@@ -88,7 +85,7 @@ else if(cst.getClass().isArray())
     		return new JavaObject(cst, "java/lang/Object");
     	else if(cst instanceof JavaThread)
     		return new JavaObject(cst, "java/lang/Thread");
-    	else if(cst instanceof JavaMethodHandle)
+    	else if(cst instanceof JavaHandle)
     		return new JavaObject(cst, "java/lang/invoke/MethodHandle");
     	else if(cst instanceof JavaMethod)
     		return new JavaObject(cst, "java/lang/reflect/Method");
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/Rule.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/Rule.java
@@ -27,5 +27,5 @@ public interface Rule extends Opcodes {
 
     String test(Deobfuscator deobfuscator);
 
-    Collection<Class<? extends Transformer>> getRecommendTransformers();
+    Collection<Class<? extends Transformer<?>>> getRecommendTransformers();
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleClassGuardPackage.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleClassGuardPackage.java
@@ -41,7 +41,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(EncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java
@@ -41,7 +41,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(EncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/dasho/RuleStringDecryptor.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/dasho/RuleStringDecryptor.java
@@ -59,7 +59,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singleton(StringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/generic/RuleIllegalSignature.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/generic/RuleIllegalSignature.java
@@ -64,7 +64,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(IllegalSignatureRemover.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/normalizer/RuleSourceFileAttribute.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/normalizer/RuleSourceFileAttribute.java
@@ -66,7 +66,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(SourceFileClassNormalizer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleInvokedynamic1.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleInvokedynamic1.java
@@ -63,7 +63,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(Invokedynamic1Transformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleInvokedynamic2.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleInvokedynamic2.java
@@ -64,7 +64,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(Invokedynamic2Transformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptor.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptor.java
@@ -59,7 +59,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(StringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptorV3.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptorV3.java
@@ -60,7 +60,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singleton(StringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptorWithThread.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptorWithThread.java
@@ -60,7 +60,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(StringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleEnhancedStringEncryption.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleEnhancedStringEncryption.java
@@ -72,7 +72,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(EnhancedStringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleMethodParameterChangeStringEncryption.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleMethodParameterChangeStringEncryption.java
@@ -74,7 +74,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return null;
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleReflectionDecryptor.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleReflectionDecryptor.java
@@ -58,7 +58,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(ReflectionObfuscationTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleSimpleStringEncryption.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleSimpleStringEncryption.java
@@ -42,7 +42,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return Collections.singletonList(SimpleStringEncryptionTransformer.class);
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleSuspiciousClinit.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/zelix/RuleSuspiciousClinit.java
@@ -57,7 +57,7 @@ public String test(Deobfuscator deobfuscator) {
     }
 
     @Override
-    public Collection<Class<? extends Transformer>> getRecommendTransformers() {
+    public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {
         return null;
     }
 }
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/FakeExceptionTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/FakeExceptionTransformer.java
@@ -0,0 +1,55 @@
+package com.javadeobfuscator.deobfuscator.transformers.dasho;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+
+import com.javadeobfuscator.deobfuscator.config.TransformerConfig;
+import com.javadeobfuscator.deobfuscator.transformers.Transformer;
+import com.javadeobfuscator.deobfuscator.utils.Utils;
+
+public class FakeExceptionTransformer extends Transformer<TransformerConfig>
+{
+	 @Override
+	 public boolean transform() throws Throwable {
+		 System.out.println("[DashO] [FakeExceptionTransformer] Starting");
+		 AtomicInteger counter = new AtomicInteger();
+		 Set<String> fakeExceptionClass = new HashSet<>();
+		 
+		 classNodes().forEach(classNode -> {
+			 classNode.methods.stream().filter(Utils::notAbstractOrNative).forEach(methodNode -> {
+				 List<TryCatchBlockNode> remove = new ArrayList<>();
+				 for(TryCatchBlockNode tcbn : methodNode.tryCatchBlocks)
+				 {
+					 String handler = tcbn.type;
+					 if(handler != null && classes.containsKey(handler))
+					 {
+						 ClassNode handlerClass = classes.get(handler);
+						 if(handlerClass.methods.size() == 0 && handlerClass.superName.equals("java/lang/RuntimeException"))
+						 {
+							 remove.add(tcbn);
+							 fakeExceptionClass.add(handler);
+							 counter.incrementAndGet();
+						 }
+					 }
+				 }
+				 methodNode.tryCatchBlocks.removeIf(remove::contains);
+			 });
+		 });
+		 
+		 fakeExceptionClass.forEach(str -> {
+			 classes.remove(str);
+			 classpath.remove(str);
+		 });
+		 
+		 System.out.println("[DashO] [FakeExceptionTransformer] Removed " + counter.get() + " fake try-catch blocks");
+		 System.out.println("[DashO] [FakeExceptionTransformer] Removed " + fakeExceptionClass.size() + " fake exception classes");
+		 System.out.println("[DashO] [FakeExceptionTransformer] Done");
+		 return counter.get() > 0;
+	 }
+}
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/FlowObfuscationTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/FlowObfuscationTransformer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/TamperObfuscationTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/dasho/TamperObfuscationTransformer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/PeepholeOptimizer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/PeepholeOptimizer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/UnconditionalSwitchRemover.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/UnconditionalSwitchRemover.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/FlowObfuscationTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/FlowObfuscationTransformer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/InvaildClassRemover.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/InvaildClassRemover.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/TryCatchFixer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/TryCatchFixer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/UselessArithmeticTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/UselessArithmeticTransformer.java
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/WrappedLocalsTransformer.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/special/WrappedLocalsTransformer.java

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ public interface Rule extends Opcodes {`
`27`	`27`
`28`	`28`	`String test(Deobfuscator deobfuscator);`
`29`	`29`
`30`		`- Collection<Class<? extends Transformer>> getRecommendTransformers();`
	`30`	`+ Collection<Class<? extends Transformer<?>>> getRecommendTransformers();`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public String test(Deobfuscator deobfuscator) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`
`44`		`- public Collection<Class<? extends Transformer>> getRecommendTransformers() {`
	`44`	`+ public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {`
`45`	`45`	`return Collections.singletonList(EncryptionTransformer.class);`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public String test(Deobfuscator deobfuscator) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public Collection<Class<? extends Transformer>> getRecommendTransformers() {`
	`62`	`+ public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {`
`63`	`63`	`return Collections.singleton(StringEncryptionTransformer.class);`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public String test(Deobfuscator deobfuscator) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`		`- public Collection<Class<? extends Transformer>> getRecommendTransformers() {`
	`67`	`+ public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {`
`68`	`68`	`return Collections.singletonList(IllegalSignatureRemover.class);`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public String test(Deobfuscator deobfuscator) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
`69`		`- public Collection<Class<? extends Transformer>> getRecommendTransformers() {`
	`69`	`+ public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {`
`70`	`70`	`return Collections.singletonList(SourceFileClassNormalizer.class);`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public String test(Deobfuscator deobfuscator) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public Collection<Class<? extends Transformer>> getRecommendTransformers() {`
	`66`	`+ public Collection<Class<? extends Transformer<?>>> getRecommendTransformers() {`
`67`	`67`	`return Collections.singletonList(Invokedynamic1Transformer.class);`
`68`	`68`	`}`
`69`	`69`	`}`