Changeset 7206 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-06-01T17:55:24+02:00 (11 years ago)

Author:

Don-vip

Message:

see #10033 - allow remote control to work from osm.org in https on Windows systems by adding updated JOSM localhost certificate to Windows Root Certificates keystore

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHook.java (modified) (2 diffs)
• PlatformHookUnixoid.java (modified) (3 diffs)
• PlatformHookWindows.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 
 /**
@@ -102 +106 @@
      */
     public String getOSDescription();
+
+    /**
+     * Setup system keystore to add JOSM HTTPS certificate (for remote control).
+     * @param privateKeyEntry the JOSM certificate for localhost and associated private key
+     * @throws KeyStoreException in case of error
+     * @throws IOException in case of error
+     * @throws CertificateException in case of error
+     * @throws NoSuchAlgorithmException in case of error
+     * @since 7206
+     */
+    public void setupHttpsCertificate(KeyStore.PrivateKeyEntry privateKeyEntry)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
 }

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

@@ -16 +16 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.Arrays;
 
@@ -25 +29 @@
 
 /**
- * see PlatformHook.java
- *
- * BTW: THIS IS A STUB. See comments below for details.
+ * {@code PlatformHook} base implementation.
  *
  * Don't write (Main.platform instanceof PlatformHookUnixoid) because other platform
@@ -364 +366 @@
         });
     }
+
+    @Override
+    public void setupHttpsCertificate(KeyStore.PrivateKeyEntry privateKeyEntry)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+        // TODO setup HTTPS certificate on Unix systems
+    }
 }

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

@@ -30 +30 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.util.Enumeration;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -129 +137 @@
                 ((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
     }
+
+    @Override
+    public void setupHttpsCertificate(KeyStore.PrivateKeyEntry privateKeyEntry)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+        KeyStore ks = KeyStore.getInstance("Windows-ROOT");
+        ks.load(null, null);
+        Enumeration<String> en = ks.aliases();
+        while (en.hasMoreElements()) {
+            String alias = en.nextElement();
+            Certificate c = ks.getCertificate(alias);
+            if (ks.isKeyEntry(alias) && c.equals(privateKeyEntry.getCertificate())) {
+                // JOSM certificate found, return
+                return;
+            }
+        }
+        // JOSM certificate not found, install it
+        Main.info("Adding JOSM localhost certificate to Windows-ROOT keystore");
+        ks.setEntry("josm_localhost", privateKeyEntry, new KeyStore.PasswordProtection("josm_ssl".toCharArray()));
+    }
 }