@electerm/electerm-react 5.5.25 → 5.5.56

package/client/components/ai/copy-icon.jsx

@@ -0,0 +1,31 @@
+import { CopyOutlined } from '@ant-design/icons'
+import { copy } from '../../common/clipboard'
+
+const e = window.translate
+
+/**
+ * Always visible copy icon, shared by AI output and agent tool call blocks
+ * @param {Object} props
+ * @param {string} props.text - text to copy
+ * @param {string} props.className - extra class for positioning
+ * @param {string} props.title - tooltip title
+ */
+export default function CopyIcon ({ text, className = '', title }) {
+  function handleCopy (evt) {
+    // agent tool card header toggles expanded state on click
+    evt.stopPropagation()
+    copy(text)
+  }
+
+  if (!text) {
+    return null
+  }
+
+  return (
+    <CopyOutlined
+      className={`copy-icon pointer iblock${className ? ' ' + className : ''}`}
+      onClick={handleCopy}
+      title={title || e('copy')}
+    />
+  )
+}

package/client/components/batch-op/batch-op-runner.jsx

@@ -172,6 +172,7 @@ export default class BatchOpRunner extends Component {
       enableSsh: p.enableSsh !== false,
       useSshAgent: p.useSshAgent !== false,
       sshAgent: p.sshAgent || '',
+      agentForward: p.agentForward || false,
       term: p.term || 'xterm-256color',
       encode: p.encode || 'utf8',
       envLang: p.envLang || 'en_US.UTF-8',

package/client/components/bookmark-form/bookmark-schema.js

@@ -20,6 +20,7 @@ const bookmarkSchema = {
     connectionHoppings: 'array - connection hopping definitions',
     useSshAgent: 'boolean - use SSH agent, default is true',
     sshAgent: 'string - ssh agent path',
+    agentForward: 'boolean - enable SSH agent forwarding (like ssh -A, needed to hop through a jump/bastion host), requires SSH agent, default is false',
     serverHostKey: 'array - server host key algorithms',
     cipher: 'array - cipher list',
     compress: 'array - compression algorithms (zlib@openssh.com, zlib, none)',

package/client/components/bookmark-form/common/ssh-agent.jsx

@@ -9,26 +9,36 @@ const e = window.translate
 
 export default function SshAgent () {
   return (
-    <FormItem
-      {...formItemLayout}
-      label={e('useSshAgent')}
-    >
-      <Space align='center'>
-        <FormItem
-          name='useSshAgent'
-          valuePropName='checked'
-          noStyle
-        >
-          <SwitchLabel />
-        </FormItem>
-        <FormItem
-          name='sshAgent'
-          noStyle
-        >
-          <Input placeholder={e('SSH Agent Path')} />
-        </FormItem>
-        <HelpIcon link='https://github.com/electerm/electerm/wiki/ssh-agent' />
-      </Space>
-    </FormItem>
+    <>
+      <FormItem
+        {...formItemLayout}
+        label={e('useSshAgent')}
+      >
+        <Space align='center'>
+          <FormItem
+            name='useSshAgent'
+            valuePropName='checked'
+            noStyle
+          >
+            <SwitchLabel />
+          </FormItem>
+          <FormItem
+            name='sshAgent'
+            noStyle
+          >
+            <Input placeholder={e('SSH Agent Path')} />
+          </FormItem>
+          <HelpIcon link='https://github.com/electerm/electerm/wiki/ssh-agent' />
+        </Space>
+      </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label={e('agentForward')}
+        name='agentForward'
+        valuePropName='checked'
+      >
+        <SwitchLabel />
+      </FormItem>
+    </>
   )
 }

package/client/components/bookmark-form/common/vv-file-field.jsx

@@ -2,8 +2,9 @@
  * bookmark form - load a .vv (virt-viewer) connection file
  *
  * Registered as field type 'vvFile' in ./fields.jsx and used by
- * ../config/spice.js. Fills host/port/password/title/proxy from the file and
- * reports anything it could not honour instead of dropping it silently.
+ * ../config/spice.js. Fills host/port/password/title/proxy/tls/ca/hostSubject
+ * from the file and reports anything it could not honour instead of dropping
+ * it silently.
  */
 import { useState } from 'react'
 import {

package/client/components/bookmark-form/config/spice.js

@@ -12,6 +12,9 @@ const spiceConfig = {
   initValues: (props) => {
     return createBaseInitValues(props, terminalSpiceType, {
       port: 5900,
+      tls: false,
+      ca: '',
+      hostSubject: '',
       viewOnly: false,
       scaleViewport: true,
       connectionHoppings: [],
@@ -29,6 +32,24 @@ const spiceConfig = {
         { type: 'vvFile', name: '__vv__', label: '' },
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
         commonFields.port,
+        { type: 'switch', name: 'tls', label: 'TLS', valuePropName: 'checked' },
+        {
+          type: 'textarea',
+          name: 'ca',
+          label: 'CA certificate (PEM)',
+          props: {
+            autoSize: { minRows: 2, maxRows: 8 },
+            placeholder: '-----BEGIN CERTIFICATE-----'
+          }
+        },
+        {
+          type: 'input',
+          name: 'hostSubject',
+          label: 'Certificate subject',
+          props: {
+            placeholder: 'CN=pve1,O=Proxmox Virtual Environment'
+          }
+        },
         { type: 'switch', name: 'viewOnly', label: () => e('viewOnly'), valuePropName: 'checked' },
         { type: 'switch', name: 'scaleViewport', label: () => e('scaleViewport'), valuePropName: 'checked' },
         { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.spice) },

package/client/components/bookmark-form/config/ssh.js

@@ -22,6 +22,7 @@ const sshConfig = {
       connectionHoppings: [],
       useSshAgent: true,
       sshAgent: '',
+      agentForward: false,
       serverHostKey: [],
       cipher: [],
       compress: [],

package/client/components/bookmark-form/fix-bookmark-default.js

@@ -6,6 +6,7 @@ const defaultValues = {
     enableSsh: true,
     enableSftp: true,
     useSshAgent: true,
+    agentForward: false,
     x11: false,
     term: 'xterm-256color',
     displayRaw: false,

package/client/components/file-transfer/transfer.jsx

@@ -12,13 +12,6 @@ import {
 import resolve from '../../common/resolve'
 import sanitizeFilename from '../../common/sanitize-filename'
 import { refsTransfers, refsStatic, refs } from '../common/ref'
-import {
-  zipCmd,
-  unzipCmd,
-  rmCmd,
-  mvCmd,
-  mkdirCmd
-} from './zip'
 import './transfer.styl'
 
 const { assign } = Object
@@ -279,9 +272,7 @@ export default class TransportAction extends Component {
       typeFrom,
       toFile = {}
     } = transfer
-    const toPath = transfer.zip
-      ? transfer.toPath
-      : this.newPath || transfer.toPath
+    const toPath = this.newPath || transfer.toPath
     const fromFile = transfer.fromFile || this.fromFile
     const fromMode = fromFile.mode
     const transferType = typeFrom === typeMap.local ? transferTypeMap.upload : transferTypeMap.download
@@ -408,12 +399,11 @@ export default class TransportAction extends Component {
         toPath
       } = this.props.transfer
       this.oldPath = toPath
-      const { newPath, newName } = this.handleRename(toPath, typeTo === typeMap.remote)
+      const { newPath } = this.handleRename(toPath, typeTo === typeMap.remote)
       this.update({
         toPath: newPath
       })
       this.newPath = newPath
-      this.newName = newName
     }
 
     const { typeFrom, typeTo } = this.props.transfer
@@ -423,120 +413,14 @@ export default class TransportAction extends Component {
     this.startTransfer()
   }
 
-  zipTransferFolder = async () => {
-    const {
-      transfer
-    } = this.props
-    const {
-      fromPath,
-      typeFrom
-    } = transfer
-    const toPath = this.oldPath || transfer.toPath
-    let p
-    let isFromRemote
-    if (typeFrom === typeMap.local) {
-      isFromRemote = false
-      p = await window.fs.zipFolder(fromPath)
-    } else {
-      isFromRemote = true
-      const terminalId = refs.get('sftp-' + this.tabId)?.terminalId
-      p = await zipCmd(terminalId, fromPath)
-    }
-    this.zipSrc = p
-    const { name } = getFolderFromFilePath(p, isFromRemote)
-    const { path } = getFolderFromFilePath(toPath, !isFromRemote)
-    const nTo = resolve(path, name)
-    this.zipPath = nTo
-    const newTrans1 = {
-      ...copy(transfer),
-      toPath: nTo,
-      fromPath: p
-    }
-    this.transferFile(newTrans1, this.unzipFile)
-  }
-
-  unzipFile = async () => {
-    const { transfer } = this.props
-    const {
-      typeTo
-    } = transfer
-    const toPath = this.zipPath
-    const fromPath = this.zipSrc
-    const isToRemote = typeTo === typeMap.remote
-    const {
-      path,
-      name,
-      targetPath
-    } = this.buildUnzipPath(transfer)
-    const {
-      newName,
-      terminalId
-    } = this
-    if (isToRemote) {
-      if (newName) {
-        await mkdirCmd(terminalId, path)
-      }
-      await unzipCmd(terminalId, toPath, path)
-      if (newName) {
-        const mvFrom = resolve(path, name)
-        const mvTo = resolve(targetPath, newName)
-        await mvCmd(terminalId, mvFrom, mvTo)
-      }
-    } else {
-      if (newName) {
-        await window.fs.mkdir(path)
-      }
-      await window.fs.unzipFile(toPath, path)
-      if (newName) {
-        const mvFrom = resolve(path, name)
-        const mvTo = resolve(targetPath, newName)
-        await window.fs.mv(mvFrom, mvTo)
-      }
-    }
-    await rmCmd(terminalId, !isToRemote ? fromPath : toPath)
-    await window.fs.rmrf(!isToRemote ? toPath : fromPath)
-    if (newName) {
-      if (isToRemote) {
-        await rmCmd(terminalId, path)
-      } else {
-        await window.fs.rmrf(path)
-      }
-    }
-    this.onEnd()
-  }
-
-  buildUnzipPath = (transfer) => {
-    const {
-      typeTo
-    } = transfer
-    const isToRemote = typeTo === typeMap.remote
-    const toPath = this.oldPath || transfer.toPath
-    const {
-      newName
-    } = this
-    const { path } = getFolderFromFilePath(toPath, isToRemote)
-    const oldName = getFolderFromFilePath(toPath, isToRemote).name
-    const np = newName
-      ? resolve(path, 'temp-' + newName)
-      : path
-    return {
-      targetPath: path,
-      path: np,
-      name: oldName
-    }
-  }
-
   startTransfer = async () => {
-    const { fromFile = this.fromFile, zip } = this.props.transfer
+    const { fromFile = this.fromFile } = this.props.transfer
     if (!fromFile) {
       return
     }
     if (!fromFile.isDirectory) {
       return this.transferFile()
     }
-    if (zip) {
-      return this.zipTransferFolder()
-    }
     if (!this.isFtp) {
       return this.transferFile()
     } else {