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

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

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (9 diffs)

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

@@ -12 +12 @@
 import java.net.Socket;
 import java.net.SocketException;
+import java.security.Key;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
+import java.security.PrivateKey;
+import java.security.UnrecoverableEntryException;
+import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.util.Arrays;
@@ -32 +35 @@
 /**
  * Simple HTTPS server that spawns a {@link RequestProcessor} for every secure connection.
- * 
+ *
  * @since 6941
  */
@@ -42 +45 @@
     private static RemoteControlHttpsServer instance;
     private boolean initOK = false;
-    private SSLContext sslContext; 
+    private SSLContext sslContext;
 
     private static final String KEYSTORE_PATH = "/data/josm.keystore";
@@ -53 +56 @@
                 KeyStore ks = KeyStore.getInstance("JKS");
                 char[] password = KEYSTORE_PASSWORD.toCharArray();
-                
-                // Load keystore
+
+                // Load keystore generated with Java 7 keytool as follows:
+                // keytool -genkeypair -storepass josm_ssl -keypass josm_ssl -alias josm_localhost -dname "CN=localhost, OU=JOSM, O=OpenStreetMap"
+                // -ext san=ip:127.0.0.1 -keyalg RSA -validity 1825
                 try (InputStream in = RemoteControlHttpsServer.class.getResourceAsStream(KEYSTORE_PATH)) {
                     if (in == null) {
@@ -60 +65 @@
                     } else {
                         ks.load(in, password);
-                        
+
                         if (Main.isDebugEnabled()) {
                             for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) {
@@ -66 +71 @@
                             }
                         }
-    
+
                         KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
                         kmf.init(ks, password);
-                        
+
                         TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
                         tmf.init(ks);
-                        
+
                         sslContext = SSLContext.getInstance("TLS");
                         sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-                        
+
                         if (Main.isDebugEnabled()) {
                             Main.debug("SSL Context protocol: " + sslContext.getProtocol());
                             Main.debug("SSL Context provider: " + sslContext.getProvider());
                         }
-                        
+
+                        Enumeration<String> aliases = ks.aliases();
+                        if (aliases.hasMoreElements()) {
+                            String aliasKey = aliases.nextElement();
+                            Key key = ks.getKey(aliasKey, password);
+                            Certificate[] chain = ks.getCertificateChain(aliasKey);
+                            Main.platform.setupHttpsCertificate(new KeyStore.PrivateKeyEntry((PrivateKey) key, chain));
+                        }
+
                         initOK = true;
                     }
                 }
-            } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | 
-                    IOException | UnrecoverableKeyException | KeyManagementException e) {
+            } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException |
+                    IOException | KeyManagementException | UnrecoverableEntryException e) {
                 Main.error(e);
             }
@@ -136 +149 @@
         super("RemoteControl HTTPS Server");
         this.setDaemon(true);
-        
+
         initialize();
-        
+
         // Create SSL Server factory
         SSLServerSocketFactory factory = sslContext.getServerSocketFactory();
@@ -144 +157 @@
             Main.debug("SSL factory - Supported Cipher suites: "+Arrays.toString(factory.getSupportedCipherSuites()));
         }
-        
+
         // Start the server socket with only 1 connection.
         // Also make sure we only listen
@@ -151 +164 @@
         this.server = factory.createServerSocket(port, 1,
             InetAddress.getByName(Main.pref.get("remote.control.host", "localhost")));
-        
+
         if (Main.isDebugEnabled() && server instanceof SSLServerSocket) {
             SSLServerSocket sslServer = (SSLServerSocket) server;