dsh-ssh-manage 0.3.0 → 0.3.2

package/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url'
 import { acceptWebSocket, isWebSocketUpgrade } from './lib/ws.js'
 import { resolveSshPaths, listSshHosts, saveSshHost, deleteSshHost } from './lib/ssh-config.js'
 import { deleteMetadata, loadMetadata, updateMetadata } from './lib/metadata.js'
-import { batchExec, downloadFile, execCommand, inspectHost, listRemoteFiles, openPty, testConnection, uploadFile } from './lib/ssh-client.js'
+import { batchExec, deleteRemotePath, downloadFile, execCommand, inspectHost, listRemoteFiles, makeRemoteDirectory, openPty, renameRemotePath, testConnection, uploadFile } from './lib/ssh-client.js'
 import { storagePaths } from './lib/storage.js'
 import { getPassword, listPasswordAliases, removePassword, setPassword } from './lib/vault.js'
 
@@ -28,9 +28,10 @@ const ASSETS = [
   { path: '/dsh-ssh-manage/assets/xterm.js', file: 'xterm.js', contentType: 'text/javascript; charset=utf-8' },
   { path: '/dsh-ssh-manage/assets/xterm.css', file: 'xterm.css', contentType: 'text/css; charset=utf-8' },
   { path: '/dsh-ssh-manage/assets/addon-fit.js', file: 'addon-fit.js', contentType: 'text/javascript; charset=utf-8' },
+  { path: '/dsh-ssh-manage/assets/addon-search.js', file: 'addon-search.js', contentType: 'text/javascript; charset=utf-8' },
 ]
 const MAX_BODY_BYTES = 16 * 1024 * 1024
-const ACTIONS = ['overview', 'list_hosts', 'save_host', 'delete_host', 'set_metadata', 'save_password', 'delete_password', 'test_connection', 'inspect_host', 'exec', 'batch_exec', 'sftp_list', 'sftp_upload', 'sftp_download']
+const ACTIONS = ['overview', 'list_hosts', 'save_host', 'delete_host', 'set_metadata', 'save_password', 'delete_password', 'test_connection', 'inspect_host', 'exec', 'batch_exec', 'sftp_list', 'sftp_upload', 'sftp_download', 'sftp_mkdir', 'sftp_rename', 'sftp_delete']
 
 async function readJsonBody(req) {
   const chunks = []
@@ -216,6 +217,18 @@ export async function runAction(paths, action, params = {}) {
       const host = await findHost(paths, params.host)
       return await downloadFile(host, await requirePassword(paths, host), requireString(params, 'path'))
     }
+    case 'sftp/mkdir': {
+      const host = await findHost(paths, params.host)
+      return await makeRemoteDirectory(host, await requirePassword(paths, host), requireString(params, 'path'))
+    }
+    case 'sftp/rename': {
+      const host = await findHost(paths, params.host)
+      return await renameRemotePath(host, await requirePassword(paths, host), requireString(params, 'path'), requireString(params, 'newPath'), { overwrite: params.overwrite === true })
+    }
+    case 'sftp/delete': {
+      const host = await findHost(paths, params.host)
+      return await deleteRemotePath(host, await requirePassword(paths, host), requireString(params, 'path'))
+    }
     default:
       throw new Error(`Unknown action: ${String(action)}`)
   }
@@ -240,6 +253,8 @@ function managerTool(paths) {
         command: { type: 'string', description: 'Remote shell command.' },
         hosts: { type: 'array', items: { type: 'string' }, description: 'Host aliases for a batch command.' },
         path: { type: 'string', description: 'Remote SFTP path.' },
+        newPath: { type: 'string', description: 'New remote SFTP path for rename.' },
+        overwrite: { type: 'boolean', description: 'Allow sftp_rename to replace an existing destination (default false).' },
         contentBase64: { type: 'string', description: 'Base64 encoded file content for upload.' },
         metadata: { type: 'object', description: '{ group, tags, favorite, label, note, system, cpuCores, memoryGB, diskGB, latencyMs, checkedAt }' },
       },
@@ -283,6 +298,12 @@ function managerTool(paths) {
           return await runAction(paths, 'sftp/upload', params)
         case 'sftp_download':
           return await runAction(paths, 'sftp/download', params)
+        case 'sftp_mkdir':
+          return await runAction(paths, 'sftp/mkdir', params)
+        case 'sftp_rename':
+          return await runAction(paths, 'sftp/rename', params)
+        case 'sftp_delete':
+          return await runAction(paths, 'sftp/delete', params)
         default:
           throw new Error(`Unknown action: ${String(input.action)}`)
       }

package/lib/ssh-client.js

@@ -1,3 +1,4 @@
+import path from 'node:path'
 import { Client } from 'ssh2'
 import { verifyHostKey } from './known-hosts.js'
 
@@ -105,6 +106,21 @@ function safeRemotePath(value) {
   return value
 }
 
+/** POSIX-normalize a remote path; used only for guards and comparisons. */
+export function normalizeRemotePath(value) {
+  const raw = safeRemotePath(value)
+  const normalized = path.posix.normalize(raw)
+  return normalized.length > 1 ? normalized.replace(/\/+$/, '') : normalized
+}
+
+function isProtectedRemotePath(value) {
+  const normalized = normalizeRemotePath(value)
+  if (normalized === '' || normalized === '/' || normalized === '.' || normalized === '..') return true
+  if (normalized.startsWith('../') || normalized.includes('/../') || normalized.endsWith('/..') || normalized.includes('/./')) return true
+  if (/^[A-Za-z]:(?:\.{1,2})?$/.test(normalized)) return true
+  return false
+}
+
 function probeInteger(value) {
   const numeric = Number(String(value ?? '').trim())
   if (!Number.isFinite(numeric)) return 0
@@ -170,7 +186,13 @@ export async function listRemoteFiles(host, password, remotePath = '.') {
         if (error) return reject(error)
         sftp.readdir(target, (readError, entries) => {
           if (readError) return reject(readError)
-          resolve(entries.map((entry) => ({ name: entry.filename, size: entry.attrs?.size ?? 0, mode: entry.attrs?.mode ?? 0, directory: Boolean(entry.attrs?.isDirectory?.()) })))
+          resolve(entries.map((entry) => ({
+            name: entry.filename,
+            size: entry.attrs?.size ?? 0,
+            mode: entry.attrs?.mode ?? 0,
+            directory: Boolean(entry.attrs?.isDirectory?.()),
+            symlink: Boolean(entry.attrs?.isSymbolicLink?.()),
+          })))
         })
       })
     })
@@ -208,6 +230,69 @@ export async function downloadFile(host, password, remotePath) {
   } finally { client.end() }
 }
 
+async function withSftp(host, password, operation) {
+  const client = await connect(host, password)
+  try {
+    const sftp = await new Promise((resolve, reject) => client.sftp((error, value) => error ? reject(error) : resolve(value)))
+    return await operation(sftp)
+  } finally {
+    client.end()
+  }
+}
+
+export async function makeRemoteDirectory(host, password, remotePath) {
+  const target = safeRemotePath(remotePath)
+  await withSftp(host, password, (sftp) => new Promise((resolve, reject) => {
+    sftp.mkdir(target, (error) => error ? reject(error) : resolve())
+  }))
+  return { created: true, path: target }
+}
+
+export async function renameRemotePath(host, password, remotePath, nextPath, options = {}) {
+  const from = safeRemotePath(remotePath)
+  const to = safeRemotePath(nextPath)
+  if (normalizeRemotePath(from) === normalizeRemotePath(to)) throw new Error('Source and destination are the same')
+  if (isProtectedRemotePath(to)) throw new Error('Refusing to rename onto a root path')
+  await withSftp(host, password, async (sftp) => {
+    if (options.overwrite !== true) {
+      const exists = await new Promise((resolve, reject) => {
+        sftp.stat(to, (error) => {
+          if (error) {
+            if (error.code === 2) resolve(false)
+            else reject(error)
+          } else resolve(true)
+        })
+      })
+      if (exists) throw new Error(`Destination already exists: ${to}`)
+    }
+    await new Promise((resolve, reject) => {
+      sftp.rename(from, to, (error) => error ? reject(error) : resolve())
+    })
+  })
+  return { renamed: true, from, to }
+}
+
+export async function deleteRemotePath(host, password, remotePath) {
+  const target = safeRemotePath(remotePath)
+  if (isProtectedRemotePath(target)) {
+    throw new Error('Refusing to delete a root or empty path')
+  }
+  const result = await withSftp(host, password, async (sftp) => {
+    const stats = await new Promise((resolve, reject) => {
+      sftp.lstat(target, (error, value) => error ? reject(error) : resolve(value))
+    })
+    const symbolicLink = Boolean(stats?.isSymbolicLink?.())
+    const directory = !symbolicLink && Boolean(stats?.isDirectory?.())
+    await new Promise((resolve, reject) => {
+      const done = (error) => error ? reject(error) : resolve()
+      if (directory) sftp.rmdir(target, done)
+      else sftp.unlink(target, done)
+    })
+    return { directory, symbolicLink }
+  })
+  return { deleted: true, directory: result.directory, symbolicLink: result.symbolicLink, path: target }
+}
+
 export async function batchExec(hosts, passwordFor, command, options = {}) {
   const concurrency = Math.min(Math.max(Number(options.concurrency || 4), 1), 16)
   const results = []
@@ -270,4 +355,4 @@ export function openInteractiveShell(host, password, onReady, options = {}) {
   })
 }
 
-export const __test = { safeRemotePath, connectionConfig, parseProbeOutput, MAX_OUTPUT_BYTES, MAX_FILE_BYTES }
+export const __test = { safeRemotePath, normalizeRemotePath, isProtectedRemotePath, connectionConfig, parseProbeOutput, MAX_OUTPUT_BYTES, MAX_FILE_BYTES }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ssh-manage",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A DSH sidebar plugin for managing SSH host profiles with a real interactive PTY terminal.",
   "license": "MIT",
   "private": false,