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

Timestamp:

2014-07-28T16:40:19+02:00 (9 years ago)

Author:

Don-vip

Message:

see #10230, see #10033 - add "Install/uninstall certificate" buttons in remote control preferences (Windows only)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHook.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• PlatformHookWindows.java (modified) (4 diffs)

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

@@ -109 +109 @@
     /**
      * Setup system keystore to add JOSM HTTPS certificate (for remote control).
+     * @param entryAlias The entry alias to use
      * @param trustedCert the JOSM certificate for localhost
+     * @return {@code true} if something has changed as a result of the call (certificate installation, etc.)
      * @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
+     * @since 7343
      */
-    public void setupHttpsCertificate(KeyStore.TrustedCertificateEntry trustedCert)
+    public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
 }

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

@@ -358 +358 @@
 
     @Override
-    public void setupHttpsCertificate(KeyStore.TrustedCertificateEntry trustedCert)
+    public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
         // TODO setup HTTPS certificate on Unix systems
+        return false;
     }
 }

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

@@ -181 +181 @@
      * @throws IOException if there is an I/O or format problem with the keystore data, if a password is required but not given
      * @throws KeyStoreException if no Provider supports a KeyStore implementation for the type "Windows-ROOT"
+     * @since 7343
      */
-    private KeyStore getWindowsKeystore() throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
+    public static KeyStore getRootKeystore() throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
         KeyStore ks = KeyStore.getInstance(WINDOWS_ROOT);
         ks.load(null, null);
@@ -196 +197 @@
      * @since 7335
      */
-    public void removeInsecureCertificates() throws NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException {
+    public static void removeInsecureCertificates() throws NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException {
         // We offered before a public private key we need now to remove from Windows PCs as it might be a huge security risk (see #10230)
         PublicKey insecurePubKey = null;
@@ -205 +206 @@
             return;
         }
-        KeyStore ks = getWindowsKeystore();
+        KeyStore ks = getRootKeystore();
         Enumeration<String> en = ks.aliases();
         Collection<String> insecureCertificates = new ArrayList<>();
@@ -249 +250 @@
 
     @Override
-    public void setupHttpsCertificate(KeyStore.TrustedCertificateEntry trustedCert)
+    public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
-        KeyStore ks = getWindowsKeystore();
-        Enumeration<String> en = ks.aliases();
-
-        while (en.hasMoreElements()) {
-            String alias = en.nextElement();
-            // Look for certificate to install
-            if (ks.getCertificate(alias).equals(trustedCert.getTrustedCertificate())) {
-                // JOSM certificate found, return
-                Main.debug("JOSM certificate found: "+alias);
-                return;
-            }
+        KeyStore ks = getRootKeystore();
+        // Look for certificate to install
+        String alias = ks.getCertificateAlias(trustedCert.getTrustedCertificate());
+        if (alias != null) {
+            // JOSM certificate found, return
+            Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+            return false;
         }
         // 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);
+        ks.setEntry(entryAlias, trustedCert, null);
+        return true;
     }
 }