Updated For Plugin API Changes

Konloch · Konloch · commit 1eda5e7f78ff · 2021-07-13T05:10:24.000-07:00
This will make it easier on the user to inform them which file the class resources are in
diff --git a/plugins/example/ExampleStringDecrypter.java b/plugins/example/ExampleStringDecrypter.java
@@ -15,7 +15,7 @@ public class ExampleStringDecrypter extends Plugin {
 
     @Override
     public void execute(ArrayList<ClassNode> classNodesList) {
-        PluginConsole gui = new PluginConsole("Example String Decrypter");
+        PluginConsole gui = new PluginConsole(activeContainer.name + "Example String Decrypter");
 
         MultipleChoiceDialogue dialogue = new MultipleChoiceDialogue("Bytecode Viewer - WARNING",
                 "WARNING: This will load the classes into the JVM and execute the initialize function"
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java
@@ -70,7 +70,7 @@ public String decompileClassNode(final ClassNode cn, byte[] b)
         String start = tempDirectory + fs + MiscUtils.getUniqueName("", ".class");
 
         final File tempClass = new File(start + ".class");
-
+        
         String exception = "";
         try {
             final FileOutputStream fos = new FileOutputStream(tempClass);
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/AllatoriStringDecrypter.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/AllatoriStringDecrypter.java
@@ -45,7 +45,6 @@
 
 public class AllatoriStringDecrypter extends Plugin
 {
-	final PluginConsole frame = new PluginConsole("Allatori String Decrypter");
 	final StringBuilder out = new StringBuilder();
 	final String className;
 	
@@ -54,6 +53,8 @@ public class AllatoriStringDecrypter extends Plugin
 	@Override
 	public void execute(ArrayList<ClassNode> classNodeList)
 	{
+		PluginConsole frame = new PluginConsole(activeContainer.name + " - Allatori String Decrypter");
+		
 		MultipleChoiceDialogue dialogue = new MultipleChoiceDialogue("Bytecode Viewer - WARNING",
 				"WARNING: This will load the classes into the JVM and execute the allatori decrypter function"
 						+ nl + "for each class. IF THE FILE YOU'RE LOADING IS MALICIOUS, DO NOT CONTINUE.",
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/EZInjection.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/EZInjection.java
@@ -51,7 +51,6 @@ public class EZInjection extends Plugin
 {
     public static ArrayList<BytecodeHook> hookArray = new ArrayList<>();
     private static final String version = "1.0";
-    private static final PluginConsole gui = new PluginConsole("EZ Injection v" + version);
     private final boolean accessModifiers;
     private final boolean injectHooks;
     private final boolean invokeMethod;
@@ -140,7 +139,7 @@ public static void print(String message)
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        BytecodeViewer.updateBusyStatus(true);
+        PluginConsole gui = new PluginConsole(activeContainer.name + " - EZ Injection v" + version);
         
         gui.setText("");
 
@@ -328,7 +327,5 @@ else if (injectHooks)
                 }
             }
         }
-
-        BytecodeViewer.updateBusyStatus(false);
     }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/MaliciousCodeScanner.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/MaliciousCodeScanner.java
@@ -51,7 +51,7 @@ public MaliciousCodeScanner(List<MaliciousCodeOptions> options)
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        PluginConsole frame = new PluginConsole("Malicious Code Scanner");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - Malicious Code Scanner");
         StringBuilder sb = new StringBuilder();
         
         HashSet<String> scanOptions = new HashSet<>();
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ReplaceStrings.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ReplaceStrings.java
@@ -36,7 +36,7 @@
 
 public class ReplaceStrings extends Plugin
 {
-    PluginConsole frame = new PluginConsole("Replace Strings");
+    PluginConsole frame;
     String originalLDC;
     String newLDC;
     String className;
@@ -53,6 +53,8 @@ public ReplaceStrings(String originalLDC, String newLDC, String className, boole
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
+        frame = new PluginConsole(activeContainer.name + " - Replace Strings");
+        
         if (!className.equals("*"))
         {
             for (ClassNode classNode : classNodeList)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ShowAllStrings.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ShowAllStrings.java
@@ -44,7 +44,7 @@ public class ShowAllStrings extends Plugin
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        PluginConsole frame = new PluginConsole("Show All Strings");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - Show All Strings");
         StringBuilder sb = new StringBuilder();
         
         for (ClassNode classNode : classNodeList)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ShowMainMethods.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ShowMainMethods.java
@@ -39,7 +39,7 @@ public class ShowMainMethods extends Plugin
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        PluginConsole frame = new PluginConsole("Show Main Methods");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - Show Main Methods");
         StringBuilder sb = new StringBuilder();
         
         for (ClassNode classNode : classNodeList)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/StackFramesRemover.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/StackFramesRemover.java
@@ -15,7 +15,7 @@ public class StackFramesRemover extends Plugin
     public void execute(ArrayList<ClassNode> classNodeList)
     {
         AtomicInteger counter = new AtomicInteger();
-        PluginConsole frame = new PluginConsole("StackFrames Remover");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - StackFrames Remover");
         for (ClassNode cn : classNodeList)
         {
             for (MethodNode mn : cn.methods)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ViewAPKAndroidPermissions.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ViewAPKAndroidPermissions.java
@@ -17,7 +17,7 @@ public class ViewAPKAndroidPermissions extends Plugin
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        PluginConsole frame = new PluginConsole("Android Permissions");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - Android Permissions");
         frame.setVisible(true);
         
         byte[] encodedAndroidManifest = BytecodeViewer.getFileContents("AndroidManifest.xml");
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ViewManifest.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ViewManifest.java
@@ -17,7 +17,7 @@ public class ViewManifest extends Plugin
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
-        PluginConsole frame = new PluginConsole("View Manifest");
+        PluginConsole frame = new PluginConsole(activeContainer.name + " - View Manifest");
         frame.setVisible(true);
         
         //TODO android APKs may have AndroidManifests that can be viewed normally, this should be checked
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ZStringArrayDecrypter.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/ZStringArrayDecrypter.java
@@ -41,12 +41,12 @@
 
 public class ZStringArrayDecrypter extends Plugin
 {
-    PluginConsole gui = new PluginConsole("ZStringArray Decrypter");
-    StringBuilder out = new StringBuilder();
-
     @Override
     public void execute(ArrayList<ClassNode> classNodeList)
     {
+        PluginConsole gui = new PluginConsole(activeContainer.name + " - ZStringArray Decrypter");
+        StringBuilder out = new StringBuilder();
+    
         MultipleChoiceDialogue dialogue = new MultipleChoiceDialogue("Bytecode Viewer - WARNING",
                 "WARNING: This will load the classes into the JVM and execute the initialize function"
                         + nl + "for each class. IF THE FILE YOU'RE LOADING IS MALICIOUS, DO NOT CONTINUE.",
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavascriptPluginLaunchStrategy.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavascriptPluginLaunchStrategy.java
@@ -62,6 +62,10 @@ public void execute(ArrayList<ClassNode> classNodeList)
             {
                 try
                 {
+                    //add the active container as a global variable to the JS script
+                    finalEngine.put("activeContainer", activeContainer);
+                    
+                    //invoke the JS function
                     ((Invocable) finalEngine).invokeFunction("execute", classNodeList);
                 }
                 catch (NoSuchMethodException | ScriptException e)
diff --git a/src/main/resources/templates/Template_Plugin.java b/src/main/resources/templates/Template_Plugin.java
@@ -4,15 +4,19 @@
 
 public class Template extends Plugin
 {
-	PluginConsole gui = new PluginConsole("Java Template");
+	PluginConsole gui;
 	
 	/**
 	 * Main function
 	 */
 	@Override
 	public void execute(ArrayList<ClassNode> classNodeList)
 	{
+		//create console
+		gui = new PluginConsole(activeContainer.name + "Java Template");
 		gui.setVisible(true); //show the console
+		
+		//debug text
 		out("Class Nodes: " + classNodeList.size());
 		
 		//iterate through each class node
diff --git a/src/main/resources/templates/Template_Plugin.js b/src/main/resources/templates/Template_Plugin.js
@@ -1,12 +1,13 @@
 var BCV = Java.type("the.bytecode.club.bytecodeviewer.api.BCV");
 var PluginConsole = Java.type("the.bytecode.club.bytecodeviewer.api.PluginConsole");
-var gui = new PluginConsole("Javascript Template");
+var gui;
 
 /**
  * Main function
  */
 function execute(classNodeList)
 {
+    gui = new PluginConsole(activeContainer.name + "Javascript Template");
 	gui.setVisible(true); //show the console
 	out("Class Nodes: " + classNodeList.size());
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@`
`45`	`45`
`46`	`46`	`public class AllatoriStringDecrypter extends Plugin`
`47`	`47`	`{`
`48`		`- final PluginConsole frame = new PluginConsole("Allatori String Decrypter");`
`49`	`48`	`final StringBuilder out = new StringBuilder();`
`50`	`49`	`final String className;`
`51`	`50`
`@@ -54,6 +53,8 @@ public class AllatoriStringDecrypter extends Plugin`
`54`	`53`	`@Override`
`55`	`54`	`public void execute(ArrayList<ClassNode> classNodeList)`
`56`	`55`	`{`
	`56`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - Allatori String Decrypter");`
	`57`	`+`
`57`	`58`	`MultipleChoiceDialogue dialogue = new MultipleChoiceDialogue("Bytecode Viewer - WARNING",`
`58`	`59`	`"WARNING: This will load the classes into the JVM and execute the allatori decrypter function"`
`59`	`60`	`+ nl + "for each class. IF THE FILE YOU'RE LOADING IS MALICIOUS, DO NOT CONTINUE.",`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ public class EZInjection extends Plugin`
`51`	`51`	`{`
`52`	`52`	`public static ArrayList<BytecodeHook> hookArray = new ArrayList<>();`
`53`	`53`	`private static final String version = "1.0";`
`54`		`- private static final PluginConsole gui = new PluginConsole("EZ Injection v" + version);`
`55`	`54`	`private final boolean accessModifiers;`
`56`	`55`	`private final boolean injectHooks;`
`57`	`56`	`private final boolean invokeMethod;`
`@@ -140,7 +139,7 @@ public static void print(String message)`
`140`	`139`	`@Override`
`141`	`140`	`public void execute(ArrayList<ClassNode> classNodeList)`
`142`	`141`	`{`
`143`		`- BytecodeViewer.updateBusyStatus(true);`
	`142`	`+ PluginConsole gui = new PluginConsole(activeContainer.name + " - EZ Injection v" + version);`
`144`	`143`
`145`	`144`	`gui.setText("");`
`146`	`145`
`@@ -328,7 +327,5 @@ else if (injectHooks)`
`328`	`327`	`}`
`329`	`328`	`}`
`330`	`329`	`}`
`331`		`-`
`332`		`- BytecodeViewer.updateBusyStatus(false);`
`333`	`330`	`}`
`334`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public MaliciousCodeScanner(List<MaliciousCodeOptions> options)`
`51`	`51`	`@Override`
`52`	`52`	`public void execute(ArrayList<ClassNode> classNodeList)`
`53`	`53`	`{`
`54`		`- PluginConsole frame = new PluginConsole("Malicious Code Scanner");`
	`54`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - Malicious Code Scanner");`
`55`	`55`	`StringBuilder sb = new StringBuilder();`
`56`	`56`
`57`	`57`	`HashSet<String> scanOptions = new HashSet<>();`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`
`37`	`37`	`public class ReplaceStrings extends Plugin`
`38`	`38`	`{`
`39`		`- PluginConsole frame = new PluginConsole("Replace Strings");`
	`39`	`+ PluginConsole frame;`
`40`	`40`	`String originalLDC;`
`41`	`41`	`String newLDC;`
`42`	`42`	`String className;`
`@@ -53,6 +53,8 @@ public ReplaceStrings(String originalLDC, String newLDC, String className, boole`
`53`	`53`	`@Override`
`54`	`54`	`public void execute(ArrayList<ClassNode> classNodeList)`
`55`	`55`	`{`
	`56`	`+ frame = new PluginConsole(activeContainer.name + " - Replace Strings");`
	`57`	`+`
`56`	`58`	`if (!className.equals("*"))`
`57`	`59`	`{`
`58`	`60`	`for (ClassNode classNode : classNodeList)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class ShowAllStrings extends Plugin`
`44`	`44`	`@Override`
`45`	`45`	`public void execute(ArrayList<ClassNode> classNodeList)`
`46`	`46`	`{`
`47`		`- PluginConsole frame = new PluginConsole("Show All Strings");`
	`47`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - Show All Strings");`
`48`	`48`	`StringBuilder sb = new StringBuilder();`
`49`	`49`
`50`	`50`	`for (ClassNode classNode : classNodeList)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class ShowMainMethods extends Plugin`
`39`	`39`	`@Override`
`40`	`40`	`public void execute(ArrayList<ClassNode> classNodeList)`
`41`	`41`	`{`
`42`		`- PluginConsole frame = new PluginConsole("Show Main Methods");`
	`42`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - Show Main Methods");`
`43`	`43`	`StringBuilder sb = new StringBuilder();`
`44`	`44`
`45`	`45`	`for (ClassNode classNode : classNodeList)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class StackFramesRemover extends Plugin`
`15`	`15`	`public void execute(ArrayList<ClassNode> classNodeList)`
`16`	`16`	`{`
`17`	`17`	`AtomicInteger counter = new AtomicInteger();`
`18`		`- PluginConsole frame = new PluginConsole("StackFrames Remover");`
	`18`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - StackFrames Remover");`
`19`	`19`	`for (ClassNode cn : classNodeList)`
`20`	`20`	`{`
`21`	`21`	`for (MethodNode mn : cn.methods)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ViewAPKAndroidPermissions extends Plugin`
`17`	`17`	`@Override`
`18`	`18`	`public void execute(ArrayList<ClassNode> classNodeList)`
`19`	`19`	`{`
`20`		`- PluginConsole frame = new PluginConsole("Android Permissions");`
	`20`	`+ PluginConsole frame = new PluginConsole(activeContainer.name + " - Android Permissions");`
`21`	`21`	`frame.setVisible(true);`
`22`	`22`
`23`	`23`	`byte[] encodedAndroidManifest = BytecodeViewer.getFileContents("AndroidManifest.xml");`