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

Timestamp:

2014-07-28T16:40:19+02:00 (10 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/gui

Files:

• MainApplication.java (modified) (1 diff)
• preferences/remotecontrol/RemoteControlPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -445 +445 @@
                 // Check for insecure certificates to remove.
                 // This is Windows-dependant code but it can't go to preStartupHook (need i18n) neither startupHook (need to be called before remote control)
-                ((PlatformHookWindows)Main.platform).removeInsecureCertificates();
+                PlatformHookWindows.removeInsecureCertificates();
             } catch (NoSuchAlgorithmException | CertificateException | KeyStoreException | IOException e) {
                 error(e);

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -15 +21 @@
 import javax.swing.BorderFactory;
 import javax.swing.Box;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
@@ -31 +39 @@
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
 
 /**
@@ -61 +70 @@
     private JCheckBox enableRemoteControl;
     private JCheckBox enableHttpsSupport;
-    private JCheckBox loadInNewLayer = new JCheckBox(tr("Download objects to new layer"));
-    private JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("Confirm all Remote Control actions manually"));
+
+    private JButton installCertificate;
+    private JButton uninstallCertificate;
+
+    private final JCheckBox loadInNewLayer = new JCheckBox(tr("Download objects to new layer"));
+    private final JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("Confirm all Remote Control actions manually"));
 
     @Override
@@ -91 +104 @@
         remote.add(wrapper, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 5));
 
-        enableHttpsSupport = new JCheckBox(tr("Enable HTTPS support"), RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.get());
+        boolean https = RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.get();
+
+        enableHttpsSupport = new JCheckBox(tr("Enable HTTPS support"), https);
         wrapper.add(enableHttpsSupport, GBC.eol().fill(GBC.HORIZONTAL));
+
+        // Certificate installation only available on Windows for now, see #10033
+        if (Main.isPlatformWindows()) {
+            installCertificate = new JButton(tr("Install..."));
+            uninstallCertificate = new JButton(tr("Uninstall..."));
+            installCertificate.setToolTipText(tr("Install JOSM localhost certificate to system/browser root keystores"));
+            uninstallCertificate.setToolTipText(tr("Uninstall JOSM localhost certificate from system/browser root keystores"));
+            wrapper.add(new JLabel(tr("Certificate:")), GBC.std().insets(15, 5, 0, 0));
+            wrapper.add(installCertificate, GBC.std().insets(5, 5, 0, 0));
+            wrapper.add(uninstallCertificate, GBC.eol().insets(5, 5, 0, 0));
+            enableHttpsSupport.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    installCertificate.setEnabled(enableHttpsSupport.isSelected());
+                }
+            });
+            installCertificate.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    try {
+                        boolean changed = RemoteControlHttpsServer.setupPlatform(
+                                RemoteControlHttpsServer.loadJosmKeystore());
+                        String msg = changed ?
+                                tr("Certificate has been successfully installed.") :
+                                tr("Certificate is already installed. Nothing to do.");
+                        Main.info(msg);
+                        JOptionPane.showMessageDialog(wrapper, msg);
+                    } catch (IOException | GeneralSecurityException ex) {
+                        Main.error(ex);
+                    }
+                }
+            });
+            uninstallCertificate.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    try {
+                        String msg;
+                        KeyStore ks = PlatformHookWindows.getRootKeystore();
+                        if (ks.containsAlias(RemoteControlHttpsServer.ENTRY_ALIAS)) {
+                            Main.info(tr("Removing certificate {0} from root keystore.", RemoteControlHttpsServer.ENTRY_ALIAS));
+                            ks.deleteEntry(RemoteControlHttpsServer.ENTRY_ALIAS);
+                            msg = tr("Certificate has been successfully uninstalled.");
+                        } else {
+                            msg = tr("Certificate is not installed. Nothing to do.");
+                        }
+                        Main.info(msg);
+                        JOptionPane.showMessageDialog(wrapper, msg);
+                    } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException ex) {
+                        Main.error(ex);
+                    }
+                }
+            });
+            installCertificate.setEnabled(https);
+        }
+
         wrapper.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL).insets(15, 5, 15, 5));
 
@@ -116 +186 @@
                 // 'setEnabled(false)' does not work for JLabel with html text, so do it manually
                 // FIXME: use QuadStateCheckBox to make checkboxes unset when disabled
+                if (installCertificate != null && uninstallCertificate != null) {
+                    // Install certificate button is enabled if HTTPS is also enabled
+                    installCertificate.setEnabled(enableRemoteControl.isSelected() && enableHttpsSupport.isSelected());
+                    // Uninstall certificate button is always enabled
+                    uninstallCertificate.setEnabled(true);
+                }
             }
         };