Changeset 7337 in josm

Timestamp:

2014-07-26T16:36:43+02:00 (9 years ago)

Author:

Don-vip

Message:

see #10230, see #10033 - SAN tweaks + fix unit test (for real?)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -79 +79 @@
     private SSLContext sslContext;
 
-    private static final String KEYSTORE_FILENAME = "josm.keystore";
+    private static final int HTTPS_PORT = 8112;
+
+    /**
+     * JOSM keystore file name.
+     * @since 7337
+     */
+    public static final String KEYSTORE_FILENAME = "josm.keystore";
 
     /**
@@ -196 +202 @@
                     KeyPair pair = generator.generateKeyPair();
 
-                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA", "ip:127.0.0.1");
+                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
+                            "ip:127.0.0.1,dns:localhost,uri:https://127.0.0.1:"+HTTPS_PORT);
 
                     KeyStore ks = KeyStore.getInstance("JKS");
@@ -255 +262 @@
      */
     public static void restartRemoteControlHttpsServer() {
-        int port = Main.pref.getInteger("remote.control.https.port", 8112);
+        int port = Main.pref.getInteger("remote.control.https.port", HTTPS_PORT);
         try {
             stopRemoteControlHttpsServer();

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

@@ -262 +262 @@
             }
         }
-        // JOSM certificate not found, install it
+        // JOSM certificate not found, install it to Windows-ROOT keystore, used by IE, Chrome and Safari, but not by Firefox
         Main.info(tr("Adding JOSM localhost certificate to {0} keystore", WINDOWS_ROOT));
         ks.setEntry("josm_localhost", trustedCert, null);

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -13 +13 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
@@ -45 +47 @@
         JOSMFixture.createUnitTestFixture().init();
         RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.put(true);
+        try {
+            Files.deleteIfExists(Paths.get(
+                    RemoteControl.getRemoteControlDir()).resolve(RemoteControlHttpsServer.KEYSTORE_FILENAME));
+        } catch (IOException e) {
+            Main.error(e);
+        }
+
         RemoteControl.start();
         disableCertificateValidation();