Changeset 7472

Timestamp:

Apr 10, 2018, 8:50:42 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2112: Add support for SSH private keys to file server items

Added support in the gui for selecting and storing private key information.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/FileServer.java (modified) (1 diff)
• www/filemanager/fileservers/edit_fileserver.jsp (modified) (5 diffs)
• www/filemanager/fileservers/fileservers.js (modified) (2 diffs)
• www/filemanager/fileservers/index.jsp (modified) (4 diffs)
• www/filemanager/fileservers/view_fileserver.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/FileServer.java

@@ -663 +663 @@
     @since 3.13
   */
-  public void setSshPrivateKeyFormat(String password)
+  public void setSshPrivateKeyFormat(String format)
     throws PermissionDeniedException, InvalidDataException
   {
     checkPermission(Permission.WRITE);
-    getData().setSshPrivateKeyFormat(StringUtil.setNullableString(password, 
+    getData().setSshPrivateKeyFormat(StringUtil.setNullableString(format, 
         "sshPrivateKeyFormat", MAX_FORMAT_LENGTH));
   }

trunk/www/filemanager/fileservers/edit_fileserver.jsp

@@ -180 +180 @@
       </table>
     </t:tab>
-    <t:tab id="serverCertificate" title="Certificates" 
+    <t:tab id="serverCertificate" title="HTTPS certificates" 
       helpid="fileserver.edit">
       
@@ -210 +210 @@
         </td>
       </tr>
-      <tr>
+      <tr class="dynamic">
         <th class="subprompt"></th>
         <td>
@@ -222 +222 @@
             enter the password as well.
           </div>
-          
-        </td>
-      </tr>
+        </td>
+      </tr>
+      </table>
+    </t:tab>
+    <t:tab id="sshOptions" title="SSH options" 
+      helpid="fileserver.edit">
+      <table class="fullform input100">
       <tr>
         <th>SSH fingerprint</th>
@@ -232 +236 @@
         </td>
       </tr>
-      <tr class="dynamic">
+      <tr>
         <th class="subprompt">(MD5 or SHA-256)</th>
         <td>
@@ -240 +244 @@
             heaxdecimal numbers with colon separator while SHA-256 is Base64-encoded.
           </div>
-        
-        </td>
-      </tr>
+        </td>
+      </tr>
+      <tr>
+        <th>SSH private key</th>
+        <td>
+          <input class="text" type="file" name="ssh_private_key" size="40">
+        </td>
+      </tr>
+      <tr>
+        <th class="subprompt">Format</th>
+        <td>
+          <%
+          String currentFormat = server == null ? cc.getPropertyValue("sshPrivateKeyFormat") : server.getSshPrivateKeyFormat();
+          String[] formats = { "OpenSSH", "OpenSSHv1", "PuTTY", "PKCS5", "PKCS8" };
+          %>
+          <select name="ssh_private_key_format">
+          <option value="">- auto -
+          <%
+          for (String f : formats)
+          {
+            %>
+            <option value="<%=f%>" <%=f.equals(currentFormat) ? "selected" : "" %>><%=f%>
+            <%
+          }
+          %>
+          </select>
+        </td>
+        <td></td>
+      </tr>
+      <tr>
+        <th class="subprompt">Password</th>
+        <td>
+          <input class="text" type="password" name="ssh_private_key_password">
+        </td>
+      </tr>
+      <tr class="dynamic">
+        <th class="subprompt"></th>
+        <td>
+          <input type="checkbox" name="remove_ssh_private_key" id="removeSshPrivateKey" value="1" 
+            ><label for="removeSshPrivateKey">Remove existing private key</label>
+
+          <div class="messagecontainer help">
+            A <b>private key</b> can be used instead of a password to connect to a server.
+            
+            If the file is password-protected you must enter the password as well.
+          </div>
+        </td>
+      </tr>
+      
       </table>
       

trunk/www/filemanager/fileservers/fileservers.js

@@ -43 +43 @@
       TabControl.addTabValidator('settings.info', fileServers.validateFileServer);
       TabControl.addTabValidator('settings.serverCertificate', fileServers.validateCertificates);
+      TabControl.addTabValidator('settings.sshOptions', fileServers.validateSshOptions);
       
       // Connection manager
@@ -112 +113 @@
   
   fileServers.validateCertificates = function()
+  {
+    return true;
+  }
+
+  fileServers.validateSshOptions = function()
   {
     var frm = document.forms['server'];

trunk/www/filemanager/fileservers/index.jsp

@@ -157 +157 @@
       byte[] serverCertificate = null;
       byte[] clientCertificate = null;
+      byte[] sshPrivateKey = null;
       while (uploadedFile != null)
       {
@@ -170 +171 @@
           clientCertificate = fileData.toByteArray();
         }
+        else if ("ssh_private_key".equals(formName))
+        {
+          sshPrivateKey = fileData.toByteArray();
+        }
         uploadedFile = upload.next();
       }
@@ -182 +187 @@
       server.setRootPath(Values.getStringOrNull(upload.getParameter("rootPath")));
       server.setSshFingerprint(Values.getStringOrNull(upload.getParameter("sshFingerprint")));
+      server.setSshPrivateKeyFormat(Values.getStringOrNull(upload.getParameter("ssh_private_key_format")));
       String certPassword = Values.getStringOrNull(upload.getParameter("client_certificate_password"));
       if (certPassword != null) server.setClientCertificatePassword(certPassword);
+      String sshPrivateKeyPassword = Values.getStringOrNull(upload.getParameter("ssh_private_key_password"));
+      if (sshPrivateKeyPassword != null) server.setSshPrivateKeyPassword(sshPrivateKeyPassword);
       if (Values.getBoolean(upload.getParameter("remove_server_certificate")))
       {
@@ -200 +208 @@
       {
         server.setClientCertificate(clientCertificate);
+      }
+      if (Values.getBoolean(upload.getParameter("remove_ssh_private_key")))
+      {
+        server.setSshPrivateKey(null);
+        server.setSshPrivateKeyPassword(null);
+      }
+      else if (sshPrivateKey != null && sshPrivateKey.length > 0)
+      {
+        server.setSshPrivateKey(sshPrivateKey);
       }
       

trunk/www/filemanager/fileservers/view_fileserver.jsp

@@ -413 +413 @@
       }
       %>
+      <tr>
+        <th>SSH private key</th>
+        <td><%=server.hasSshPrivateKey() ? "yes (" + Values.getString(server.getSshPrivateKeyFormat(), "<i>- auto -</i>") + ")" : "no"%></td>
+      </tr>
       </table>
       </div>