Print the re-mapping of classes/methods/fields

im-frizzy · im-frizzy · commit d4611106cb33 · 2015-02-28T22:10:45.000-06:00
diff --git a/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
@@ -340,6 +340,8 @@ public void rtC() {
 	private final JSeparator separator_6 = new JSeparator();
 	public final JCheckBoxMenuItem refreshOnChange = new JCheckBoxMenuItem("Refresh On View Change");
 
+	public FileNavigationPane cn = new FileNavigationPane(this);
+	
 	public boolean isMaximized = false;
 	
 	public void removed(boolean busy) {
@@ -1434,6 +1436,7 @@ public void actionPerformed(ActionEvent arg0) {
 				}
 				new RenameFields().start();
 				workPane.refreshClass.doClick();
+				cn.tree.updateUI();
 			}
 		});
 
@@ -1455,6 +1458,7 @@ public void actionPerformed(ActionEvent arg0) {
 				}
 				new RenameMethods().start();
 				workPane.refreshClass.doClick();
+				cn.tree.updateUI();
 			}
 		});
 
@@ -1467,6 +1471,7 @@ public void actionPerformed(ActionEvent arg0) {
 				}
 				new RenameClasses().start();
 				workPane.refreshClass.doClick();
+				cn.tree.updateUI();
 			}
 		});
 
@@ -1575,7 +1580,6 @@ public void actionPerformed(ActionEvent e) {
 				new BoxLayout(getContentPane(), BoxLayout.X_AXIS));
 
 		// scrollPane.setViewportView(tree);
-		FileNavigationPane cn = new FileNavigationPane(this);
 		cn.setMinimumSize(new Dimension(200, 50));
 		// panel.add(cn);
 		SearchingPane s = new SearchingPane(this);
diff --git a/src/the/bytecode/club/bytecodeviewer/obfuscators/JavaObfuscator.java b/src/the/bytecode/club/bytecodeviewer/obfuscators/JavaObfuscator.java
@@ -43,6 +43,9 @@ protected String generateUniqueName(int length) {
 		String name = "";
 		while (!found) {
 			String nameTry = MiscUtils.randomString(1) + MiscUtils.randomStringNum(length - 1);
+			if (!Character.isJavaIdentifierStart(nameTry.toCharArray()[0]))
+				continue;
+			
 			if (!names.contains(nameTry)) {
 				names.add(nameTry);
 				name = nameTry;
diff --git a/src/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RefactorMapper.java b/src/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RefactorMapper.java
@@ -1,6 +1,8 @@
 package the.bytecode.club.bytecodeviewer.obfuscators.mapping;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.objectweb.asm.commons.Remapper;
@@ -17,11 +19,16 @@ public class RefactorMapper extends Remapper {
     protected final Map<String, MappingData> sortedClasses;
     protected final Map<String, MethodMappingData> sortedMethods;
     protected final Map<String, FieldMappingData> sortedFields;
+    protected final List<String> mappingList;
 
+    private StringBuilder builder;
+    
     public RefactorMapper(HookMap hookMap) {
         sortedClasses = new HashMap<>();
         sortedMethods = new HashMap<>();
         sortedFields = new HashMap<>();
+        mappingList = new ArrayList<>();
+        builder = new StringBuilder();
         for(MappingData hook : hookMap.getClasses()){
             if(hook.getObfuscatedName().contains("$"))
                 continue;
@@ -46,24 +53,44 @@ public RefactorMapper(HookMap hookMap) {
 
     @Override
     public String map(String type) {
-        if (sortedClasses.containsKey(type))
+        if (sortedClasses.containsKey(type)) {
+        	String map = new String(type + " --> " + sortedClasses.get(type).getRefactoredName() + "\n");
+        	if (!mappingList.contains(map))
+        		mappingList.add(map);
+        	
             return sortedClasses.get(type).getRefactoredName();
+        }
         return type;
     }
 
     @Override
     public String mapFieldName(String owner, String name, String desc) {
         String obfKey = owner + "$$$$" + name + "$$$$" + desc;
-        if (sortedFields.containsKey(obfKey))
+        if (sortedFields.containsKey(obfKey)) {
+        	String map = new String(owner + "." + name + " --> " + owner + sortedFields.get(obfKey).getName().getRefactoredName() + "\n");
+        	if (!mappingList.contains(map))
+        		mappingList.add(map);
             name = sortedFields.get(obfKey).getName().getRefactoredName();
+        }
         return name;
     }
 
     @Override
     public String mapMethodName(String owner, String name, String desc) {
         String obfKey = owner + "$$$$" + name + "$$$$" + desc;
-        if (sortedMethods.containsKey(obfKey))
+        if (sortedMethods.containsKey(obfKey)) {
+        	String map = new String(owner + "." + name + " --> " + owner + sortedMethods.get(obfKey).getMethodName().getRefactoredName() + "\n");
+        	if (!mappingList.contains(map))
+        		mappingList.add(map);
             name = sortedMethods.get(obfKey).getMethodName().getRefactoredName();
+        }
         return name;
     }
+
+	public void printMap() {
+		for (String map : mappingList) {
+			builder.append(map);
+		}
+		System.out.println(builder.toString());
+	}
 }
diff --git a/src/the/bytecode/club/bytecodeviewer/obfuscators/mapping/Refactorer.java b/src/the/bytecode/club/bytecodeviewer/obfuscators/mapping/Refactorer.java
@@ -45,6 +45,7 @@ public void run() {
         for (Map.Entry<String, ClassNode> factor : refactored.entrySet()) {
             BytecodeViewer.relocate(factor.getKey(), factor.getValue());
         }
+        mapper.printMap();
     }
 
     private byte[] getClassNodeBytes(ClassNode cn) {
diff --git a/src/the/bytecode/club/bytecodeviewer/obfuscators/rename/RenameClasses.java b/src/the/bytecode/club/bytecodeviewer/obfuscators/rename/RenameClasses.java
@@ -22,7 +22,7 @@ public class RenameClasses extends JavaObfuscator {
 
 	@Override
 	public void obfuscate() {
-		int stringLength = getStringLength();
+		int stringLength = 5;//getStringLength();
 
 		System.out.println("Obfuscating class names...");
 		classLoop: for (ClassNode c : BytecodeViewer.getLoadedClasses()) {

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,8 @@ public void rtC() {`
`340`	`340`	`private final JSeparator separator_6 = new JSeparator();`
`341`	`341`	`public final JCheckBoxMenuItem refreshOnChange = new JCheckBoxMenuItem("Refresh On View Change");`
`342`	`342`
	`343`	`+ public FileNavigationPane cn = new FileNavigationPane(this);`
	`344`	`+`
`343`	`345`	`public boolean isMaximized = false;`
`344`	`346`
`345`	`347`	`public void removed(boolean busy) {`
`@@ -1434,6 +1436,7 @@ public void actionPerformed(ActionEvent arg0) {`
`1434`	`1436`	`}`
`1435`	`1437`	`new RenameFields().start();`
`1436`	`1438`	`workPane.refreshClass.doClick();`
	`1439`	`+ cn.tree.updateUI();`
`1437`	`1440`	`}`
`1438`	`1441`	`});`
`1439`	`1442`
`@@ -1455,6 +1458,7 @@ public void actionPerformed(ActionEvent arg0) {`
`1455`	`1458`	`}`
`1456`	`1459`	`new RenameMethods().start();`
`1457`	`1460`	`workPane.refreshClass.doClick();`
	`1461`	`+ cn.tree.updateUI();`
`1458`	`1462`	`}`
`1459`	`1463`	`});`
`1460`	`1464`
`@@ -1467,6 +1471,7 @@ public void actionPerformed(ActionEvent arg0) {`
`1467`	`1471`	`}`
`1468`	`1472`	`new RenameClasses().start();`
`1469`	`1473`	`workPane.refreshClass.doClick();`
	`1474`	`+ cn.tree.updateUI();`
`1470`	`1475`	`}`
`1471`	`1476`	`});`
`1472`	`1477`
`@@ -1575,7 +1580,6 @@ public void actionPerformed(ActionEvent e) {`
`1575`	`1580`	`new BoxLayout(getContentPane(), BoxLayout.X_AXIS));`
`1576`	`1581`
`1577`	`1582`	`// scrollPane.setViewportView(tree);`
`1578`		`- FileNavigationPane cn = new FileNavigationPane(this);`
`1579`	`1583`	`cn.setMinimumSize(new Dimension(200, 50));`
`1580`	`1584`	`// panel.add(cn);`
`1581`	`1585`	`SearchingPane s = new SearchingPane(this);`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public void run() {`
`45`	`45`	`for (Map.Entry<String, ClassNode> factor : refactored.entrySet()) {`
`46`	`46`	`BytecodeViewer.relocate(factor.getKey(), factor.getValue());`
`47`	`47`	`}`
	`48`	`+ mapper.printMap();`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`private byte[] getClassNodeBytes(ClassNode cn) {`