Merge pull request #36 from RIKEN-RCCS/fixSSH

Fix ssh

client/src/components/Remotehost.vue

@@ -119,7 +119,7 @@ export default {
         { title: "name", key: "name" },
         { title: "connection test", key: "connectionTest" },
         { title: "hostname", key: "host" },
-        { title: "usrename", key: "username" },
+        { title: "user", key: "user" },
         { title: "port", key: "port" },
         { title: "private key", key: "keyFile" },
         { title: "action", key: "action", sortable: false },

client/src/components/common/passwordDialog.vue

@@ -6,6 +6,7 @@
 <template>
   <v-dialog
     v-model="openDialog"
+    persistent
     :max-width="maxWidth"
   >
     <v-card

client/src/components/common/removeConfirmDialog.vue

@@ -7,6 +7,7 @@
   <v-dialog
     v-model="openDialog"
     :max-width="maxWidth"
+    persistent
   >
     <v-card
       :title=title

client/src/components/remotehost/addNewHostDialog.vue

@@ -8,7 +8,7 @@
     <v-dialog
       v-model="openDialog"
       :max-width="maxWidth"
-      :persistent="true"
+      persistent
     >
       <v-card>
         <v-card-title>
@@ -55,7 +55,7 @@
                       </v-col>
                       <v-col cols="6">
                         <v-text-field
-                          v-model="host.username"
+                          v-model="host.user"
                           label="User ID"
                           :rules="[required]"
                           placeholder="required"
@@ -264,7 +264,7 @@ export default {
           || this.required(this.host.name) !== true
           || this.required(this.host.host) !== true
           || this.validPortNumber(this.host.port) !== true
-          || this.required(this.host.username) !== true
+          || this.required(this.host.user) !== true
     },
     openDialog: {
       get () {

server/app/core/sshManager.js

@@ -181,8 +181,11 @@ async function createSsh(projectRootDir, remoteHostName, hostinfo, clientID, isS
   if (process.env.WHEEL_VERBOSE_SSH) {
     hostinfo.sshOpt = ["-vvv"];
   }
-  if(hostinfo.username && !hostinfo.user){
-    hostinfo.user = hostinfo.username
+  if(hostinfo.username){
+    if( !hostinfo.user){
+      hostinfo.user = hostinfo.username
+    }
+    delete hostinfo.username
   }
 
   const ssh = new SshClientWrapper(hostinfo);

server/app/db/version.json

@@ -1 +1 @@
-{"version": "2024-0211-171905" }
+{"version": "2024-0213-173244" }

server/app/handlers/remoteHost.js

@@ -27,7 +27,7 @@ const schema = {
     id: { type: "string" },
     name: { type: "string" },
     host: { type: "string" },
-    username: { type: "string" },
+    user: { type: "string" },
     port: {
       type: "number",
       minimum: 0,
@@ -49,9 +49,9 @@ const schema = {
     readyTimeout: { type: "number", minimum: 0 }
   },
   additionalProperties: false,
-  required: ["name", "host", "username"]
+  required: ["name", "host", "user"]
 };
-//username is not required parameter for ssh-client-wrapper
+//user is not required parameter for ssh-client-wrapper
 //but its default value is owner of WHEEL process on localhost
 //so, it is practically required value
 
@@ -86,6 +86,15 @@ async function onCopyHost(socket, id, cb) {
 }
 
 async function onGetHostList(cb) {
+  const hostList = remoteHost.getAll()
+  hostList.forEach((hostInfo)=>{
+    if(hostInfo.username){
+      if( !hostInfo.user){
+        hostInfo.user = hostInfo.username
+      }
+      delete hostInfo.username
+    }
+  });
   cb(remoteHost.getAll());
 }
 
@@ -95,6 +104,14 @@ async function onUpdateHost(socket, updatedHost, cb) {
       delete updatedHost[prop]
     }
   });
+
+  if(updatedHost.username){
+    if( !updatedHost.user){
+      updatedHost.user = updatedHost.username
+    }
+    delete updatedHost.username
+  }
+
   validate(updatedHost);
 
   if(Array.isArray(validate.errors)){

server/app/handlers/tryToConnect.js

@@ -24,7 +24,7 @@ async function tryToConnect(clientID, hostInfo, cb) {
     hostInfo.sshOpt = ["-vvv"];
   }
   const ssh = new SshClientWrapper(hostInfo);
-  logger.debug(`try to connect ${hostInfo.username}@${hostInfo.host}:${hostInfo.port}`);
+  logger.debug(`try to connect ${hostInfo.user}@${hostInfo.host}:${hostInfo.port}`);
 
   try {
     await ssh.canConnect(120);

server/package.json

@@ -55,7 +55,7 @@
     "simple-batch-system": "^1.15.0",
     "socket.io": "^4.6.0",
     "socketio-file-upload": "^0.7.3",
-    "ssh-client-wrapper": "^2.2.3",
+    "ssh-client-wrapper": "^2.2.7",
     "stat-mode": "^1.0.0",
     "through2": "^4.0.2",
     "uuid": "^9.0.0",