try-catch attempted method desc interpretation in rules, improve superblaubeere obfuscation detection message

Author: Janmm14

src/main/java/com/javadeobfuscator/deobfuscator/rules/dasho/RuleStringDecryptor.java

@@ -39,7 +39,16 @@ public String test(Deobfuscator deobfuscator) {
             for (MethodNode methodNode : classNode.methods) {
                 boolean isDashO = true;
 
-                Type[] argTypes = Type.getArgumentTypes(methodNode.desc);
+                Type[] argTypes;
+                try {
+                    argTypes = Type.getArgumentTypes(methodNode.desc);
+                } catch (IllegalArgumentException ex) {
+                    if (deobfuscator.getConfig().isDebugRulesAnalyzer()) {
+                        String message = "Encountered illegal method desc at " + classNode.name + " " + methodNode.name + methodNode.desc;
+                        new IllegalArgumentException(message, ex).printStackTrace();
+                    }
+                    continue;
+                }
 
                 isDashO = isDashO && TransformerHelper.hasArgumentTypes(argTypes, Type.INT_TYPE, Type.getObjectType("java/lang/String"));
                 isDashO = isDashO && TransformerHelper.containsInvokeVirtual(methodNode, "java/lang/String", "toCharArray", "()[C");

src/main/java/com/javadeobfuscator/deobfuscator/rules/special/RuleSuperblaubeereObfuscation.java

@@ -2,7 +2,9 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 
+import com.google.common.base.Joiner;
 import com.javadeobfuscator.deobfuscator.Deobfuscator;
 import com.javadeobfuscator.deobfuscator.rules.Rule;
 import com.javadeobfuscator.deobfuscator.transformers.Transformer;
@@ -18,12 +20,31 @@
 
 public class RuleSuperblaubeereObfuscation implements Rule {
 
+	private static final Joiner COMMA_JOINER = Joiner.on(", ");
+
 	@Override
 	public String getDescription() {
 		return "Superblaubeere obfuscator uses a variety of methods. It can obfuscate numbers, add redundant ifs, encrypt strings, pool numbers & strings into an " +
 			   "array per class and obfuscate method calls with invokedynamic instructions.";
 	}
 
+	private enum Detection {
+		NUMBER_POOL("number pool"),
+		STRING_ENC("string encryption"),
+		STRING_POOL("string pool"),
+		INVOKEDYN("invokedynamic");
+		private final String msg;
+
+		Detection(String msg) {
+			this.msg = msg;
+		}
+
+		@Override
+		public String toString() {
+			return msg;
+		}
+	}
+
 	@Override
 	public String test(Deobfuscator deobfuscator) {
 		for (ClassNode classNode : deobfuscator.getClasses().values()) {
@@ -35,6 +56,7 @@ public String test(Deobfuscator deobfuscator) {
 			if (first == null) {
 				continue;
 			}
+			EnumSet<Detection> detections = EnumSet.noneOf(Detection.class);
 			// Number pool
 			numberPool:
 			{
@@ -57,7 +79,8 @@ public String test(Deobfuscator deobfuscator) {
 				for (MethodNode method : classNode.methods) {
 					for (AbstractInsnNode ain : method.instructions.toArray()) {
 						if (TransformerHelper.isGetStatic(ain, classNode.name, field.name, field.desc) && Utils.isInteger(ain.getNext())) {
-							return "Found potential number pool in class " + classNode.name;
+							detections.add(Detection.NUMBER_POOL);
+							break numberPool;
 						}
 					}
 				}
@@ -87,7 +110,8 @@ public String test(Deobfuscator deobfuscator) {
 				for (MethodNode method : classNode.methods) {
 					for (AbstractInsnNode ain : method.instructions.toArray()) {
 						if (TransformerHelper.isGetStatic(ain, classNode.name, field.name, field.desc) && Utils.isInteger(ain.getNext())) {
-							return "Found potential string encryption in class " + classNode.name;
+							detections.add(Detection.STRING_ENC);
+							break stringEncrypt;
 						}
 					}
 				}
@@ -130,7 +154,8 @@ public String test(Deobfuscator deobfuscator) {
 				for (MethodNode method : classNode.methods) {
 					for (AbstractInsnNode ain : method.instructions.toArray()) {
 						if (TransformerHelper.isGetStatic(ain, classNode.name, field.name, field.desc) && Utils.isInteger(ain.getNext())) {
-							return "Found potential string pool in class " + classNode.name;
+							detections.add(Detection.STRING_POOL);
+							break stringPool;
 						}
 					}
 				}
@@ -174,10 +199,14 @@ public String test(Deobfuscator deobfuscator) {
 				for (MethodNode method : classNode.methods) {
 					for (AbstractInsnNode ain : method.instructions.toArray()) {
 						if (TransformerHelper.isInvokeDynamic(ain, null, null, classNode.name, bootstrap.name, bootstrap.desc, 0)) {
-							return "Found potential invokedynamic obfuscation in class " + classNode.name;
+							detections.add(Detection.INVOKEDYN);
+							break invokedyn;
 						}
 					}
 				}
+				if (!detections.isEmpty()) {
+					return "Found potential " + COMMA_JOINER.join(detections) + " in class " + classNode.name;
+				}
 			}
 		}
 		return null;

src/main/java/com/javadeobfuscator/deobfuscator/rules/stringer/RuleStringDecryptorV3.java

@@ -36,8 +36,18 @@ public String getDescription() {
     public String test(Deobfuscator deobfuscator) {
         for (ClassNode classNode : deobfuscator.getClasses().values()) {
             for (MethodNode methodNode : classNode.methods) {
-                if (!TransformerHelper.basicType(methodNode.desc).equals("(Ljava/lang/Object;III)Ljava/lang/Object;")
-                	|| !Modifier.isStatic(methodNode.access) || methodNode.instructions == null) {
+                String basicType;
+                try {
+                    basicType = TransformerHelper.basicType(methodNode.desc);
+                } catch (IllegalArgumentException ex) {
+                    if (deobfuscator.getConfig().isDebugRulesAnalyzer()) {
+                        String message = "Encountered illegal method desc at " + classNode.name + " " + methodNode.name + methodNode.desc;
+                        new IllegalArgumentException(message, ex).printStackTrace();
+                    }
+                    continue;
+                }
+                if (!basicType.equals("(Ljava/lang/Object;III)Ljava/lang/Object;")
+                    || !Modifier.isStatic(methodNode.access) || methodNode.instructions == null) {
                     continue;
                 }