MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

let only safe keys passed as program arguments be stored into System.properties

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-08-24 14:21:54 +02:00
parent 9af3f793a7
commit e67bd5d03f
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+28 -15
View File
@@ -57,11 +57,14 @@ import java.awt.*;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class IdeaApplication {
@NonNls public static final String IDEA_IS_INTERNAL_PROPERTY = "idea.is.internal";
@NonNls public static final String IDEA_IS_UNIT_TEST = "idea.is.unit.test";
private static final String[] SAFE_JAVA_ENV_PARAMETERS = {"idea.required.plugins.id"};
private static final Logger LOG = Logger.getInstance("#com.intellij.idea.IdeaApplication");
private static IdeaApplication ourInstance;
@@ -83,21 +86,7 @@ public class IdeaApplication {
LOG.assertTrue(ourInstance == null);
//noinspection AssignmentToStaticFieldFromInstanceMethod
ourInstance = this;
//Assuming that passing -Dkey=value as a program argument is just a convenient way to setup environment
ArrayList<String> arguments = new ArrayList<String>();
for (String arg : args) {
if (arg.startsWith("-D")) {
String[] keyValue = arg.substring(2).split("=");
if (keyValue.length == 2) {
System.setProperty(keyValue[0], keyValue[1]);
continue;
}
}
arguments.add(arg);
}
myArgs = ArrayUtil.toStringArray(arguments);
myArgs = processProgramArguments(args);
boolean isInternal = Boolean.getBoolean(IDEA_IS_INTERNAL_PROPERTY);
boolean isUnitTest = Boolean.getBoolean(IDEA_IS_UNIT_TEST);
@@ -136,6 +125,30 @@ public class IdeaApplication {
myStarter.premain(args);
}
/**
* Method looks for -Dkey=value program arguments and stores some of them in system properties.
* We should use it for a limited number of safe keys.
* One of them is a list of ids of required plugins
*
* @see IdeaApplication#SAFE_JAVA_ENV_PARAMETERS
*/
@NotNull
private static String[] processProgramArguments(String[] args) {
ArrayList<String> arguments = new ArrayList<String>();
List<String> safeKeys = Arrays.asList(SAFE_JAVA_ENV_PARAMETERS);
for (String arg : args) {
if (arg.startsWith("-D")) {
String[] keyValue = arg.substring(2).split("=");
if (keyValue.length == 2 && safeKeys.contains(keyValue[0])) {
System.setProperty(keyValue[0], keyValue[1]);
continue;
}
}
arguments.add(arg);
}
return ArrayUtil.toStringArray(arguments);
}
private static void patchSystem(boolean headless) {
System.setProperty("sun.awt.noerasebackground", "true");