diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java index f447a554..396fd0d0 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java @@ -1,32 +1,31 @@ package the.bytecode.club.bytecodeviewer.decompilers.impl; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Deque; -import java.util.LinkedList; -import java.util.Random; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import me.konloch.kontainer.io.DiskReader; +import com.strobel.core.StringUtilities; +import org.apache.commons.io.IOUtils; +import org.benf.cfr.reader.api.CfrDriver; +import org.benf.cfr.reader.api.ClassFileSource; +import org.benf.cfr.reader.api.OutputSinkFactory; +import org.benf.cfr.reader.api.SinkReturns; +import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair; import org.objectweb.asm.tree.ClassNode; import the.bytecode.club.bytecodeviewer.BytecodeViewer; +import the.bytecode.club.bytecodeviewer.api.ASMUtil; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler; import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; -import the.bytecode.club.bytecodeviewer.util.MiscUtils; -import static the.bytecode.club.bytecodeviewer.Constants.fs; +import java.io.*; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.zip.ZipException; +import java.util.zip.ZipOutputStream; + import static the.bytecode.club.bytecodeviewer.Constants.nl; -import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory; import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.CFR; import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR; - /*************************************************************************** * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite * * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com * @@ -48,313 +47,188 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERR /** * CFR Java Wrapper * - * @author Konloch + * @author GraxCode + * Taken mostly out of Threadtear. */ -public class CFRDecompiler extends InternalDecompiler -{ +public class CFRDecompiler extends InternalDecompiler { - private static final String[] WINDOWS_IS_GREAT = new String[] - { - "CON", - "PRN", - "AUX", - "NUL", - "COM1", - "COM2", - "COM3", - "COM4", - "COM5", - "COM6", - "COM7", - "COM8", - "COM9", - "LPT1", - "LPT2", - "LPT3", - "LPT4", - "LPT5", - "LPT6", - "LPT7", - "LPT8", - "LPT9" - }; + private String result; + private static final String CLASS_SUFFIX = ".class"; - public static String windowsFun(String base) { - for (String s : WINDOWS_IS_GREAT) { - if (base.contains(s.toLowerCase())) { - base = base.replace(s.toLowerCase(), "BCV"); - } + @Override + public String decompileClassNode(ClassNode cn, byte[] bytes) { + String name = cn.name; + return decompile(bytes, name); + } + + private String decompile(byte[] bytes, String name) { + try { + this.result = null; + OutputSinkFactory mySink = new OutputSinkFactory() { + @Override + public List getSupportedSinks(SinkType sinkType, Collection collection) { + if (sinkType == SinkType.JAVA && collection.contains(SinkClass.DECOMPILED)) { + return Arrays.asList(SinkClass.DECOMPILED, SinkClass.STRING); + } else { + return Collections.singletonList(SinkClass.STRING); + } } - return base; + @Override + public Sink getSink(SinkType sinkType, SinkClass sinkClass) { + if (sinkType == SinkType.JAVA && sinkClass == SinkClass.DECOMPILED) { + return x -> result = ((SinkReturns.Decompiled) x).getJava(); + } + return ignore -> { + }; + } + }; + ClassFileSource source = new ClassFileSource() { + @Override + public void informAnalysisRelativePathDetail(String a, String b) { + } + + @Override + public String getPossiblyRenamedPath(String path) { + return path; + } + + @Override + public Pair getClassFileContent(String path) throws IOException { + String clzName = path.substring(0, path.length() - 6); + if (clzName.equals(name)) { + return Pair.make(bytes, clzName); + } + URL url = CFRDecompiler.class.getResource("/" + path); + if (url != null) { + return Pair.make(IOUtils.toByteArray(url), path); + } + // don't load extra classes. we don't care about improper API usage. + ClassNode dummy = new ClassNode(); + dummy.name = clzName; + dummy.version = 52; + return Pair.make(ASMUtil.nodeToBytes(dummy), clzName); + } + + @Override + public Collection addJar(String arg0) { + throw new RuntimeException("This should not be called"); + } + }; + CfrDriver cfrDriver = new CfrDriver.Builder().withClassFileSource(source).withOutputSink(mySink).withOptions(generateOptions()).build(); + cfrDriver.analyse(Collections.singletonList(name)); + } catch (Throwable t) { + t.printStackTrace(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + t.printStackTrace(pw); + return CFR + " " + ERROR + "! " + ExceptionUI.SEND_STACKTRACE_TO + nl + nl + TranslatedStrings.SUGGESTED_FIX_DECOMPILER_ERROR + nl + nl + sw; + } + if (result != null && !result.trim().isEmpty()) { + return result; } - @Override - public String decompileClassNode(ClassNode cn, byte[] b) { - String fileStart = tempDirectory + fs.toLowerCase(); + return "No CFR output received."; + } - String exception = ""; - //final File tempClass = new File(windowsFun(MiscUtils.getUniqueName(fileStart, ".class") + ".class")); - final File tempClass = new File(MiscUtils.getUniqueName(fileStart, ".class") + ".class"); + @Override + public void decompileToZip(String sourceJar, String zipName) { + try { + doSaveJarDecompiled(new File(sourceJar), new File(zipName)); + } catch (StackOverflowError | Exception e) { + BytecodeViewer.handleException(e); + } + } - try (FileOutputStream fos = new FileOutputStream(tempClass)) { - fos.write(b); - } catch (final IOException e) { - BytecodeViewer.handleException(e); - } + private void doSaveJarDecompiled(File inFile, File outFile) throws IOException { + try (JarFile jfile = new JarFile(inFile); FileOutputStream dest = new FileOutputStream(outFile); BufferedOutputStream buffDest = new BufferedOutputStream(dest); ZipOutputStream out = new ZipOutputStream(buffDest)) { + byte[] data = new byte[1024]; - String fuckery = fuckery(fileStart); - - /*if (!BytecodeViewer.fatJar) { + Enumeration ent = jfile.entries(); + Set history = new HashSet<>(); + while (ent.hasMoreElements()) { + JarEntry entry = ent.nextElement(); + if (entry.getName().endsWith(CLASS_SUFFIX)) { + JarEntry etn = new JarEntry(entry.getName().replace(CLASS_SUFFIX, ".java")); + if (history.add(etn)) { + out.putNextEntry(etn); try { - ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( - new String[]{BytecodeViewer.getJavaCommand(), "-jar", Resources.findLibrary("cfr")}, - generateMainMethod(tempClass.getAbsolutePath(), fuckery) - )); - BytecodeViewer.sm.stopBlocking(); - Process p = pb.start(); - BytecodeViewer.createdProcesses.add(p); - p.waitFor(); - } catch (Exception e) { - BytecodeViewer.handleException(e); + String internalName = StringUtilities.removeRight(entry.getName(), CLASS_SUFFIX); + IOUtils.write(decompile(IOUtils.toByteArray(jfile.getInputStream(entry)), internalName), out, StandardCharsets.UTF_8); } finally { - BytecodeViewer.sm.setBlocking(); + out.closeEntry(); } + } } else { - org.benf.cfr.reader.Main.main(generateMainMethod(tempClass.getAbsolutePath(), fuckery)); - }*/ - - try { - org.benf.cfr.reader.Main.main(generateMainMethod(tempClass.getAbsolutePath(), fuckery)); - } catch (StackOverflowError | Exception e) { - StringWriter exceptionWriter = new StringWriter(); - e.printStackTrace(new PrintWriter(exceptionWriter)); - e.printStackTrace(); - exception = exceptionWriter.toString(); - } - - tempClass.delete(); - File file = new File(fuckery); - - if (file.exists()) - return findFile(MiscUtils.listFiles(file)); - - return CFR + " " + ERROR + "! " + ExceptionUI.SEND_STACKTRACE_TO + - nl + nl + TranslatedStrings.SUGGESTED_FIX_DECOMPILER_ERROR + - nl + nl + exception; - } - - Random r = new Random(); - File f; - - public String fuckery(String start) { - while (true) { - f = new File(start + r.nextInt(Integer.MAX_VALUE)); - if (!f.exists()) - return f.toString(); - } - } - - public String findFile(File[] fA) { - for (File f : fA) { - if (f.isDirectory()) - return findFile(MiscUtils.listFiles(f)); - else { - String s; - try { - s = DiskReader.loadAsString(f.getAbsolutePath()); - } catch (Exception e) { - StringWriter exceptionWriter = new StringWriter(); - e.printStackTrace(new PrintWriter(exceptionWriter)); - e.printStackTrace(); - - return CFR + " " + ERROR + "! " + ExceptionUI.SEND_STACKTRACE_TO + - nl + nl + TranslatedStrings.SUGGESTED_FIX_DECOMPILER_ERROR + - nl + nl + exceptionWriter; + try { + JarEntry etn = new JarEntry(entry.getName()); + if (history.add(etn)) continue; + history.add(etn); + out.putNextEntry(etn); + try (InputStream in = jfile.getInputStream(entry)) { + if (in != null) { + int count; + while ((count = in.read(data, 0, 1024)) != -1) { + out.write(data, 0, count); } - - return s; + } + } finally { + out.closeEntry(); } - } - - return "CFR error!" + - nl + nl + TranslatedStrings.SUGGESTED_FIX_DECOMPILER_ERROR; - } - - public String[] generateMainMethod(String filePath, String outputPath) { - return new String[]{ - filePath, - "--outputdir", - outputPath, - "--decodeenumswitch", - String.valueOf(BytecodeViewer.viewer.decodeEnumSwitch - .isSelected()), - "--sugarenums", - String.valueOf(BytecodeViewer.viewer.sugarEnums.isSelected()), - "--decodestringswitch", - String.valueOf(BytecodeViewer.viewer.decodeStringSwitch - .isSelected()), - "--arrayiter", - String.valueOf(BytecodeViewer.viewer.arrayiter.isSelected()), - "--collectioniter", - String.valueOf(BytecodeViewer.viewer.collectioniter - .isSelected()), - "--innerclasses", - String.valueOf(BytecodeViewer.viewer.innerClasses.isSelected()), - "--removeboilerplate", - String.valueOf(BytecodeViewer.viewer.removeBoilerPlate - .isSelected()), - "--removeinnerclasssynthetics", - String.valueOf(BytecodeViewer.viewer.removeInnerClassSynthetics - .isSelected()), - "--decodelambdas", - String.valueOf(BytecodeViewer.viewer.decodeLambdas.isSelected()), - "--hidebridgemethods", - String.valueOf(BytecodeViewer.viewer.hideBridgeMethods - .isSelected()), - "--liftconstructorinit", - String.valueOf(BytecodeViewer.viewer.liftConstructorInit - .isSelected()), - "--removedeadmethods", - String.valueOf(BytecodeViewer.viewer.removeDeadMethods - .isSelected()), - "--removebadgenerics", - String.valueOf(BytecodeViewer.viewer.removeBadGenerics - .isSelected()), - "--sugarasserts", - String.valueOf(BytecodeViewer.viewer.sugarAsserts.isSelected()), - "--sugarboxing", - String.valueOf(BytecodeViewer.viewer.sugarBoxing.isSelected()), - "--showversion", - String.valueOf(BytecodeViewer.viewer.showVersion.isSelected()), - "--decodefinally", - String.valueOf(BytecodeViewer.viewer.decodeFinally.isSelected()), - "--tidymonitors", - String.valueOf(BytecodeViewer.viewer.tidyMonitors.isSelected()), - "--lenient", - String.valueOf(BytecodeViewer.viewer.lenient.isSelected()), - "--dumpclasspath", - String.valueOf(BytecodeViewer.viewer.dumpClassPath.isSelected()), - "--comments", - String.valueOf(BytecodeViewer.viewer.comments.isSelected()), - "--forcetopsort", - String.valueOf(BytecodeViewer.viewer.forceTopSort.isSelected()), - "--forcetopsortaggress", - String.valueOf(BytecodeViewer.viewer.forceTopSortAggress - .isSelected()), - "--stringbuffer", - String.valueOf(BytecodeViewer.viewer.stringBuffer.isSelected()), - "--stringbuilder", - String.valueOf(BytecodeViewer.viewer.stringBuilder.isSelected()), - "--silent", - String.valueOf(BytecodeViewer.viewer.silent.isSelected()), - "--recover", - String.valueOf(BytecodeViewer.viewer.recover.isSelected()), - "--eclipse", - String.valueOf(BytecodeViewer.viewer.eclipse.isSelected()), - "--override", - String.valueOf(BytecodeViewer.viewer.override.isSelected()), - "--showinferrable", - String.valueOf(BytecodeViewer.viewer.showInferrable - .isSelected()), - "--aexagg", - String.valueOf(BytecodeViewer.viewer.aexagg.isSelected()), - "--forcecondpropagate", - String.valueOf(BytecodeViewer.viewer.forceCondPropagate - .isSelected()), - "--hideutf", - String.valueOf(BytecodeViewer.viewer.hideUTF.isSelected()), - "--hidelongstrings", - String.valueOf(BytecodeViewer.viewer.hideLongStrings - .isSelected()), - "--commentmonitors", - String.valueOf(BytecodeViewer.viewer.commentMonitor - .isSelected()), - "--allowcorrecting", - String.valueOf(BytecodeViewer.viewer.allowCorrecting - .isSelected()), - "--labelledblocks", - String.valueOf(BytecodeViewer.viewer.labelledBlocks - .isSelected()), - "--j14classobj", - String.valueOf(BytecodeViewer.viewer.j14ClassOBJ.isSelected()), - "--hidelangimports", - String.valueOf(BytecodeViewer.viewer.hideLangImports - .isSelected()), - "--recovertypeclash", - String.valueOf(BytecodeViewer.viewer.recoveryTypeClash - .isSelected()), - "--recovertypehints", - String.valueOf(BytecodeViewer.viewer.recoveryTypehInts - .isSelected()), - "--forcereturningifs", - String.valueOf(BytecodeViewer.viewer.forceTurningIFs - .isSelected()), - "--forloopaggcapture", - String.valueOf(BytecodeViewer.viewer.forLoopAGGCapture - .isSelected()),}; - } - - @Override - public void decompileToZip(String sourceJar, String zipName) { - File tempZip = new File(sourceJar); - - String fileStart = tempDirectory + fs; - String fuckery = fuckery(fileStart); - - org.benf.cfr.reader.Main.main(generateMainMethod(tempZip.getAbsolutePath(), fuckery)); - - File fuck = new File(fuckery); - - try { - zip(fuck, new File(zipName)); - } catch (IOException e) { - BytecodeViewer.handleException(e); - } - - fuck.delete(); - } - - public void zip(File directory, File zipFile) throws IOException { - java.net.URI base = directory.toURI(); - Deque queue = new LinkedList<>(); - queue.push(directory); - try (OutputStream out = new FileOutputStream(zipFile); - ZipOutputStream zout = new ZipOutputStream(out)) { - while (!queue.isEmpty()) { - directory = queue.pop(); - for (File kid : MiscUtils.listFiles(directory)) { - String name = base.relativize(kid.toURI()).getPath(); - if (kid.isDirectory()) { - queue.push(kid); - name = name.endsWith("/") ? name : name + "/"; - zout.putNextEntry(new ZipEntry(name)); - } else { - zout.putNextEntry(new ZipEntry(name)); - copy(kid, zout); - zout.closeEntry(); - } - } + } catch (ZipException ze) { + // some jars contain duplicate pom.xml entries: ignore it + if (!ze.getMessage().contains("duplicate")) { + throw ze; } + } } + } } + } - private static void copy(InputStream in, OutputStream out) - throws IOException { - byte[] buffer = new byte[1024]; - while (true) { - int readCount = in.read(buffer); - if (readCount < 0) { - break; - } - out.write(buffer, 0, readCount); - } - } - - private static void copy(File file, OutputStream out) throws IOException { - try (InputStream in = new FileInputStream(file)) { - copy(in, out); - } - } + private Map generateOptions() { + Map options = new HashMap<>(); + options.put("decodeenumswitch", String.valueOf(BytecodeViewer.viewer.decodeEnumSwitch.isSelected())); + options.put("sugarenums", String.valueOf(BytecodeViewer.viewer.sugarEnums.isSelected())); + options.put("decodestringswitch", String.valueOf(BytecodeViewer.viewer.decodeStringSwitch.isSelected())); + options.put("arrayiter", String.valueOf(BytecodeViewer.viewer.arrayiter.isSelected())); + options.put("collectioniter", String.valueOf(BytecodeViewer.viewer.collectioniter.isSelected())); + options.put("innerclasses", String.valueOf(BytecodeViewer.viewer.innerClasses.isSelected())); + options.put("removeboilerplate", String.valueOf(BytecodeViewer.viewer.removeBoilerPlate.isSelected())); + options.put("removeinnerclasssynthetics", String.valueOf(BytecodeViewer.viewer.removeInnerClassSynthetics.isSelected())); + options.put("decodelambdas", String.valueOf(BytecodeViewer.viewer.decodeLambdas.isSelected())); + options.put("hidebridgemethods", String.valueOf(BytecodeViewer.viewer.hideBridgeMethods.isSelected())); + options.put("liftconstructorinit", String.valueOf(BytecodeViewer.viewer.liftConstructorInit.isSelected())); + options.put("removebadgenerics", String.valueOf(BytecodeViewer.viewer.removeBadGenerics.isSelected())); + options.put("sugarasserts", String.valueOf(BytecodeViewer.viewer.sugarAsserts.isSelected())); + options.put("sugarboxing", String.valueOf(BytecodeViewer.viewer.sugarBoxing.isSelected())); + options.put("showversion", String.valueOf(BytecodeViewer.viewer.showVersion.isSelected())); + options.put("decodefinally", String.valueOf(BytecodeViewer.viewer.decodeFinally.isSelected())); + options.put("tidymonitors", String.valueOf(BytecodeViewer.viewer.tidyMonitors.isSelected())); + options.put("lenient", String.valueOf(BytecodeViewer.viewer.lenient.isSelected())); + options.put("dumpclasspath", String.valueOf(BytecodeViewer.viewer.dumpClassPath.isSelected())); + options.put("comments", String.valueOf(BytecodeViewer.viewer.comments.isSelected())); + options.put("forcetopsort", String.valueOf(BytecodeViewer.viewer.forceTopSort.isSelected())); + options.put("forcetopsortaggress", String.valueOf(BytecodeViewer.viewer.forceTopSortAggress.isSelected())); + options.put("stringbuffer", String.valueOf(BytecodeViewer.viewer.stringBuffer.isSelected())); + options.put("stringbuilder", String.valueOf(BytecodeViewer.viewer.stringBuilder.isSelected())); + options.put("silent", String.valueOf(BytecodeViewer.viewer.silent.isSelected())); + options.put("recover", String.valueOf(BytecodeViewer.viewer.recover.isSelected())); + options.put("eclipse", String.valueOf(BytecodeViewer.viewer.eclipse.isSelected())); + options.put("override", String.valueOf(BytecodeViewer.viewer.override.isSelected())); + options.put("showinferrable", String.valueOf(BytecodeViewer.viewer.showInferrable.isSelected())); + options.put("aexagg", String.valueOf(BytecodeViewer.viewer.aexagg.isSelected())); + options.put("hideutf", String.valueOf(BytecodeViewer.viewer.hideUTF.isSelected())); + options.put("hidelongstrings", String.valueOf(BytecodeViewer.viewer.hideLongStrings.isSelected())); + options.put("commentmonitors", String.valueOf(BytecodeViewer.viewer.commentMonitor.isSelected())); + options.put("allowcorrecting", String.valueOf(BytecodeViewer.viewer.allowCorrecting.isSelected())); + options.put("labelledblocks", String.valueOf(BytecodeViewer.viewer.labelledBlocks.isSelected())); + options.put("j14classobj", String.valueOf(BytecodeViewer.viewer.j14ClassOBJ.isSelected())); + options.put("hidelangimports", String.valueOf(BytecodeViewer.viewer.hideLangImports.isSelected())); + options.put("recovertypehints", String.valueOf(BytecodeViewer.viewer.recoveryTypehInts.isSelected())); + options.put("forcereturningifs", String.valueOf(BytecodeViewer.viewer.forceTurningIFs.isSelected())); + options.put("forloopaggcapture", String.valueOf(BytecodeViewer.viewer.forLoopAGGCapture.isSelected())); + return options; + } }