field flow

Author: EpicPlayerA10

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/matcher/group/SequenceMatch.java

@@ -18,11 +18,9 @@
 public class SequenceMatch extends Match {
 
   private static final Match FRAME_MATCH = Match.of(context -> context.insn() instanceof FrameNode);
-  private static final Match LABEL_MATCH = Match.of(context -> context.insn() instanceof LabelNode);
-  private static final Match LINE_MATCH = Match.of(context -> context.insn() instanceof LineNumberNode);
 
   private final Match[] matches;
-  private final List<Match> skipMatches = new ArrayList<>(List.of(FRAME_MATCH, LABEL_MATCH, LINE_MATCH));
+  private final List<Match> skipMatches = new ArrayList<>(List.of(FRAME_MATCH));
 
   private SequenceMatch(Match[] matches) {
     this.matches = matches;
@@ -45,23 +43,6 @@ public SequenceMatch doNotSkipFrames() {
     return this;
   }
 
-  public SequenceMatch doNotSkipLabels() {
-    this.skipMatches.remove(LABEL_MATCH);
-    return this;
-  }
-
-  public SequenceMatch doNotSkipLineNumbers() {
-    this.skipMatches.remove(LINE_MATCH);
-    return this;
-  }
-
-  public SequenceMatch doNotSkip() {
-    doNotSkipLabels();
-    doNotSkipLabels();
-    doNotSkipFrames();
-    return this;
-  }
-
   @Override
   protected boolean test(MatchContext context) {
     AbstractInsnNode currentInsn = context.insn();

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/Composed_qProtectTransformer.java

@@ -4,6 +4,7 @@
 import uwu.narumi.deobfuscator.core.other.composed.general.ComposedPeepholeCleanTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.clean.LocalVariableNamesCleanTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.pool.InlineStaticFieldTransformer;
+import uwu.narumi.deobfuscator.core.other.impl.qprotect.qProtectFieldFlowTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.qprotect.qProtectStringPoolTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.qprotect.qProtectStringTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.qprotect.qProtectTryCatchTransformer;
@@ -42,7 +43,10 @@ public Composed_qProtectTransformer() {
         InlineStaticFieldTransformer::new,
 
         // Cleanup
-        ComposedPeepholeCleanTransformer::new
+        ComposedPeepholeCleanTransformer::new,
+
+        // Remove field flow after cleaning code from garbage, so we can do pattern matching
+        qProtectFieldFlowTransformer::new
     );
   }
 }

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/qprotect/qProtectFieldFlowTransformer.java

@@ -0,0 +1,38 @@
+package uwu.narumi.deobfuscator.core.other.impl.qprotect;
+
+import org.objectweb.asm.tree.FieldInsnNode;
+import uwu.narumi.deobfuscator.api.asm.MethodContext;
+import uwu.narumi.deobfuscator.api.asm.matcher.Match;
+import uwu.narumi.deobfuscator.api.asm.matcher.group.SequenceMatch;
+import uwu.narumi.deobfuscator.api.asm.matcher.impl.NumberMatch;
+import uwu.narumi.deobfuscator.api.asm.matcher.impl.OpcodeMatch;
+import uwu.narumi.deobfuscator.api.transformer.Transformer;
+
+public class qProtectFieldFlowTransformer extends Transformer {
+  private static final Match FIELD_FLOW_PATTERN = SequenceMatch.of(
+      // Init variable through field
+      NumberMatch.of(),
+      OpcodeMatch.of(ISTORE),
+      OpcodeMatch.of(ILOAD),
+      OpcodeMatch.of(PUTSTATIC).capture("field"),
+      // Compare
+      NumberMatch.of(),
+      OpcodeMatch.of(GETSTATIC),
+      OpcodeMatch.of(IF_ICMPGT)
+  );
+
+  @Override
+  protected void transform() throws Exception {
+    scopedClasses().forEach(classWrapper -> {
+      classWrapper.methods().forEach(methodNode -> {
+        MethodContext methodContext = MethodContext.frameless(classWrapper, methodNode);
+        FIELD_FLOW_PATTERN.findAllMatches(methodContext).forEach(match -> {
+          FieldInsnNode fieldInsn = (FieldInsnNode) match.captures().get("field").insn();
+
+          // Remove field flow
+          match.removeAll();
+        });
+      });
+    });
+  }
+}

testData/results/custom-classes/qprotect/sample1/XML.dec

@@ -57,11 +57,6 @@ public class XML {
                         var1.appendCodePoint(var3);
                     }
             }
-
-            int var5 = 287930431;
-            IIlllllIIIllllIl = var5;
-            if (1280687910 <= IIlllllIIIllllIl) {
-            }
         }
 
         return var1.toString();
@@ -234,10 +229,6 @@ public class XML {
                                 if (var3.getForceList().contains(var9)) {
                                     if (var7.length() == 0) {
                                         var1.put(var9, new JSONArray());
-                                        int var14 = 625409678;
-                                        IIlllllIIIllllIl = var14;
-                                        if (1222458921 <= IIlllllIIIllllIl) {
-                                        }
                                     } else if (var7.length() == 1 && var7.opt(var3.getcDataTagName()) != null) {
                                         var1.append(var9, var7.opt(var3.getcDataTagName()));
                                     } else {
@@ -247,8 +238,8 @@ public class XML {
                                     var1.accumulate(var9, "");
                                 } else if (var7.length() == 1 && var7.opt(var3.getcDataTagName()) != null) {
                                     var1.accumulate(var9, var7.opt(var3.getcDataTagName()));
-                                    int var23 = 19118812;
-                                    IIlllllIIIllllIl = var23;
+                                    int var14 = 19118812;
+                                    IIlllllIIIllllIl = var14;
                                     if (333213067 < IIlllllIIIllllIl) {
                                     }
                                 } else {