From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:09 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2266 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish	java/fr/ifremer/isisfish/ui/simulator/launcher
 resources/i18n
Date: Mon, 25 May 2009 13:03:17 +0200
Message-ID: <20090525110317.886E9461CCC@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5970074478490156046=="

--===============5970074478490156046==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-05-25 11:03:17 +0000 (Mon, 25 May 2009)
New Revision: 2266

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SS=
HLauncherConfigUI.jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Add generate key option on caparmor config UI

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05=
-25 11:02:22 UTC (rev 2265)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05=
-25 11:03:17 UTC (rev 2266)
@@ -493,6 +493,15 @@
         return result;
     }
=20
+    /**
+     * Set ssh private key file path.
+     *=20
+     * @param sshFile new value
+     */
+    public void setSSHPrivateKeyFilePath(File sshFile) {
+        setOption(Option.SSH_KEY_FILE.key, sshFile.getAbsolutePath());
+    }
+
     /*
      * Le type de simulation par defaut a utiliser (local, remote, ...)
      * @return

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/laun=
cher/SSHLauncherConfigUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/S=
SHLauncherConfigUI.jaxx	2009-05-25 11:02:22 UTC (rev 2265)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/S=
SHLauncherConfigUI.jaxx	2009-05-25 11:03:17 UTC (rev 2266)
@@ -18,9 +18,11 @@
 <JDialog resizable=3D"false" title=3D"isisfish.simulator.ssh.configuration.t=
itle" layout=3D"{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}">
   <script><![CDATA[
=20
+    import java.io.IOException;
     import fr.ifremer.isisfish.IsisFish;
     import com.jcraft.jsch.JSch;
     import com.jcraft.jsch.JSchException;
+    import com.jcraft.jsch.KeyPair;
     import com.jcraft.jsch.Session;
     import fr.ifremer.isisfish.util.ssh.InvalidPassphraseException;
     import fr.ifremer.isisfish.util.ssh.SSHAgent;
@@ -30,7 +32,7 @@
    =20
     protected String currentSSHserver;
     protected String currentSSHUsername;
-    protected String currentSSHKey;
+    protected File currentSSHKey;
     protected String currentSSHUserhome;
     protected String currentSSHDatapath;
     protected String currentSSHIsisHome;
@@ -85,7 +87,16 @@
             setColor(false, usernameField);
         }
        =20
-        //currentSSHKey
+        // if ssh key is set, must be a valid file
+        currentSSHKey =3D new File(sshKeyField.getText().trim());
+        if (!currentSSHKey.exists()) {
+            setColor(true, sshKeyField);
+        }
+        else {
+            sshKeyButton.setEnabled(false);
+            sshKeyField.setEnabled(false);
+            setColor(false, sshKeyField);
+        }
        =20
         currentSSHDatapath =3D sshDatapathField.getText().trim();
         if (currentSSHDatapath.isEmpty()) {
@@ -142,6 +153,7 @@
     protected void saveSSHConfiguration() {
         IsisFish.config.setSimulatorSshServer(currentSSHserver);
         IsisFish.config.setSimulatorSshUsername(currentSSHUsername);
+        IsisFish.config.setSSHPrivateKeyFilePath(currentSSHKey);
        =20
         //IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome);
         IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath);
@@ -161,21 +173,11 @@
     protected void cancelSSHConfiguration() {
         dispose();
     }
-
-    protected void testSSHConfiguration() {
-        // pour ne pas bloquer le bouton test
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                testSSHConfigurationRunnable();
-            }
-        });
-    }
    =20
     /**
      * Realise une connexion ssh et teste les donn=C3=A9es.
      */
-    protected void testSSHConfigurationRunnable() {
+    protected void testSSHConfiguration() {
         JSch jsch =3D new JSch();
        =20
         String host =3D currentSSHserver;
@@ -191,18 +193,17 @@
    =20
             // add ssh key
             boolean sshKeyUsed =3D false;
-            File sshKey =3D IsisFish.config.getSSHPrivateKeyFilePath();
-            if (sshKey.canRead()) {
+            if (currentSSHKey.canRead()) {
                 if (log.isInfoEnabled()) {
                     log.info(_("Ssh key found '%s' will be used to connect t=
o",
-                            sshKey.getAbsoluteFile(), host));
+                            currentSSHKey.getAbsoluteFile(), host));
                 }
-                jsch.addIdentity(sshKey.getAbsolutePath());
+                jsch.addIdentity(currentSSHKey.getAbsolutePath());
                 sshKeyUsed =3D true;
             }
             else {
                 if (log.isInfoEnabled()) {
-                    log.info(_("Can't read ssh key : %s", sshKey));
+                    log.info(_("Can't read ssh key : %s", currentSSHKey));
                 }
             }
    =20
@@ -212,7 +213,7 @@
             SSHUserInfo ui =3D new SSHUserInfo();
             if (sshKeyUsed) {
                 String passphrase =3D null;
-                passphrase =3D SSHAgent.getAgent().getPassphrase(sshKey);
+                passphrase =3D SSHAgent.getAgent().getPassphrase(currentSSHK=
ey);
                 ui.setPassphrase(passphrase);
                 setTestMessage(_("isisfish.simulator.ssh.configuration.conne=
ctingpk"), false);
             }
@@ -231,16 +232,27 @@
            =20
             validButton.setEnabled(true);
         } catch (NumberFormatException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't connect", e);
+            }
             setTestMessage(_("isisfish.error.simulation.remote.wrongportvalu=
e", sPort), true);
         } catch (JSchException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't connect", e);
+            }
             setTestMessage(_("isisfish.simulator.ssh.configuration.connectio=
nerror", e.getMessage()), true);
         } catch (InvalidPassphraseException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't connect", e);
+            }
             setTestMessage(_("isisfish.simulator.ssh.configuration.invalidpa=
ssphrase"), true);
         }
     }
    =20
     /**
      * Get user home directory with an opened session.
+     *
+     * @deprecated not used anymore
      */
     protected String getUserHomeDirectory(Session session) throws SSHExcepti=
on {
    =20
@@ -256,7 +268,45 @@
         String out =3D output.toString();
         return out;
     }
-   =20
+
+    /**
+     * Generate new SSH key.
+     */
+    protected void generateSSHKey() {
+        if (currentSSHKey.exists()) {
+            throw new IllegalArgumentException("Can't overwrite ssh key");
+        }
+
+        try {
+            // make parent dir
+            if (currentSSHKey.getParentFile() !=3D null && !currentSSHKey.ge=
tParentFile().exists()) {
+                currentSSHKey.getParentFile().mkdirs();
+            }
+            JSch jsch=3Dnew JSch();
+            KeyPair kpair=3DKeyPair.genKeyPair(jsch, KeyPair.RSA, 2048);
+            //kpair.setPassphrase(passphrase);
+            kpair.writePrivateKey(currentSSHKey.getAbsolutePath());
+            kpair.writePublicKey(currentSSHKey.getAbsolutePath()+".pub", cur=
rentSSHUsername + "@forIsisFish");
+            if (log.isInfoEnabled()) {
+                log.info("Finger print: "+kpair.getFingerPrint());
+            }
+            kpair.dispose();
+        }
+        catch (JSchException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't make ssh key", e);
+            }
+        }
+        catch (IOException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't make ssh key", e);
+            }
+        }
+       =20
+        // refresh ckeck
+        doCheck();
+    }
+
     protected void setColor(boolean invalid, JComponent component) {
         component.setForeground(invalid ? Color.RED: Color.BLACK);
     }
@@ -273,7 +323,7 @@
         <JLabel id=3D'sshServerLabel' text=3D'isisfish.config.main.simulatio=
n.ssh.server'
           toolTipText=3D'isisfish.config.main.simulation.ssh.server' />
       </cell>
-      <cell fill=3D'horizontal' weightx=3D"2.0">
+      <cell fill=3D'horizontal' columns=3D"2">
         <JTextField id=3D'sshServerField' toolTipText=3D'isisfish.config.mai=
n.simulation.ssh.server'
           onKeyReleased=3D"doCheck()" />
       </cell>
@@ -283,7 +333,7 @@
         <JLabel id=3D'usernameLabel' text=3D'isisfish.config.main.simulation=
.ssh.username'
           toolTipText=3D'isisfish.config.main.simulation.ssh.username.descri=
ption' />
       </cell>
-      <cell>
+      <cell columns=3D"2">
         <JTextField id=3D'usernameField' toolTipText=3D'isisfish.config.main=
.simulation.ssh.username.description'
           onKeyReleased=3D"doCheck()" />
       </cell>
@@ -292,10 +342,13 @@
       <cell>
         <JLabel id=3D'sshKeyLabel' text=3D'isisfish.config.ssh.key.file' too=
lTipText=3D'isisfish.config.ssh.key.file.description' />
       </cell>
-      <cell>
-        <JTextField id=3D'sshKeyField' enabled=3D'false' toolTipText=3D'isis=
fish.config.ssh.key.file.description'
+      <cell weightx=3D"2.0">
+        <JTextField id=3D'sshKeyField' toolTipText=3D'isisfish.config.ssh.ke=
y.file.description'
           onKeyReleased=3D"doCheck()" />
       </cell>
+      <cell>
+        <JButton id=3D'sshKeyButton' text=3D'isisfish.simulator.ssh.configur=
ation.keygenerate' onActionPerformed=3D"generateSSHKey()" />
+      </cell>
     </row>
   </Table>
   <Table border=3D'{BorderFactory.createTitledBorder(_("isisfish.simulator.s=
sh.configuration.environment"))}'>

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
5-25 11:02:22 UTC (rev 2265)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
5-25 11:03:17 UTC (rev 2266)
@@ -928,6 +928,7 @@
 isisfish.simulator.ssh.configuration.connectionok=3DConnection successfull
 isisfish.simulator.ssh.configuration.environment=3DCaparmor configuration
 isisfish.simulator.ssh.configuration.invalidpassphrase=3DInvalid passphrase
+isisfish.simulator.ssh.configuration.keygenerate=3DGenerate
 isisfish.simulator.ssh.configuration.test=3DTest configuration
 isisfish.simulator.ssh.configuration.title=3DCaparmor launcher configuration
 isisfish.simulator.subprocess.readoutput.error=3D

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
5-25 11:02:22 UTC (rev 2265)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
5-25 11:03:17 UTC (rev 2266)
@@ -928,6 +928,7 @@
 isisfish.simulator.ssh.configuration.connectionok=3DConnect\u00E9 avec succ\=
u00E8s=20
 isisfish.simulator.ssh.configuration.environment=3DConfiguration sur Caparmor
 isisfish.simulator.ssh.configuration.invalidpassphrase=3DPassphrase invalide
+isisfish.simulator.ssh.configuration.keygenerate=3DG\u00E9n\u00E9rer
 isisfish.simulator.ssh.configuration.test=3DTester la configuration
 isisfish.simulator.ssh.configuration.title=3DConfiguration du lanceur Caparm=
or
 isisfish.simulator.subprocess.readoutput.error=3D


--===============5970074478490156046==--