Added CLI arguments, added Stream API usage (#3)

* Changed Usage section, Needed APIs section

* Fix README

* Changed Usage section

* Added CLI arguments, added Stream API usage

Author: Nikita

README.md

@@ -2,13 +2,17 @@
 NeonObf-uscator is start-up obfuscator
 
 ## Usage
-java -jar NeonObf.jar <jar_to_obfuscate> <jar_to_obfuscate_out> </path/to/libs/> <_transformers> <min/norm/max>
+**WARNING**: currently doesn't working with Java 9.
 
-Example: java -jar NeonObf.jar IN.jar OUT.jar libs SourceFileRemover;LineNumberObfuscation;FinalRemover;LocalVariableNameObfuscator;BasicTypesEncryption;GotoFloodObfuscation;CodeHider max
 
-P.S.: you can use "null" (w/o quotes) as </path/to/libs/>
+Get usage by running
 
-It's highly recommended to use ProGuard with short names obfuscation before NeonObf
+```
+java -jar NeonObf.jar
+```
+
+
+It's highly recommended to use ProGuard with short names obfuscation before NeonObf as it's reducing memory usage of NeonObf
 
 ## License
 MIT
@@ -27,3 +31,4 @@ ObjectWeb ASM v6.0 (BETA):
  - asm-analysis
  - asm-commons
  - asm-tree
+ - commons-cli

com/neonObf/CustomClassWriter.java

@@ -45,19 +45,17 @@ public static List<ClassNode> loadHierachy(ClassNode specificNode) {
 			ClassTree thisTree = getClassTree(specificNode.name);
 			ClassNode superClass = null;
 			superClass = assureLoaded(specificNode.superName);
-			if (superClass == null) {
+			if (superClass == null)
 				throw new IllegalArgumentException("Could not load " + specificNode.name);
-			}
 			ClassTree superTree = getClassTree(superClass.name);
 			superTree.subClasses.add(specificNode.name);
 			thisTree.parentClasses.add(superClass.name);
 			toProcess.add(superClass);
 
 			for(String interfaceReference : (List<String>) specificNode.interfaces) {
 				ClassNode interfaceNode = assureLoaded(interfaceReference);
-				if (interfaceNode == null) {
+				if (interfaceNode == null)
 					throw new IllegalArgumentException("Could not load " + interfaceReference);
-				}
 				ClassTree interfaceTree = getClassTree(interfaceReference);
 				interfaceTree.subClasses.add(specificNode.name);
 				thisTree.parentClasses.add(interfaceReference);

com/neonObf/DirWalker.java

@@ -2,17 +2,14 @@
 
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
+import java.util.Collections;
 import java.util.zip.ZipFile;
 
 import org.objectweb.asm.ClassReader;
 
 public class DirWalker {
 	public DirWalker(File file, boolean isLibrary) throws Throwable {
-		Main inst = Main.getInstance();
 		String name = file.getName();
 		String path = file.getAbsolutePath();
 		if (file.isDirectory()) {
@@ -25,7 +22,8 @@ public DirWalker(File file, boolean isLibrary) throws Throwable {
 				if (name.endsWith("jar"))
 					loadZIP(new File(path), isLibrary);
 				if (name.endsWith("class"))
-					loadClass(new File(path), isLibrary);
+					if(!name.equals("module-info.class"))
+						loadClass(new File(path), isLibrary);
 			}
 	}
 
@@ -42,19 +40,18 @@ public void loadClass(File f, boolean isLibrary) throws Throwable {
 	public void loadZIP(File f, boolean isLibrary) throws Throwable {
 		Main inst = Main.getInstance();
 		final ZipFile zipIn = new ZipFile(f);
-		final Enumeration<? extends ZipEntry> e = zipIn.entries();
 		ArrayList<String> classList = new ArrayList<>();
-		while (e.hasMoreElements()) {
-			final ZipEntry next = e.nextElement();
-			if (next.getName().endsWith(".class")) {
-				if(isLibrary)
-					classList.add(next.getName().replaceAll("(.*)\\.class", "$1"));
-				else
-					inst.classes.add(CustomClassWriter.loadClass(zipIn.getInputStream(next), ClassReader.SKIP_FRAMES));
-			} else
-				if (next.isDirectory())
-					continue;
-		}
+		Collections.list(zipIn.entries()).forEach((next) -> {
+			try {
+				if (next.getName().endsWith(".class") && !next.getName().equals("module-info.class"))
+					if (isLibrary)
+						classList.add(next.getName().replaceAll("(.*)\\.class", "$1"));
+					else
+						inst.classes.add(CustomClassWriter.loadClass(zipIn.getInputStream(next), ClassReader.SKIP_FRAMES));
+			} catch(Throwable t) {
+				t.printStackTrace();
+			}
+		});
 		zipIn.close();
 		inst.loadedAPI.add(new ZIPLibrary(f, classList, isLibrary));
 	}

com/neonObf/Main.java

@@ -16,6 +16,7 @@
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.commons.cli.*;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.InnerClassNode;
@@ -32,102 +33,113 @@ public class Main extends Thread {
 	public ArrayList<ClassFile> files = new ArrayList<ClassFile>();
 	public HashMap<String, ClassNode> nameToNode = new HashMap<String, ClassNode>();
 	public HashMap<ClassNode, String> nodeToName = new HashMap<ClassNode, String>();
+	public String[] libraries;
 	public ArrayList<Library> loadedAPI = new ArrayList<Library>();
-	public ArrayList<File> paths = new ArrayList<File>();
 	public String[] usedTransformers;
 	public HashMap<String, Integer> pkgLens = new HashMap<String, Integer>();
 	public SmartNameGen nameGen;
 	public String[] args;
+	public CommandLine cmd;
 
 	public static Main getInstance() {
 		return instance;
 	}
 
-	private void checkArgs() throws Throwable {
-		if (args.length < 5) {
-			System.out
-					.println("Usage: java -jar NeonObf.jar <jar_to_obfuscate> <jar_to_obfuscate_out> </path/to/libs/> <transformers> <min/norm/max>");
-			throw new Throwable();
-		}
-
-		for(int i = 0; i < args.length; i++)
-			if (parseArg(args[i], i, args)) {
-				checkArgs();
-				break;
-			}
-	}
-
 	/***
 	 * Parses argument
-	 * 
-	 * @param arg
-	 *            Argument from massive
-	 * @param index
-	 *            Index of argument in massive
-	 * @param args
-	 *            All arguments
-	 * @return Needed in restart argument checking?
+	 *
 	 * @throws Throwable
 	 */
-	public boolean parseArg(String arg, int index, String[] args) throws Throwable {
-		File f;
-		switch (index) {
-			case 0:
-				if (!(f = new File(arg)).exists())
-					throw new Throwable("Jar to obfuscate not found :L");
-				inF = f;
+	public void parseArgs() throws Throwable {
+		Options options = new Options();
 
-				break;
-			case 1:
-				if ((f = new File(arg)).exists()) {
-					String postfix = "." + new Random().nextInt(100);
-					args[1] += postfix;
-					System.out.println("Out file already exists. Using " + postfix);
-					return true;
-				}
-				outF = f;
+		Option inputArg = new Option("i", "input", true, "Input .jar/.class file/folder path");
+		inputArg.setRequired(true);
+		inputArg.setArgName("path");
+		options.addOption(inputArg);
+
+		Option outputArg = new Option("o", "output", true, "Output .jar path");
+		outputArg.setRequired(true);
+		outputArg.setArgName("path");
+		options.addOption(outputArg);
+
+		Option librariesArg = new Option("l", "libraries", true, "Libraries path (separated by semicolons/multiple arguments)");
+		librariesArg.setRequired(false);
+		librariesArg.setArgName("path");
+		options.addOption(librariesArg);
+
+		Option transformersArg = new Option("t", "transformers", true, "Transformers (separated by semicolons/multiple arguments)");
+		transformersArg.setRequired(true);
+		transformersArg.setArgName("transformers");
+		options.addOption(transformersArg);
+
+		Option dictionaryArg = new Option("d", "dictionary", true, "Dictionary type");
+		dictionaryArg.setRequired(true);
+		dictionaryArg.setArgName("1/2/3");
+		options.addOption(dictionaryArg);
+
+		CommandLineParser parser = new DefaultParser();
+		HelpFormatter formatter = new HelpFormatter();
+
+		try {
+			cmd = parser.parse(options, args);
+		} catch (ParseException e) {
+			System.out.println(e.getMessage());
+			formatter.printHelp("java -jar NeonObf.jar", options, true);
+			System.out.println("Example: java -jar NeonObf.jar --input IN.jar --output OUT.jar --transformers SourceFileRemover;LineNumberObfuscation;FinalRemover;LocalVariableNameObfuscator;BasicTypesEncryption;GotoFloodObfuscation;CodeHider --dictionary 3");
+
+			System.exit(1);
+			return;
+		}
+
+		if (!(inF = new File(cmd.getOptionValue("input"))).exists())
+			throw new Throwable("Error: Input file does not exist.");
+
+		if ((outF = new File(cmd.getOptionValue("output"))).exists())
+			throw new Throwable("Error: Output file already exists.");
+
+		ArrayList<String> librariesList = new ArrayList<>();
+		if(cmd.hasOption("libraries"))
+			for (String libraryName1 : cmd.getOptionValues("libraries"))
+				for (String libraryName2 : libraryName1.split(";"))
+					librariesList.add(libraryName2);
+		libraries = librariesList.toArray(new String[librariesList.size()]);
 
+		ArrayList<String> usedTransformersList = new ArrayList<>();
+		for(String transformerName1 : cmd.getOptionValues("transformers"))
+			for(String transformerName2 : transformerName1.split(";"))
+				usedTransformersList.add(transformerName2);
+		usedTransformers = usedTransformersList.toArray(new String[usedTransformersList.size()]);
+
+		int dictiounary;
+		try {
+			dictiounary = Integer.parseInt(cmd.getOptionValue("dictionary"));
+		} catch(NumberFormatException t) {
+			throw new Throwable("Dictionary must be a number (1-3)");
+		}
+		switch(dictiounary) {
+			case 1:
+				nameGen = new SmartNameGen("abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + "_");
 				break;
 			case 2:
-				if (!(f = new File(arg)).exists() && !arg.equalsIgnoreCase("null"))
-					throw new Throwable(".JAR/.class/folder with libraries must exist! (it can be empty folder or \'null\')");
-
+				nameGen = new SmartNameGen("abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + "_.#{}");
 				break;
 			case 3:
-				usedTransformers = arg.split(";");
-
-				break;
-			case 4:
-				if (arg.equalsIgnoreCase("min"))
-					nameGen = new SmartNameGen("abcdefghijklmnopqrstuvwxyz"
-							+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + "_");
-				else
-				if (arg.equalsIgnoreCase("norm"))
-					nameGen = new SmartNameGen("abcdefghijklmnopqrstuvwxyz"
-							+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + "_.#{}");
-				else
-				if (arg.equalsIgnoreCase("max"))
-					nameGen = new SmartNameGen("\r" + "\t");
-				else
-					throw new Throwable("Arg " + index + " is not valid. Arg is " + arg);
-
-				//existTransformers.put("AntiMemoryDump", new AntiMemoryDump());
-				transformers.put("BasicTypesEncryption", new BasicTypesEncryption());
-				transformers.put("CodeHider", new CodeHider());
-				transformers.put("FinalRemover", new FinalRemover());
-				transformers.put("GotoFloodObfuscation", new GotoFloodObfuscation());
-				transformers.put("LineNumberObfuscation", new LineNumberObfuscation());
-				transformers.put("LocalVariableNameObfuscator", new LocalVariableNameObfuscator());
-				transformers.put("SourceFileRemover", new SourceFileRemover());
-				transformers.put("TryCatch", new TryCatch());
-
+				nameGen = new SmartNameGen("\r" + "\t");
 				break;
 			default:
-				System.out.println("Arg " + index + " is excess.");
-				break;
+				throw new Throwable("Dictionary number must be in range of 1 to 3");
 		}
 
-		return false;
+		//existTransformers.put("AntiMemoryDump", new AntiMemoryDump());
+		transformers.put("BasicTypesEncryption", new BasicTypesEncryption());
+		transformers.put("CodeHider", new CodeHider());
+		transformers.put("FinalRemover", new FinalRemover());
+		transformers.put("GotoFloodObfuscation", new GotoFloodObfuscation());
+		transformers.put("LineNumberObfuscation", new LineNumberObfuscation());
+		transformers.put("LocalVariableNameObfuscator", new LocalVariableNameObfuscator());
+		transformers.put("SourceFileRemover", new SourceFileRemover());
+		transformers.put("TryCatch", new TryCatch());
 	}
 
 	public static boolean isEmpty(MethodNode mn) {
@@ -150,7 +162,7 @@ public void run() {
 		try {
 			printLogo();
 			try {
-				checkArgs();
+				parseArgs();
 			} catch(Throwable t) {
 				String msg = t.getMessage();
 				if (msg != null)
@@ -161,10 +173,9 @@ public void run() {
 
 			System.out.println("Loading java APIs...");
 			new DirWalker(new File(System.getProperty("java.home") + File.separatorChar + "lib"), true);
-			if (!args[2].equalsIgnoreCase("null")) {
-				System.out.println("Loading user APIs...");
-				new DirWalker(new File(args[2]), true);
-			}
+			System.out.println("Loading user APIs...");
+			for(String lib : libraries)
+				new DirWalker(new File(lib), true);
 			System.out.println("All APIs loaded!");
 
 			System.out.println("--------------------------------------------------");
@@ -186,8 +197,11 @@ public void run() {
 			for(String transformerName : usedTransformers) {
 				System.out.println("Started transformation with " + transformerName + " transformer");
 
-				modClasses = transformers.get(transformerName).obfuscate(modClasses);
-
+				try {
+					modClasses = transformers.get(transformerName).obfuscate(modClasses);
+				} catch(NullPointerException npe) {
+					throw new Throwable("Transformer name \"" + transformerName + "\" aren't defined in Main#transformers.", npe);
+				}
 				System.out.println("Transformation completed with " + transformerName + " transformer");
 			}
 
@@ -202,7 +216,7 @@ public void run() {
 			saveAll();
 			System.out.println("All classes saved!");
 		} catch(Throwable t) {
-			t.printStackTrace();
+			System.out.println(t.getMessage());
 		}
 	}
 
@@ -251,7 +265,7 @@ public static String getDateTag() {
 
 	public byte[] dump(ClassNode node, boolean autoAdd) {
 		if (node.innerClasses != null)
-			((List<InnerClassNode>) node.innerClasses).stream().filter(in -> in.innerName != null).forEach(in -> {
+			((List<InnerClassNode>) node.innerClasses).parallelStream().filter(in -> in.innerName != null).forEach(in -> {
 				if (in.innerName.indexOf('/') != -1)
 					in.innerName = in.innerName.substring(in.innerName.lastIndexOf('/') + 1); // Stringer
 			});

com/neonObf/transformers/AntiMemoryDump.java

@@ -15,19 +15,23 @@
 
 /**
  * BETA
- + At moment (22.02.2017) this is abadoned module. I don't have enough time
+ + At moment (22.02.2017) this is abandoned module. I don't have enough time
  *
  * @author moofMonkey
  */
+@Deprecated
 public class AntiMemoryDump extends Transformer {
+	@Deprecated
 	public AntiMemoryDump(MethodNode _mn) {
 		super(_mn, null);
 	}
 
+	@Deprecated
 	public AntiMemoryDump() {
 		super(null, null);
 	}
 
+	@Deprecated
 	@Override
 	public void run() {
 		ListIterator<AbstractInsnNode> iterator;
@@ -52,6 +56,7 @@ public void run() {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public ArrayList<ClassNode> obfuscate(ArrayList<ClassNode> classes) throws Throwable {
 		for(int i = 0; i < classes.size(); i++) {