Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2018-04-19T20:37:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - Allow to start and close JOSM in WebStart sandbox mode (where every external access is denied). This was very useful to reproduce some very tricky bugs that occured in real life but were almost impossible to diagnose.

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -887 +887 @@
      */
     public static File getJosmTempDir() {
-        String tmpDir = System.getProperty("java.io.tmpdir");
+        String tmpDir = getSystemProperty("java.io.tmpdir");
         if (tmpDir == null) {
             return null;
@@ -1268 +1268 @@
 
     /**
+     * Gets the value of the specified environment variable.
+     * An environment variable is a system-dependent external named value.
+     * @param name name the name of the environment variable
+     * @return the string value of the variable;
+     *         {@code null} if the variable is not defined in the system environment or if a security exception occurs.
+     * @see System#getenv(String)
+     * @since 13647
+     */
+    public static String getSystemEnv(String name) {
+        try {
+            return System.getenv(name);
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to get system env", e);
+            return null;
+        }
+    }
+
+    /**
+     * Gets the system property indicated by the specified key.
+     * @param key the name of the system property.
+     * @return the string value of the system property;
+     *         {@code null} if there is no property with that key or if a security exception occurs.
+     * @see System#getProperty(String)
+     * @since 13647
+     */
+    public static String getSystemProperty(String key) {
+        try {
+            return System.getProperty(key);
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to get system property", e);
+            return null;
+        }
+    }
+
+    /**
      * Updates a given system property.
      * @param key The property key
@@ -1276 +1311 @@
     public static String updateSystemProperty(String key, String value) {
         if (value != null) {
-            String old = System.setProperty(key, value);
-            if (Logging.isDebugEnabled() && !value.equals(old)) {
-                if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
-                    Logging.debug("System property '" + key + "' set to '" + value + "'. Old value was '" + old + '\'');
-                } else {
-                    Logging.debug("System property '" + key + "' changed.");
+            try {
+                String old = System.setProperty(key, value);
+                if (Logging.isDebugEnabled() && !value.equals(old)) {
+                    if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
+                        Logging.debug("System property '" + key + "' set to '" + value + "'. Old value was '" + old + '\'');
+                    } else {
+                        Logging.debug("System property '" + key + "' changed.");
+                    }
                 }
-            }
-            return old;
+                return old;
+            } catch (SecurityException e) {
+                // Don't call Logging class, it may not be fully initialized yet
+                System.err.println("Unable to update system property: " + e.getMessage());
+            }
         }
         return null;
@@ -1592 +1632 @@
      */
     public static int getJavaVersion() {
-        String version = System.getProperty("java.version");
+        String version = getSystemProperty("java.version");
         if (version.startsWith("1.")) {
             version = version.substring(2);
@@ -1613 +1653 @@
      */
     public static int getJavaUpdate() {
-        String version = System.getProperty("java.version");
+        String version = getSystemProperty("java.version");
         if (version.startsWith("1.")) {
             version = version.substring(2);
@@ -1643 +1683 @@
      */
     public static int getJavaBuild() {
-        String version = System.getProperty("java.runtime.version");
+        String version = getSystemProperty("java.runtime.version");
         int bPos = version.indexOf('b');
         int pPos = version.indexOf('+');
@@ -1757 +1797 @@
         try {
             return new ScriptEngineManager(null).getEngineByName("JavaScript");
-        } catch (SecurityException e) {
-            Logging.error(e);
+        } catch (SecurityException | ExceptionInInitializerError e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to get JavaScript engine", e);
             return null;
         }
@@ -1789 +1829 @@
                             FileTime jarTime = Files.readAttributes(jarFile, BasicFileAttributes.class).lastModifiedTime();
                             // Copy it to temp directory (hopefully free of exclamation mark) if needed (missing or older jar)
-                            Path jarCopy = Paths.get(System.getProperty("java.io.tmpdir")).resolve(filename);
+                            Path jarCopy = Paths.get(getSystemProperty("java.io.tmpdir")).resolve(filename);
                             if (!jarCopy.toFile().exists() ||
                                     Files.readAttributes(jarCopy, BasicFileAttributes.class).lastModifiedTime().compareTo(jarTime) < 0) {