[功能] 花指令数添加简单的控制流

Author: 4ra1n

CHANGELOG.MD

@@ -4,6 +4,8 @@
 
 更新日志：
 
+- [功能] 花指令数添加简单的控制流
+- [功能] 花指令从单 `int` 类型拓展到更多
 - [功能] 花指令支持添加无意义的垃圾方法
 - [优化] 优化命令行输出的信息
 - [其他] 在 `CI` 增加 `Gitleaks` 检查

src/main/java/me/n1ar4/jar/obfuscator/asm/JunkCodeChanger.java

@@ -4,6 +4,7 @@
 import me.n1ar4.jar.obfuscator.config.BaseConfig;
 import me.n1ar4.jar.obfuscator.utils.JunkUtil;
 import me.n1ar4.jar.obfuscator.utils.RandomUtil;
+import me.n1ar4.jrandom.core.JRandom;
 import me.n1ar4.log.LogManager;
 import me.n1ar4.log.Logger;
 import org.objectweb.asm.*;
@@ -126,17 +127,28 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
                     return;
                 }
 
-                mv.visitLdcInsn((int) (Math.random() * 100));
+                mv.visitTypeInsn(Opcodes.NEW, "java/lang/String");
                 mv.visitInsn(Opcodes.DUP);
-                mv.visitInsn(RandomUtil.genICONSTOpcode());
-                mv.visitInsn(Opcodes.IADD);
-                mv.visitInsn(RandomUtil.genICONSTOpcode());
-                mv.visitInsn(Opcodes.ISUB);
-                mv.visitInsn(Opcodes.DUP_X1);
-                mv.visitInsn(Opcodes.SWAP);
-                mv.visitInsn(Opcodes.POP);
-                mv.visitInsn(Opcodes.POP);
+                mv.visitLdcInsn(JRandom.getInstance().randomString(16));
+                mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/String", "<init>",
+                        "(Ljava/lang/String;)V", false);
                 mv.visitInsn(Opcodes.POP);
+
+                Label ifLabel = new Label();
+                Label endLabel = new Label();
+
+                mv.visitInsn(Opcodes.ICONST_1);
+                mv.visitJumpInsn(Opcodes.IFNE, endLabel);
+
+                mv.visitLabel(ifLabel);
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System",
+                        "out", "Ljava/io/PrintStream;");
+                mv.visitLdcInsn(JRandom.getInstance().randomString(16));
+                mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream",
+                        "println", "(Ljava/lang/String;)V", false);
+                mv.visitJumpInsn(Opcodes.GOTO, endLabel);
+                mv.visitLabel(endLabel);
+                mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
             }
             super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
         }
@@ -176,6 +188,11 @@ public void visitTypeInsn(int opcode, String type) {
                 }
                 mv.visitInsn(Opcodes.NOP);
                 mv.visitInsn(Opcodes.NOP);
+                mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
+                mv.visitInsn(Opcodes.DUP);
+                mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList",
+                        "<init>", "()V", false);
+                mv.visitInsn(Opcodes.POP);
                 mv.visitInsn(Opcodes.NOP);
             }
             super.visitTypeInsn(opcode, type);