Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Strict Python Parameters

Browse source
This commit is contained in:
Konloch 2021-07-19 11:28:47 -07:00
parent c2d2f6627d
commit efd9f84729
8 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/the/bytecode/club/bytecodeviewer/Configuration.java
View file

@ -15,9 +15,9 @@ import java.io.File;
public class Configuration public class Configuration
{ {
public static String python2 = ""; public static String python2 = "";
public static String python2Extra = ""; public static boolean python2Extra = false;
public static String python3 = ""; public static String python3 = "";
public static String python3Extra = ""; public static boolean python3Extra = false;
public static String rt = ""; public static String rt = "";
public static String library = ""; public static String library = "";
public static String javac = ""; public static String javac = "";

12
src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java
View file

@ -194,10 +194,12 @@ public class SettingsSerializer
save(BytecodeViewer.viewer.viewPane3.isPaneEditable()); save(BytecodeViewer.viewer.viewPane3.isPaneEditable());
save(Configuration.javaTools); save(Configuration.javaTools);
save(Configuration.python2Extra); save("deprecated");
save(Configuration.python3Extra); save("deprecated");
save(Configuration.lastSaveDirectory); save(Configuration.lastSaveDirectory);
save(Configuration.lastPluginDirectory); save(Configuration.lastPluginDirectory);
save(Configuration.python2Extra);
save(Configuration.python3Extra);
} catch (Exception e) { } catch (Exception e) {
BytecodeViewer.handleException(e); BytecodeViewer.handleException(e);
} }
@ -388,10 +390,12 @@ public class SettingsSerializer
BytecodeViewer.viewer.viewPane3.setPaneEditable(asBoolean(133)); BytecodeViewer.viewer.viewPane3.setPaneEditable(asBoolean(133));
Configuration.javaTools = asString(134); Configuration.javaTools = asString(134);
Configuration.python2Extra = asString(135); //ignore 135
Configuration.python3Extra = asString(136); //ignore 136
Configuration.lastSaveDirectory = asString(137); Configuration.lastSaveDirectory = asString(137);
Configuration.lastPluginDirectory = asString(138); Configuration.lastPluginDirectory = asString(138);
Configuration.python2Extra = asBoolean(139);
Configuration.python3Extra = asBoolean(140);
} }
catch (IndexOutOfBoundsException e) catch (IndexOutOfBoundsException e)
{ {

4
src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/KrakatauAssembler.java
View file

@ -70,8 +70,8 @@ public class KrakatauAssembler extends InternalCompiler
try try
{ {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,

12
src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java
View file

@ -93,8 +93,8 @@ public class KrakatauDecompiler extends InternalDecompiler
try { try {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,
@ -177,8 +177,8 @@ public class KrakatauDecompiler extends InternalDecompiler
try { try {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,
@ -255,8 +255,8 @@ public class KrakatauDecompiler extends InternalDecompiler
try { try {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,

8
src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java
View file

@ -62,8 +62,8 @@ public class KrakatauDisassembler extends InternalDecompiler
try { try {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,
@ -127,8 +127,8 @@ public class KrakatauDisassembler extends InternalDecompiler
try { try {
String[] pythonCommands = new String[]{Configuration.python2}; String[] pythonCommands = new String[]{Configuration.python2};
if(!Configuration.python2Extra.isEmpty()) if(Configuration.python2Extra)
pythonCommands = ArrayUtils.addAll(pythonCommands, Configuration.python2Extra); pythonCommands = ArrayUtils.addAll(pythonCommands, "-2");
ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll( ProcessBuilder pb = new ProcessBuilder(ArrayUtils.addAll(
pythonCommands, pythonCommands,

4
src/main/java/the/bytecode/club/bytecodeviewer/gui/components/HTMLPane.java
View file

@ -34,8 +34,8 @@ public class HTMLPane extends JEditorPane
text = text.replace("{java}", Configuration.java); text = text.replace("{java}", Configuration.java);
text = text.replace("{javac}", Configuration.javac); text = text.replace("{javac}", Configuration.javac);
text = text.replace("{bcvDir}", BCVDir.getAbsolutePath()); text = text.replace("{bcvDir}", BCVDir.getAbsolutePath());
text = text.replace("{python}", Configuration.python2+" " + Configuration.python2Extra); text = text.replace("{python}", Configuration.python2+" " + (Configuration.python2Extra ? "-2" : ""));
text = text.replace("{python3}", Configuration.python3 + " " + Configuration.python3Extra); text = text.replace("{python3}", Configuration.python3 + " " + (Configuration.python3Extra ? "-3" : ""));
text = text.replace("{rt}", Configuration.rt); text = text.replace("{rt}", Configuration.rt);
text = text.replace("{lib}", Configuration.library); text = text.replace("{lib}", Configuration.library);
text = text.replace("{krakatauVersion}", krakatauVersion); text = text.replace("{krakatauVersion}", krakatauVersion);

6
src/main/java/the/bytecode/club/bytecodeviewer/resources/ExternalResources.java
View file

@ -128,7 +128,7 @@ public class ExternalResources
//check using python CLI flag //check using python CLI flag
testCommand(new String[]{"python", "-2", "--version"}, "python 2", ()->{ testCommand(new String[]{"python", "-2", "--version"}, "python 2", ()->{
Configuration.python2 = "python"; Configuration.python2 = "python";
Configuration.python2Extra = "-2"; Configuration.python2Extra = true;
}); });
if(!Configuration.python2.isEmpty()) if(!Configuration.python2.isEmpty())
return Configuration.python2; return Configuration.python2;
@ -230,7 +230,7 @@ public class ExternalResources
return; return;
Configuration.python2 = file.getAbsolutePath(); Configuration.python2 = file.getAbsolutePath();
Configuration.python2Extra = ""; Configuration.python2Extra = false;
SettingsSerializer.saveSettingsAsync(); SettingsSerializer.saveSettingsAsync();
} }
@ -244,7 +244,7 @@ public class ExternalResources
return; return;
Configuration.python3 = file.getAbsolutePath(); Configuration.python3 = file.getAbsolutePath();
Configuration.python3Extra = ""; Configuration.python3Extra = false;
SettingsSerializer.saveSettingsAsync(); SettingsSerializer.saveSettingsAsync();
} }

2
src/main/java/the/bytecode/club/bytecodeviewer/util/SecurityMan.java
View file

@ -64,7 +64,7 @@ public class SecurityMan extends SecurityManager
* *
* When paired with checkWrite it should prevent most escapes * When paired with checkWrite it should prevent most escapes
* JNI is still possible so make sure to block checkLink as well //TODO for BCV * JNI is still possible so make sure to block checkLink as well //TODO for BCV
* *
* Rewritten on 07/19/2021 * Rewritten on 07/19/2021
* *
* @author Konloch * @author Konloch