Merge pull request #50 from LLVM-but-worse/filter

Decompile filter support

Author: rcx

mapleir/pom.xml

@@ -68,7 +68,7 @@
         <dependency>
        		<groupId>club.bytecode.the</groupId>
        		<artifactId>jda</artifactId>
-       		<version>1.0.0</version>
+       		<version>1.1.0</version>
        	</dependency>
         <dependency>
        		<groupId>org.mapleir</groupId>

mapleir/src/main/java/org/mapleir/jdaplugin/DeobfuscateFilter.java

@@ -1,12 +1,25 @@
 package org.mapleir.jdaplugin;
 
 import club.bytecode.the.jda.decompilers.filter.DecompileFilter;
+import org.mapleir.ir.algorithms.BoissinotDestructor;
+import org.mapleir.ir.algorithms.ControlFlowGraphDumper;
+import org.mapleir.ir.cfg.ControlFlowGraph;
+import org.mapleir.ir.cfg.builder.ControlFlowGraphBuilder;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
 
 public class DeobfuscateFilter implements DecompileFilter, MapleComponent {
     @Override
     public void process(ClassNode cn) {
-        
+        if (cn == null)
+            return;
+        for (MethodNode mn : cn.methods) {
+            ControlFlowGraph cfg = ControlFlowGraphBuilder.build(mn);
+            BoissinotDestructor.leaveSSA(cfg);
+            cfg.getLocals().realloc(cfg);
+            (new ControlFlowGraphDumper(cfg, mn)).dump();
+            System.out.println("Processed " + mn);
+        }
     }
 
     @Override

mapleir/src/main/java/org/mapleir/jdaplugin/MaplePlugin.java

@@ -16,6 +16,7 @@
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 public class MaplePlugin implements JDAPlugin {
@@ -69,7 +70,8 @@ public void onExit() {
 
 	@Override
 	public void onOpenFile(FileContainer fileContainer) {
-		ApplicationClassSource app = new ApplicationClassSource(fileContainer.name, fileContainer.getClasses());
+		// todo
+		ApplicationClassSource app = new ApplicationClassSource(fileContainer.name, new HashSet<>());
 		AnalysisContext newCxt = new BasicAnalysisContext.BasicContextBuilder()
 				.setApplication(app)
 				.setInvocationResolver(new DefaultInvocationResolver(app))

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>club.bytecode.the</groupId>
     <artifactId>jda</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 
     <repositories>
         <repository>

src/main/java/club/bytecode/the/jda/FileChangeNotifier.java

@@ -4,7 +4,6 @@
 import org.objectweb.asm.tree.ClassNode;
 
 import java.io.File;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,17 +22,7 @@ public FileContainer(File f) {
     public final File file;
     public final String name;
 
-    public HashMap<String, byte[]> files = new HashMap<>();
-    private Map<String, ClassNode> classes = new HashMap<>();
-
-    public ClassNode getClassNode(String name) {
-        if (classes.containsKey(name))
-            return classes.get(name);
-        ClassNode cn = loadClass(findClassfile(name));
-        if (cn != null)
-            classes.put(name, cn);
-        return classes.get(name);
-    }
+    public HashMap<String, byte[]> files = new HashMap<>(); // this is assigned outside the class?!
 
     public ClassNode loadClass(String name) {
         byte[] bytes = files.get(name);
@@ -56,18 +45,6 @@ public Map<String, byte[]> getFiles() {
         return files;
     }
 
-    public boolean remove(ClassNode classNode) {
-        return classes.remove(classNode.name) != null;
-    }
-
-    public void add(ClassNode classNode) {
-        classes.put(classNode.name, classNode);
-    }
-
-    public Collection<ClassNode> getClasses() {
-        return classes.values();
-    }
-
     @Override
     public String toString() {
         return name;

src/main/java/club/bytecode/the/jda/FileContainer.java

@@ -10,11 +10,12 @@
 import club.bytecode.the.jda.gui.fileviewer.ViewerFile;
 import club.bytecode.the.jda.gui.navigation.FileNavigationPane;
 import club.bytecode.the.jda.settings.Settings;
+import club.bytecode.the.jda.util.GuiUtils;
+import club.bytecode.the.jda.util.MiscUtils;
 import org.apache.commons.io.FileUtils;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
-import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -31,8 +32,7 @@
 
 public class JDA {
     /*per version*/
-    public static final String version = "1.0.0";
-    public static final boolean previewCopy = false;
+    public static final String version = "1.1.0";
     /* Constants */
     public static final String fs = System.getProperty("file.separator");
     public static final String nl = System.getProperty("line.separator");
@@ -61,15 +61,16 @@ public class JDA {
      */
     public static void main(String[] args) {
         try {
+            // Fix antialiasing
+            System.setProperty("awt.useSystemAAFontSettings", "lcd");
+            System.setProperty("swing.aatext", "true");
+            GuiUtils.setWmClassName("JDA");
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (Exception e) {
             new ExceptionUI(e);
         }
         try {
             System.out.println("JDA (BCV Fork) v" + version);
-            if (previewCopy)
-                showMessage("WARNING: This is a preview/dev copy, you WON'T be alerted when " + version + " is actually out if you use this." + nl +
-                        "Make sure to watch the repo: https://github.com/ecx86/jda for " + version + "'s release");
             getJDADirectory();
 
             loadPlugins();
@@ -217,15 +218,26 @@ public static byte[] getFileBytes(ViewerFile file) {
         else
             return null;
     }
-
-    public static byte[] getClassBytes(FileContainer container, ClassNode cn) {
-        byte[] bytes = getFileBytes(new ViewerFile(container, container.findClassfile(cn.name)));
+    
+    public static boolean hasFile(ViewerFile file) {
+        if (file.container == null)
+            return false;
+        return file.container.getFiles().containsKey(file.name);
+    }
+    
+    public static byte[] getClassFileBytes(FileContainer container, String className) {
+        byte[] bytes = getFileBytes(new ViewerFile(container, container.findClassfile(className)));
         if (bytes == null)
             return null;
-        if (cn.version < 49)
-            bytes = fixBytes(bytes); // this is inefficient!
         return bytes;
     }
+    
+    public static byte[] dumpClassToBytes(ClassNode cn) {
+        // we have to do this, or else decompile filters don't work.
+        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+        cn.accept(writer);
+        return writer.toByteArray();
+    }
 
     public static final String HACK_PREFIX = "\0JDA-hack";
 
@@ -245,31 +257,6 @@ public static String getClassName(String fullyQualifiedName) {
         return fullyQualifiedName.substring(fullyQualifiedName.lastIndexOf('/') + 1);
     }
 
-    protected static byte[] fixBytes(byte[] in) {
-        ClassReader reader = new ClassReader(in);
-        ClassNode node = new ClassNode();
-        reader.accept(node, ClassReader.EXPAND_FRAMES);
-        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        node.accept(writer);
-        return writer.toByteArray();
-    }
-
-    /**
-     * Gets all of the loaded classes as an array list
-     *
-     * @return the loaded classes as an array list
-     */
-    public static ArrayList<ClassNode> getLoadedClasses() {
-        ArrayList<ClassNode> a = new ArrayList<>();
-
-        for (FileContainer container : files)
-            for (ClassNode c : container.getClasses())
-                if (!a.contains(c))
-                    a.add(c);
-
-        return a;
-    }
-
     // WTF????
     public static Map<String, byte[]> getLoadedBytes() {
         Map<String, byte[]> data = new HashMap<>();
@@ -316,10 +303,6 @@ public static void openFiles(final File[] files, boolean recentFiles, FileNaviga
                         } catch (final Exception e) {
                             new ExceptionUI(e);
                         }
-                    } else if (fn.endsWith(".class")) {
-                        FileContainer container = loadClassfile(fileToOpen, fn);
-                        openFile(container);
-                        fnp.addTreeElement(container, parent);
                     } else {
                         HashMap<String, byte[]> files1 = new HashMap<>();
                         byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
@@ -337,26 +320,7 @@ public static void openFiles(final File[] files, boolean recentFiles, FileNaviga
             }
         })).start();
     }
-
-    public static FileContainer loadClassfile(File fileToOpen, String fn) {
-        try {
-            byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
-            String cafebabe = String.format("%02X%02X%02X%02X", bytes[0], bytes[1], bytes[2], bytes[3]);
-            if (cafebabe.toLowerCase().equals("cafebabe")) {
-                final ClassNode cn = JarUtils.getNode(bytes);
-                FileContainer container = new FileContainer(fileToOpen);
-                container.files.put(cn.name + ".class", bytes);
-                container.add(cn);
-                return container;
-            } else {
-                showMessage(fn + ": Header does not start with CAFEBABE, ignoring.");
-            }
-        } catch (final Exception e) {
-            new ExceptionUI(e);
-        }
-        return null;
-    }
-
+    
     public static void openFile(FileContainer fc) {
         JDA.files.add(fc);
         plugins.forEach((plugin -> plugin.onOpenFile(fc)));
@@ -556,68 +520,6 @@ public static void checkHotKey(KeyEvent e) {
             viewer.refreshView();
         } else if ((e.getKeyCode() == KeyEvent.VK_W) && isCtrlDown(e) && isShiftDown(e)) {
             JDA.closeResources(true);
-        } else if ((e.getKeyCode() == KeyEvent.VK_S) && isCtrlDown(e)) {
-            if (JDA.getLoadedClasses().isEmpty()) {
-                JDA.showMessage("First open a class, jar, or zip file.");
-                return;
-            }
-
-            Thread t = new Thread() {
-                public void run() {
-                    JFileChooser fc = new JFileChooser();
-                    fc.setFileFilter(new FileFilter() {
-                        @Override
-                        public boolean accept(File f) {
-                            return f.isDirectory() || MiscUtils.extension(f.getAbsolutePath()).equals("zip");
-                        }
-
-                        @Override
-                        public String getDescription() {
-                            return "Zip Archives";
-                        }
-                    });
-                    fc.setFileHidingEnabled(false);
-                    fc.setAcceptAllFileFilterUsed(false);
-                    int returnVal = fc.showSaveDialog(viewer);
-                    if (returnVal == JFileChooser.APPROVE_OPTION) {
-                        File file = fc.getSelectedFile();
-                        if (!file.getAbsolutePath().endsWith(".zip"))
-                            file = new File(file.getAbsolutePath() + ".zip");
-
-                        if (file.exists()) {
-                            JOptionPane pane = new JOptionPane("Are you sure you wish to overwrite this existing file?");
-                            Object[] options = new String[]{"Yes", "No"};
-                            pane.setOptions(options);
-                            JDialog dialog = pane.createDialog(JDA.viewer, "JDA - Overwrite File");
-                            dialog.setVisible(true);
-                            Object obj = pane.getValue();
-                            int result = -1;
-                            for (int k = 0; k < options.length; k++)
-                                if (options[k].equals(obj))
-                                    result = k;
-
-                            if (result == 0) {
-                                file.delete();
-                            } else {
-                                return;
-                            }
-                        }
-
-                        final File file2 = file;
-
-                        JDA.setBusy(true);
-                        Thread t = new Thread() {
-                            @Override
-                            public void run() {
-                                JarUtils.saveAsJar(JDA.getLoadedBytes(), file2.getAbsolutePath());
-                                JDA.setBusy(false);
-                            }
-                        };
-                        t.start();
-                    }
-                }
-            };
-            t.start();
         } else if ((e.getKeyCode() == KeyEvent.VK_W) && isCtrlDown(e)) {
             if (viewer.fileViewerPane.getCurrentViewer() != null)
                 viewer.fileViewerPane.tabs.remove(viewer.fileViewerPane.getCurrentViewer());

src/main/java/club/bytecode/the/jda/JDA.java

@@ -62,9 +62,7 @@ private void setup(Throwable e, String author) {
         e.printStackTrace(new PrintWriter(sw));
         e.printStackTrace();
 
-        txtrBytecodeViewerIs.setText("JDA v" + JDA.version +
-                ", Preview Copy: " + JDA.previewCopy +
-                JDA.nl + JDA.nl + sw.toString());
+        txtrBytecodeViewerIs.setText("JDA v" + JDA.version + JDA.nl + JDA.nl + sw.toString());
         this.setLocationRelativeTo(null);
         this.setVisible(true);
     }

src/main/java/club/bytecode/the/jda/api/ExceptionUI.java

@@ -98,7 +98,7 @@ public JDANamespace getNamespace() {
     @Override
     public String decompileClassNode(FileContainer container, ClassNode cn) {
         try {
-            byte[] bytes = JDA.getClassBytes(container, cn);
+            byte[] bytes = JDA.dumpClassToBytes(cn);
             Options options = new GetOptParser().parse(generateMainMethod(), OptionsImpl.getFactory());
             ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
             DCCommonState dcCommonState = new DCCommonState(options, classFileSource);