Changeset 7335 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-07-26T03:50:31+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10230, see #10033 - big rework of HTTPS support for Remote Control:

• HTTPS disabled by default, must be enabled in remote control preferences
• Old certificate and private key removed from jar and Windows keystore if found, even if remote control disabled
• New certificate generated at runtime with critical X509 extensions BasicConstraints (non-CA certificate), ExtendedKeyUsage (usage restriction for TLS server sessions)
• New passwords generated at runtime (but stored in clear in user preferences)
• Private key is no longer stored in Windows keystore (only certificate)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• FullscreenToggleAction.java (modified) (3 diffs)
• RestartAction.java (modified) (2 diffs)
• ShowStatusReportAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -77 +76 @@
             }
         }
-        
+
         boolean selected = isSelected();
 
@@ -95 +94 @@
         // screen by default (it's a simulated mode, but should be ok)
         String exclusive = Main.pref.get("draw.fullscreen.exclusive-mode", "auto");
-        if ("true".equals(exclusive) || ("auto".equals(exclusive) && !(Main.platform instanceof PlatformHookWindows))) {
+        if ("true".equals(exclusive) || ("auto".equals(exclusive) && !Main.isPlatformWindows())) {
             gd.setFullScreenWindow(selected ? frame : null);
         }

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -76 +75 @@
             // java binary
             final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator +
-                    (Main.platform instanceof PlatformHookWindows ? "java.exe" : "java");
+                    (Main.isPlatformWindows() ? "java.exe" : "java");
             if (!new File(java).isFile()) {
                 throw new IOException("Unable to find suitable java runtime at "+java);

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -105 +104 @@
         try {
             final String envJavaHome = System.getenv("JAVA_HOME");
-            final String envJavaHomeAlt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}";
+            final String envJavaHomeAlt = Main.isPlatformWindows() ? "%JAVA_HOME%" : "${JAVA_HOME}";
             final String propJavaHome = System.getProperty("java.home");
             final String propJavaHomeAlt = "<java.home>";
@@ -160 +159 @@
         try {
             Map<String, Setting<?>> settings = Main.pref.getAllSettings();
-            settings.remove("osm-server.username");
-            settings.remove("osm-server.password");
-            settings.remove("oauth.access-token.key");
-            settings.remove("oauth.access-token.secret");
             Set<String> keys = new HashSet<>(settings.keySet());
             for (String key : keys) {
-                if (key.startsWith("marker.show")) {
+                // Remove sensitive information from status report
+                if (key.startsWith("marker.show") || key.contains("username") || key.contains("password") || key.contains("access-token")) {
                     settings.remove(key);
                 }