2023-10-17 06:31:13 +02:00
|
|
|
// Copyright 2023, Command Line Inc.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
|
2022-07-01 21:17:19 +02:00
|
|
|
package remote
|
|
|
|
|
|
|
|
import (
|
2022-08-24 11:14:16 +02:00
|
|
|
"bytes"
|
2022-07-02 02:38:36 +02:00
|
|
|
"context"
|
2022-07-07 07:46:22 +02:00
|
|
|
"encoding/base64"
|
2022-07-07 04:01:00 +02:00
|
|
|
"errors"
|
2022-07-01 21:17:19 +02:00
|
|
|
"fmt"
|
2022-08-19 22:23:00 +02:00
|
|
|
"io"
|
2022-11-27 23:12:15 +01:00
|
|
|
"log"
|
2022-08-19 22:23:00 +02:00
|
|
|
"os"
|
|
|
|
"os/exec"
|
2022-08-17 21:24:09 +02:00
|
|
|
"path"
|
2022-09-14 22:01:52 +02:00
|
|
|
"regexp"
|
2022-08-24 06:05:49 +02:00
|
|
|
"strconv"
|
2022-08-17 21:24:09 +02:00
|
|
|
"strings"
|
2022-07-01 21:17:19 +02:00
|
|
|
"sync"
|
2024-03-14 02:52:41 +01:00
|
|
|
"sync/atomic"
|
2022-08-19 22:23:00 +02:00
|
|
|
"syscall"
|
2022-10-01 02:22:28 +02:00
|
|
|
"time"
|
2022-07-01 21:17:19 +02:00
|
|
|
|
2023-12-31 07:52:30 +01:00
|
|
|
"github.com/alessio/shellescape"
|
2022-09-15 08:10:35 +02:00
|
|
|
"github.com/armon/circbuf"
|
2023-11-01 09:26:19 +01:00
|
|
|
"github.com/creack/pty"
|
|
|
|
"github.com/google/uuid"
|
2023-10-16 22:30:10 +02:00
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/base"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/server"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/shellapi"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/shellenv"
|
2023-10-16 22:30:10 +02:00
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/statediff"
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/utilfn"
|
2023-10-16 22:30:10 +02:00
|
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
|
2024-02-16 01:45:47 +01:00
|
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/scbus"
|
2023-10-16 22:30:10 +02:00
|
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
|
|
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
|
2024-02-29 20:37:03 +01:00
|
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/userinput"
|
2024-02-16 01:45:47 +01:00
|
|
|
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
"golang.org/x/crypto/ssh"
|
2022-09-25 04:54:06 +02:00
|
|
|
"golang.org/x/mod/semver"
|
2022-07-01 21:17:19 +02:00
|
|
|
)
|
|
|
|
|
Use ssh library: add user input (#281)
* feat: create backend for user input requests
This is the first part of a change that allows the backend to request
user input from the frontend. Essentially, the backend will send a
request for the user to answer some query, and the frontend will send
that answer back. It is blocking, so it needs to be used within a
goroutine.
There is some placeholder code in the frontend that will be updated in
future commits. Similarly, there is some debug code in the backend
remote.go file.
* feat: create frontend for user input requests
This is part of a change to allow the backend to request user input from
the frontend. This adds a component specifically for handling this
logic. It is only a starting point, and does not work perfectly yet.
* refactor: update user input backend/interface
This updates the user input backend to fix a few potential bugs. It also
refactors the user input request and response types to better handle
markdown and errors while making it more convenient to work with.
A couple frontend changes were made to keep everything compatible.
* fix: add props to user input request modal
There was a second place that the modals were created that I previously
missed. This fixes that second casel
* feat: complete user input modal
This rounds out the most immediate concerns for the new user input
modal. The frontend now includes a timer to show how much time is left
and will close itself once it reaches zero. Css
formatting has been cleaned up to be more reasonable.
There is still some test code present on the back end. This will be
removed once actuall examples of the new modal are in place.
* feat: create first pass known_hosts detection
Manually integrating with golang's ssh library means that the code must
authenticate known_hosts on its own. This is a first pass at creating a
system that parses the known hosts files and denys a connection if there
is a mismatch. This needs to be updated with a means to add keys to the
known-hosts file if the user requests it.
* feat: allow writing to known_hosts first pass
As a follow-up to the previous change, we now allow the user to respond
to interactive queries in order to determine if an unknown known hosts
key can be added to a known_hosts file if it is missing. This needs to
be refined further, but it gets the basic functionality there.
* feat: add user input for kbd-interactive auth
This adds a modal so the user can respond to prompts provided using the
keyboard interactive authentication method.
* feat: add interactive password authentication
This makes the ssh password authentication interactive with its own user
input modal. Unfortunately, this method does not allow trying a default
first. This will need to be expanded in the future to accomodate that.
* fix: allow automatic and interactive auth together
Previously, it was impossible to use to separate methods of the same
type to try ssh authentication. This made it impossible to make an auto
attempt before a manual one. This change restricts that by combining
them into one method where the auto attempt is tried once first and
cannot be tried again. Following that, interactive authentication can be
tried separately.
It also lowers the time limit on kbd interactive authentication to 15
seconds due to limitations on the library we are using.
* fix: set number of retries to one in ssh
Number of retries means number of attempts after the fact, not number of
total attempts. It has been adjusted from 2 to 1 to reflect this.
* refactor: change argument order in GetUserInput
This is a simple change to move the context to the first argument of
GetUserInput to match the convention used elsewhere in the code.
* fix: set number of retries to two again
I was wrong in my previous analysis. The number given is the total
number of tries. This is confusing when keyboard authentication and
password authentication are both available which usually doesn't happen.
* feat: create naive ui for ssh key passphrases
This isn't quite as reactive as the other methods, but it does attempt
to use publickey without a passphrase, then attempt to use the password
as the passphrase, and finally prompting the user for a passphrase. The
problem with this approach is that if multiple keys are used and they
all have passphrases, they need to all be checked up front. In practice,
this will not happen often, but it is something to be aware of.
* fix: add the userinput.tsx changes
These were missed in the previous commit. Adding them now.
2024-02-09 04:16:56 +01:00
|
|
|
const UseSshLibrary = true
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
|
2022-07-01 21:17:19 +02:00
|
|
|
const RemoteTypeMShell = "mshell"
|
2022-07-07 04:01:00 +02:00
|
|
|
const DefaultTerm = "xterm-256color"
|
2022-08-19 22:23:00 +02:00
|
|
|
const DefaultMaxPtySize = 1024 * 1024
|
2022-09-15 08:10:35 +02:00
|
|
|
const CircBufSize = 64 * 1024
|
2022-09-16 02:09:04 +02:00
|
|
|
const RemoteTermRows = 8
|
2022-09-15 09:17:23 +02:00
|
|
|
const RemoteTermCols = 80
|
|
|
|
const PtyReadBufSize = 100
|
2023-04-04 03:57:38 +02:00
|
|
|
const RemoteConnectTimeout = 15 * time.Second
|
2024-02-08 21:37:23 +01:00
|
|
|
const RpcIterChannelSize = 100
|
2022-07-01 21:17:19 +02:00
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
var envVarsToStrip map[string]bool = map[string]bool{
|
|
|
|
"PROMPT": true,
|
|
|
|
"PROMPT_VERSION": true,
|
|
|
|
"MSHELL": true,
|
|
|
|
"MSHELL_VERSION": true,
|
|
|
|
"WAVETERM": true,
|
|
|
|
"WAVETERM_VERSION": true,
|
|
|
|
"TERM_PROGRAM": true,
|
|
|
|
"TERM_PROGRAM_VERSION": true,
|
|
|
|
"TERM_SESSION_ID": true,
|
|
|
|
}
|
|
|
|
|
2023-12-18 21:42:40 +01:00
|
|
|
// we add this ping packet to the MShellServer Commands in order to deal with spurious SSH output
|
|
|
|
// basically we guarantee the parser will see a valid packet (either an init error or a ping)
|
|
|
|
// so we can pass ignoreUntilValid to PacketParser
|
|
|
|
const PrintPingPacket = `printf "\n##N{\"type\": \"ping\"}\n"`
|
|
|
|
|
2022-09-27 06:09:43 +02:00
|
|
|
const MShellServerCommandFmt = `
|
2022-08-17 21:24:09 +02:00
|
|
|
PATH=$PATH:~/.mshell;
|
2022-09-27 06:09:43 +02:00
|
|
|
which mshell-[%VERSION%] > /dev/null;
|
2022-08-17 21:24:09 +02:00
|
|
|
if [[ "$?" -ne 0 ]]
|
|
|
|
then
|
|
|
|
printf "\n##N{\"type\": \"init\", \"notfound\": true, \"uname\": \"%s | %s\"}\n" "$(uname -s)" "$(uname -m)"
|
|
|
|
else
|
2023-12-18 21:42:40 +01:00
|
|
|
[%PINGPACKET%]
|
2022-09-27 06:09:43 +02:00
|
|
|
mshell-[%VERSION%] --server
|
2022-08-17 21:24:09 +02:00
|
|
|
fi
|
|
|
|
`
|
|
|
|
|
2022-12-29 09:07:16 +01:00
|
|
|
func MakeLocalMShellCommandStr(isSudo bool) (string, error) {
|
2022-12-29 08:09:37 +01:00
|
|
|
mshellPath, err := scbase.LocalMShellBinaryPath()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2022-12-29 09:07:16 +01:00
|
|
|
if isSudo {
|
2023-12-31 07:52:30 +01:00
|
|
|
return fmt.Sprintf(`%s; sudo %s --server`, PrintPingPacket, shellescape.Quote(mshellPath)), nil
|
2022-12-29 09:07:16 +01:00
|
|
|
} else {
|
2023-12-31 07:52:30 +01:00
|
|
|
return fmt.Sprintf(`%s; %s --server`, PrintPingPacket, shellescape.Quote(mshellPath)), nil
|
2022-12-29 09:07:16 +01:00
|
|
|
}
|
2022-12-29 08:09:37 +01:00
|
|
|
}
|
|
|
|
|
2022-09-27 06:09:43 +02:00
|
|
|
func MakeServerCommandStr() string {
|
2023-12-18 21:42:40 +01:00
|
|
|
rtn := strings.ReplaceAll(MShellServerCommandFmt, "[%VERSION%]", semver.MajorMinor(scbase.MShellVersion))
|
|
|
|
rtn = strings.ReplaceAll(rtn, "[%PINGPACKET%]", PrintPingPacket)
|
|
|
|
return rtn
|
2022-09-27 06:09:43 +02:00
|
|
|
}
|
|
|
|
|
2022-07-02 02:38:36 +02:00
|
|
|
const (
|
ssh config import (#156)
* create migrations for required database change
This is a first attempt that does not appear to be working properly. It
requires review.
* fix errors in db migrations
The previous commit had an extra json call that broke the update and did
not remove the imported interies during a downgrade.
* change migrations to use column instead of json
It makes more sense to associate the source of a config with the remote
type than the sshopts type. This change makes that clear in the database
structure.
* ensure adding a remote manually tags correctly
Using the usual way of adding a remote should result in a sshconfigsrc
of "waveterm-manual". This will be important for filtering out remotes
installed manually and remotes installed via import
* create basic structure for parsing ssh config
This entails creating a new command, making it possible to query only
the imported remotes from the database, and implementing the logic to
handle all of the updates needed.
This needs improvements in a few areas:
- the /etc/ssh/config needs to be parsed as well
- the logic for editing exisiting imported remotes needs to be written
- error handling needs to be improved
- update packet responses need to be provided
* add sshkey support and implement editing
We now search for the ssh identity keyfile and add it if it is found.
Additionally, the logic to edit previously imported ssh hosts has been
added.
* combine hosts from user and system ssh config
We now check both the user ~/.ssh/config as well as the /etc/ssh/config
for hosts. This loops through each file starting with the user one. For
each host, it selects the first pattern without a wildcard and chooses
that to be the alias. If any future hosts are found to have the same
alias, they are skipped. Errors are raised if neither config file can be
opened or no aliases were found.
* improve logging and error reporting
Error reporting is now shortcircuited in cases of individual remotes in
order to allow the other remotes to continue. These errors are now
printed to logs instead.
* allow imports to edit ssh port
Previously, ssh ports could not be edited after the fact. Unfortunately,
this can cause problems since the port can be changed in an ssh config
file. To address this, we allow imports to change the port if a host
with the same canonical name had previously been imported.
* fix response to parse command
* fix error handline for alias parsing
Small mistake of checking for equality instead of inequality
* fix the ability to overwrite hostName with alias
if ssh_config does not find Hostname, it won't output an error. Now we
compare against the result instead of looking for an error.
* fix the error catching for User and Port
This fixes the same problem where parsing the config doesn't give an
error in the case when nothing is found. As before, this checks for a
blank result instead.
* remove unused code
* remove repeated canonical name check
The logic that checks for an existing canonical name already exists in
the AddRemote function, so it is not needed here.
Secondly, we now only allow edits of previously created remotes if they
have not been archived. If they have, the usual logic for creating a new
remote takes precedence.
Lastly, there is no need to archive a remote that has already been
archived so an additional check has been added.
* allow archives to preserve the SSHConfigSrc
* add log message for archiving of imported remotes
* create variables for string variants
Matches existing code style
* add cleanup for opened files
* move migration 25 to migration 26 (already merged a migration 25)
* fix RemoteRuntimeState in ModelUpdate by moving type to sstore.go. Fix some bugs in remote:parse. Fix key/identityfile, return value, and remote editing (should go through msh). remote sudo. add info messages around parse status
* fix issue with archiving the sshconfigsrc
A bug in RemoteType's FromMap caused the loss of sshconfigsrc during the
conversion. This has been corrected and the schema has been updated.
* fix order of archiving removed imported remotes
Previously, if the canonical name changed, the code would try to create
a new remote before archiving the old one. This did not work if the
alias didn't change. Now we archive first and add a new remote after.
* fix ability to change port when importing config
Importing from sshconfig needs to allow the port to change. This was not
happening because of a bug that has been corrected.
* always use host in place of hostname
Since host is the key actually searched for in the ssh config file,
searching for user@hostName may not actually work. To avoid this, we now
always use user@host instead.
* automatically determine ConnectMode
This aims to select a connection mode based off what is provided in the
ssh config file. It aims for auto connections when possible but will
fall back to manual if we can't easily support it
* remove sshkeysource migration number confilict
Previously had conflicting migration numbers of 26. The change not in
the main branch has been moved to 27 to remove the conflict.
* move sshkeysource migration to migration 28
* add WaveOptions flag parsing for ssh config
This is currently being used to allow users to force manual connect mode
if desired. It will also be used to force skipping options in the future
but that is not complete in this commit.
* implement ignore flag for ssh config parsing
The ignore flag will now archive an imported remote if it previously
existed and not create a new remote in its place.
* fix discovery of identity file
Previously, a ~ in the identity file's path was not expanded to the home
dir. Because of this, files with a ~ were previously identified as
invalid files. By expanding it during the search, this is no longer the
case.
* disable frontend edit button for imported remotes
Imported Remotes should not be editable in waveterm by users. This edit
makes it clear that the button will not work for those cases. Further
edits may be needed to explain why it doesn't work and what to do
instead.
* add backend rejection of updating imported remote
As before, we don't want manual editing of an imported remote inside the
app. This ensures that it can't happen on the backend.
* create tooltips for sshconfig edit/delete buttons
For remotes that are imported, edits are not allowed. This adds a
tooltip that explains what to do instead.
Deleting remotes that are imported is allowed, but they will come back
if the user imports again. The tooltip explains a way to avoid this.
* add logo after name for imported remotes
In the connections screen, there previously was not a way to tell
imported connections from manually created connections. This change adds
a logo after the imported ones to differentiate them.
* small formatting updates
* add import tooltip to connection modal
Added the logo for an imported config to the connection modal. It also
provides a short description when it the mouse hovers over it.
* add button to import ssh config
Make the command into a button for a simple gui interface.
Also ran prettier to clean up some syntax.
* remove strict casing on WaveOptions
WaveOptions was previously very specific about the casing of the ignore
and connectmode subcommands. With this update, the casing is
automatically converted to lowercase and can be ignored.
* add status dot before name in connections screen
* add space and tooltip to connection imported icon
* re-prettier
2023-12-28 20:09:41 +01:00
|
|
|
StatusConnected = sstore.RemoteStatus_Connected
|
|
|
|
StatusConnecting = sstore.RemoteStatus_Connecting
|
|
|
|
StatusDisconnected = sstore.RemoteStatus_Disconnected
|
|
|
|
StatusError = sstore.RemoteStatus_Error
|
2022-07-02 02:38:36 +02:00
|
|
|
)
|
|
|
|
|
2022-09-25 04:54:06 +02:00
|
|
|
func init() {
|
2022-12-29 08:09:37 +01:00
|
|
|
if scbase.MShellVersion != base.MShellVersion {
|
2023-07-26 23:24:14 +02:00
|
|
|
panic(fmt.Sprintf("prompt-server apishell version must match '%s' vs '%s'", scbase.MShellVersion, base.MShellVersion))
|
2022-09-25 04:54:06 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-02 02:38:36 +02:00
|
|
|
var GlobalStore *Store
|
|
|
|
|
2022-07-01 23:57:42 +02:00
|
|
|
type Store struct {
|
2022-09-05 23:49:23 +02:00
|
|
|
Lock *sync.Mutex
|
|
|
|
Map map[string]*MShellProc // key=remoteid
|
2022-09-06 01:31:22 +02:00
|
|
|
CmdWaitMap map[base.CommandKey][]func()
|
2022-07-01 23:57:42 +02:00
|
|
|
}
|
|
|
|
|
2023-11-10 02:47:24 +01:00
|
|
|
type pendingStateKey struct {
|
|
|
|
ScreenId string
|
|
|
|
RemotePtr sstore.RemotePtrType
|
|
|
|
}
|
|
|
|
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
// for conditional launch method based on ssh library in use
|
|
|
|
// remove once ssh library is stabilized
|
|
|
|
type Launcher interface {
|
|
|
|
Launch(*MShellProc, bool)
|
|
|
|
}
|
|
|
|
|
2022-09-01 21:47:10 +02:00
|
|
|
type MShellProc struct {
|
|
|
|
Lock *sync.Mutex
|
|
|
|
Remote *sstore.RemoteType
|
|
|
|
|
|
|
|
// runtime
|
2022-10-28 07:22:17 +02:00
|
|
|
RemoteId string // can be read without a lock
|
2022-09-16 21:28:09 +02:00
|
|
|
Status string
|
|
|
|
ServerProc *shexec.ClientProc
|
|
|
|
UName string
|
|
|
|
Err error
|
2023-04-03 10:37:36 +02:00
|
|
|
ErrNoInitPk bool
|
2022-09-16 21:28:09 +02:00
|
|
|
ControllingPty *os.File
|
|
|
|
PtyBuffer *circbuf.Buffer
|
|
|
|
MakeClientCancelFn context.CancelFunc
|
2023-04-04 03:57:38 +02:00
|
|
|
MakeClientDeadline *time.Time
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
StateMap *server.ShellStateMap
|
2022-12-28 22:56:19 +01:00
|
|
|
NumTryConnect int
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
InitPkShellType string
|
2024-01-27 01:25:21 +01:00
|
|
|
DataPosMap *utilfn.SyncMap[base.CommandKey, int64]
|
2022-09-27 06:09:43 +02:00
|
|
|
|
|
|
|
// install
|
|
|
|
InstallStatus string
|
2022-09-25 04:54:06 +02:00
|
|
|
NeedsMShellUpgrade bool
|
2022-09-27 06:09:43 +02:00
|
|
|
InstallCancelFn context.CancelFunc
|
|
|
|
InstallErr error
|
2022-09-01 21:47:10 +02:00
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
RunningCmds map[base.CommandKey]*RunCmdType
|
2023-11-10 02:47:24 +01:00
|
|
|
PendingStateCmds map[pendingStateKey]base.CommandKey // key=[remoteinstance name]
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
launcher Launcher // for conditional launch method based on ssh library in use. remove once ssh library is stabilized
|
2024-02-29 20:37:03 +01:00
|
|
|
Client *ssh.Client
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type RunCmdType struct {
|
2024-03-14 02:52:41 +01:00
|
|
|
CK base.CommandKey
|
|
|
|
SessionId string
|
|
|
|
ScreenId string
|
|
|
|
RemotePtr sstore.RemotePtrType
|
|
|
|
RunPacket *packet.RunPacketType
|
|
|
|
Ephemeral bool
|
|
|
|
EphCancled atomic.Bool // only for Ephemeral commands, if true, then the command result should be discarded
|
2022-09-01 21:47:10 +02:00
|
|
|
}
|
|
|
|
|
ssh config import (#156)
* create migrations for required database change
This is a first attempt that does not appear to be working properly. It
requires review.
* fix errors in db migrations
The previous commit had an extra json call that broke the update and did
not remove the imported interies during a downgrade.
* change migrations to use column instead of json
It makes more sense to associate the source of a config with the remote
type than the sshopts type. This change makes that clear in the database
structure.
* ensure adding a remote manually tags correctly
Using the usual way of adding a remote should result in a sshconfigsrc
of "waveterm-manual". This will be important for filtering out remotes
installed manually and remotes installed via import
* create basic structure for parsing ssh config
This entails creating a new command, making it possible to query only
the imported remotes from the database, and implementing the logic to
handle all of the updates needed.
This needs improvements in a few areas:
- the /etc/ssh/config needs to be parsed as well
- the logic for editing exisiting imported remotes needs to be written
- error handling needs to be improved
- update packet responses need to be provided
* add sshkey support and implement editing
We now search for the ssh identity keyfile and add it if it is found.
Additionally, the logic to edit previously imported ssh hosts has been
added.
* combine hosts from user and system ssh config
We now check both the user ~/.ssh/config as well as the /etc/ssh/config
for hosts. This loops through each file starting with the user one. For
each host, it selects the first pattern without a wildcard and chooses
that to be the alias. If any future hosts are found to have the same
alias, they are skipped. Errors are raised if neither config file can be
opened or no aliases were found.
* improve logging and error reporting
Error reporting is now shortcircuited in cases of individual remotes in
order to allow the other remotes to continue. These errors are now
printed to logs instead.
* allow imports to edit ssh port
Previously, ssh ports could not be edited after the fact. Unfortunately,
this can cause problems since the port can be changed in an ssh config
file. To address this, we allow imports to change the port if a host
with the same canonical name had previously been imported.
* fix response to parse command
* fix error handline for alias parsing
Small mistake of checking for equality instead of inequality
* fix the ability to overwrite hostName with alias
if ssh_config does not find Hostname, it won't output an error. Now we
compare against the result instead of looking for an error.
* fix the error catching for User and Port
This fixes the same problem where parsing the config doesn't give an
error in the case when nothing is found. As before, this checks for a
blank result instead.
* remove unused code
* remove repeated canonical name check
The logic that checks for an existing canonical name already exists in
the AddRemote function, so it is not needed here.
Secondly, we now only allow edits of previously created remotes if they
have not been archived. If they have, the usual logic for creating a new
remote takes precedence.
Lastly, there is no need to archive a remote that has already been
archived so an additional check has been added.
* allow archives to preserve the SSHConfigSrc
* add log message for archiving of imported remotes
* create variables for string variants
Matches existing code style
* add cleanup for opened files
* move migration 25 to migration 26 (already merged a migration 25)
* fix RemoteRuntimeState in ModelUpdate by moving type to sstore.go. Fix some bugs in remote:parse. Fix key/identityfile, return value, and remote editing (should go through msh). remote sudo. add info messages around parse status
* fix issue with archiving the sshconfigsrc
A bug in RemoteType's FromMap caused the loss of sshconfigsrc during the
conversion. This has been corrected and the schema has been updated.
* fix order of archiving removed imported remotes
Previously, if the canonical name changed, the code would try to create
a new remote before archiving the old one. This did not work if the
alias didn't change. Now we archive first and add a new remote after.
* fix ability to change port when importing config
Importing from sshconfig needs to allow the port to change. This was not
happening because of a bug that has been corrected.
* always use host in place of hostname
Since host is the key actually searched for in the ssh config file,
searching for user@hostName may not actually work. To avoid this, we now
always use user@host instead.
* automatically determine ConnectMode
This aims to select a connection mode based off what is provided in the
ssh config file. It aims for auto connections when possible but will
fall back to manual if we can't easily support it
* remove sshkeysource migration number confilict
Previously had conflicting migration numbers of 26. The change not in
the main branch has been moved to 27 to remove the conflict.
* move sshkeysource migration to migration 28
* add WaveOptions flag parsing for ssh config
This is currently being used to allow users to force manual connect mode
if desired. It will also be used to force skipping options in the future
but that is not complete in this commit.
* implement ignore flag for ssh config parsing
The ignore flag will now archive an imported remote if it previously
existed and not create a new remote in its place.
* fix discovery of identity file
Previously, a ~ in the identity file's path was not expanded to the home
dir. Because of this, files with a ~ were previously identified as
invalid files. By expanding it during the search, this is no longer the
case.
* disable frontend edit button for imported remotes
Imported Remotes should not be editable in waveterm by users. This edit
makes it clear that the button will not work for those cases. Further
edits may be needed to explain why it doesn't work and what to do
instead.
* add backend rejection of updating imported remote
As before, we don't want manual editing of an imported remote inside the
app. This ensures that it can't happen on the backend.
* create tooltips for sshconfig edit/delete buttons
For remotes that are imported, edits are not allowed. This adds a
tooltip that explains what to do instead.
Deleting remotes that are imported is allowed, but they will come back
if the user imports again. The tooltip explains a way to avoid this.
* add logo after name for imported remotes
In the connections screen, there previously was not a way to tell
imported connections from manually created connections. This change adds
a logo after the imported ones to differentiate them.
* small formatting updates
* add import tooltip to connection modal
Added the logo for an imported config to the connection modal. It also
provides a short description when it the mouse hovers over it.
* add button to import ssh config
Make the command into a button for a simple gui interface.
Also ran prettier to clean up some syntax.
* remove strict casing on WaveOptions
WaveOptions was previously very specific about the casing of the ignore
and connectmode subcommands. With this update, the casing is
automatically converted to lowercase and can be ignored.
* add status dot before name in connections screen
* add space and tooltip to connection imported icon
* re-prettier
2023-12-28 20:09:41 +01:00
|
|
|
type RemoteRuntimeState = sstore.RemoteRuntimeState
|
2022-08-24 22:21:54 +02:00
|
|
|
|
2023-05-02 21:43:54 +02:00
|
|
|
func CanComplete(remoteType string) bool {
|
|
|
|
switch remoteType {
|
|
|
|
case sstore.RemoteTypeSsh:
|
|
|
|
return true
|
|
|
|
default:
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
// for conditional launch method based on ssh library in use
|
|
|
|
// remove once ssh library is stabilized
|
|
|
|
func (msh *MShellProc) Launch(interactive bool) {
|
|
|
|
msh.launcher.Launch(msh, interactive)
|
|
|
|
}
|
|
|
|
|
2022-09-16 21:28:09 +02:00
|
|
|
func (msh *MShellProc) GetStatus() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.Status
|
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) GetDefaultState(shellType string) *packet.ShellState {
|
|
|
|
_, state := msh.StateMap.GetCurrentState(shellType)
|
|
|
|
return state
|
2022-11-28 09:13:00 +01:00
|
|
|
}
|
|
|
|
|
2024-01-27 01:25:21 +01:00
|
|
|
func (msh *MShellProc) EnsureShellType(ctx context.Context, shellType string) error {
|
|
|
|
if msh.StateMap.HasShell(shellType) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// try to reinit the shell
|
|
|
|
_, err := msh.ReInit(ctx, shellType)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("error trying to initialize shell %q: %v", shellType, err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) GetDefaultStatePtr(shellType string) *sstore.ShellStatePtr {
|
2022-11-29 03:03:02 +01:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
hash, _ := msh.StateMap.GetCurrentState(shellType)
|
|
|
|
if hash == "" {
|
2022-11-29 03:03:02 +01:00
|
|
|
return nil
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
return &sstore.ShellStatePtr{BaseHash: hash}
|
2022-11-29 03:03:02 +01:00
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) GetDefaultFeState(shellType string) map[string]string {
|
|
|
|
state := msh.GetDefaultState(shellType)
|
2022-11-29 03:03:02 +01:00
|
|
|
return sstore.FeStateFromShellState(state)
|
|
|
|
}
|
|
|
|
|
2022-10-04 20:45:24 +02:00
|
|
|
func (msh *MShellProc) GetRemoteId() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.Remote.RemoteId
|
|
|
|
}
|
|
|
|
|
2022-09-27 06:09:43 +02:00
|
|
|
func (msh *MShellProc) GetInstallStatus() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.InstallStatus
|
|
|
|
}
|
|
|
|
|
2022-07-02 02:38:36 +02:00
|
|
|
func LoadRemotes(ctx context.Context) error {
|
|
|
|
GlobalStore = &Store{
|
2022-09-05 23:49:23 +02:00
|
|
|
Lock: &sync.Mutex{},
|
|
|
|
Map: make(map[string]*MShellProc),
|
2022-09-06 01:31:22 +02:00
|
|
|
CmdWaitMap: make(map[base.CommandKey][]func()),
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
|
|
|
allRemotes, err := sstore.GetAllRemotes(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
var numLocal int
|
2022-12-29 09:07:16 +01:00
|
|
|
var numSudoLocal int
|
2022-07-02 02:38:36 +02:00
|
|
|
for _, remote := range allRemotes {
|
|
|
|
msh := MakeMShell(remote)
|
2022-07-06 01:54:49 +02:00
|
|
|
GlobalStore.Map[remote.RemoteId] = msh
|
2022-08-21 21:31:29 +02:00
|
|
|
if remote.ConnectMode == sstore.ConnectModeStartup {
|
2023-01-23 22:47:57 +01:00
|
|
|
go msh.Launch(false)
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
if remote.Local {
|
2023-05-02 21:43:54 +02:00
|
|
|
if remote.IsSudo() {
|
2022-12-29 09:07:16 +01:00
|
|
|
numSudoLocal++
|
|
|
|
} else {
|
|
|
|
numLocal++
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if numLocal == 0 {
|
|
|
|
return fmt.Errorf("no local remote found")
|
|
|
|
}
|
|
|
|
if numLocal > 1 {
|
|
|
|
return fmt.Errorf("multiple local remotes found")
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
2022-12-29 09:07:16 +01:00
|
|
|
if numSudoLocal > 1 {
|
|
|
|
return fmt.Errorf("multiple local sudo remotes found")
|
|
|
|
}
|
2022-07-02 02:38:36 +02:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-09-01 21:47:10 +02:00
|
|
|
func LoadRemoteById(ctx context.Context, remoteId string) error {
|
|
|
|
r, err := sstore.GetRemoteById(ctx, remoteId)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if r == nil {
|
|
|
|
return fmt.Errorf("remote %s not found", remoteId)
|
|
|
|
}
|
|
|
|
msh := MakeMShell(r)
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
existingRemote := GlobalStore.Map[remoteId]
|
|
|
|
if existingRemote != nil {
|
2022-12-28 22:56:19 +01:00
|
|
|
return fmt.Errorf("cannot add remote %s, already in global map", remoteId)
|
2022-09-01 21:47:10 +02:00
|
|
|
}
|
|
|
|
GlobalStore.Map[r.RemoteId] = msh
|
|
|
|
if r.ConnectMode == sstore.ConnectModeStartup {
|
2023-01-23 22:47:57 +01:00
|
|
|
go msh.Launch(false)
|
2022-09-01 21:47:10 +02:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-09-15 08:10:35 +02:00
|
|
|
func ReadRemotePty(ctx context.Context, remoteId string) (int64, []byte, error) {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
msh := GlobalStore.Map[remoteId]
|
|
|
|
if msh == nil {
|
|
|
|
return 0, nil, nil
|
|
|
|
}
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
barr := msh.PtyBuffer.Bytes()
|
|
|
|
offset := msh.PtyBuffer.TotalWritten() - int64(len(barr))
|
|
|
|
return offset, barr, nil
|
|
|
|
}
|
|
|
|
|
2023-01-23 22:28:00 +01:00
|
|
|
func AddRemote(ctx context.Context, r *sstore.RemoteType, shouldStart bool) error {
|
2022-09-14 02:11:36 +02:00
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
|
|
|
|
existingRemote := getRemoteByCanonicalName_nolock(r.RemoteCanonicalName)
|
|
|
|
if existingRemote != nil {
|
2022-09-14 21:56:05 +02:00
|
|
|
erCopy := existingRemote.GetRemoteCopy()
|
2022-09-14 02:11:36 +02:00
|
|
|
if !erCopy.Archived {
|
|
|
|
return fmt.Errorf("duplicate canonical name %q: cannot create new remote", r.RemoteCanonicalName)
|
|
|
|
}
|
|
|
|
r.RemoteId = erCopy.RemoteId
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
if r.Local {
|
|
|
|
return fmt.Errorf("cannot create another local remote (there can be only one)")
|
|
|
|
}
|
|
|
|
|
2022-09-14 02:11:36 +02:00
|
|
|
err := sstore.UpsertRemote(ctx, r)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("cannot create remote %q: %v", r.RemoteCanonicalName, err)
|
|
|
|
}
|
|
|
|
newMsh := MakeMShell(r)
|
|
|
|
GlobalStore.Map[r.RemoteId] = newMsh
|
|
|
|
go newMsh.NotifyRemoteUpdate()
|
2023-01-23 22:28:00 +01:00
|
|
|
if shouldStart {
|
2023-01-23 22:47:57 +01:00
|
|
|
go newMsh.Launch(true)
|
2022-09-14 02:11:36 +02:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func ArchiveRemote(ctx context.Context, remoteId string) error {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
msh := GlobalStore.Map[remoteId]
|
|
|
|
if msh == nil {
|
|
|
|
return fmt.Errorf("remote not found, cannot archive")
|
|
|
|
}
|
|
|
|
if msh.Status == StatusConnected {
|
|
|
|
return fmt.Errorf("cannot archive connected remote")
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
if msh.Remote.Local {
|
|
|
|
return fmt.Errorf("cannot archive local remote")
|
|
|
|
}
|
2022-09-14 21:56:05 +02:00
|
|
|
rcopy := msh.GetRemoteCopy()
|
2022-09-14 02:11:36 +02:00
|
|
|
archivedRemote := &sstore.RemoteType{
|
|
|
|
RemoteId: rcopy.RemoteId,
|
|
|
|
RemoteType: rcopy.RemoteType,
|
|
|
|
RemoteCanonicalName: rcopy.RemoteCanonicalName,
|
|
|
|
ConnectMode: sstore.ConnectModeManual,
|
|
|
|
Archived: true,
|
ssh config import (#156)
* create migrations for required database change
This is a first attempt that does not appear to be working properly. It
requires review.
* fix errors in db migrations
The previous commit had an extra json call that broke the update and did
not remove the imported interies during a downgrade.
* change migrations to use column instead of json
It makes more sense to associate the source of a config with the remote
type than the sshopts type. This change makes that clear in the database
structure.
* ensure adding a remote manually tags correctly
Using the usual way of adding a remote should result in a sshconfigsrc
of "waveterm-manual". This will be important for filtering out remotes
installed manually and remotes installed via import
* create basic structure for parsing ssh config
This entails creating a new command, making it possible to query only
the imported remotes from the database, and implementing the logic to
handle all of the updates needed.
This needs improvements in a few areas:
- the /etc/ssh/config needs to be parsed as well
- the logic for editing exisiting imported remotes needs to be written
- error handling needs to be improved
- update packet responses need to be provided
* add sshkey support and implement editing
We now search for the ssh identity keyfile and add it if it is found.
Additionally, the logic to edit previously imported ssh hosts has been
added.
* combine hosts from user and system ssh config
We now check both the user ~/.ssh/config as well as the /etc/ssh/config
for hosts. This loops through each file starting with the user one. For
each host, it selects the first pattern without a wildcard and chooses
that to be the alias. If any future hosts are found to have the same
alias, they are skipped. Errors are raised if neither config file can be
opened or no aliases were found.
* improve logging and error reporting
Error reporting is now shortcircuited in cases of individual remotes in
order to allow the other remotes to continue. These errors are now
printed to logs instead.
* allow imports to edit ssh port
Previously, ssh ports could not be edited after the fact. Unfortunately,
this can cause problems since the port can be changed in an ssh config
file. To address this, we allow imports to change the port if a host
with the same canonical name had previously been imported.
* fix response to parse command
* fix error handline for alias parsing
Small mistake of checking for equality instead of inequality
* fix the ability to overwrite hostName with alias
if ssh_config does not find Hostname, it won't output an error. Now we
compare against the result instead of looking for an error.
* fix the error catching for User and Port
This fixes the same problem where parsing the config doesn't give an
error in the case when nothing is found. As before, this checks for a
blank result instead.
* remove unused code
* remove repeated canonical name check
The logic that checks for an existing canonical name already exists in
the AddRemote function, so it is not needed here.
Secondly, we now only allow edits of previously created remotes if they
have not been archived. If they have, the usual logic for creating a new
remote takes precedence.
Lastly, there is no need to archive a remote that has already been
archived so an additional check has been added.
* allow archives to preserve the SSHConfigSrc
* add log message for archiving of imported remotes
* create variables for string variants
Matches existing code style
* add cleanup for opened files
* move migration 25 to migration 26 (already merged a migration 25)
* fix RemoteRuntimeState in ModelUpdate by moving type to sstore.go. Fix some bugs in remote:parse. Fix key/identityfile, return value, and remote editing (should go through msh). remote sudo. add info messages around parse status
* fix issue with archiving the sshconfigsrc
A bug in RemoteType's FromMap caused the loss of sshconfigsrc during the
conversion. This has been corrected and the schema has been updated.
* fix order of archiving removed imported remotes
Previously, if the canonical name changed, the code would try to create
a new remote before archiving the old one. This did not work if the
alias didn't change. Now we archive first and add a new remote after.
* fix ability to change port when importing config
Importing from sshconfig needs to allow the port to change. This was not
happening because of a bug that has been corrected.
* always use host in place of hostname
Since host is the key actually searched for in the ssh config file,
searching for user@hostName may not actually work. To avoid this, we now
always use user@host instead.
* automatically determine ConnectMode
This aims to select a connection mode based off what is provided in the
ssh config file. It aims for auto connections when possible but will
fall back to manual if we can't easily support it
* remove sshkeysource migration number confilict
Previously had conflicting migration numbers of 26. The change not in
the main branch has been moved to 27 to remove the conflict.
* move sshkeysource migration to migration 28
* add WaveOptions flag parsing for ssh config
This is currently being used to allow users to force manual connect mode
if desired. It will also be used to force skipping options in the future
but that is not complete in this commit.
* implement ignore flag for ssh config parsing
The ignore flag will now archive an imported remote if it previously
existed and not create a new remote in its place.
* fix discovery of identity file
Previously, a ~ in the identity file's path was not expanded to the home
dir. Because of this, files with a ~ were previously identified as
invalid files. By expanding it during the search, this is no longer the
case.
* disable frontend edit button for imported remotes
Imported Remotes should not be editable in waveterm by users. This edit
makes it clear that the button will not work for those cases. Further
edits may be needed to explain why it doesn't work and what to do
instead.
* add backend rejection of updating imported remote
As before, we don't want manual editing of an imported remote inside the
app. This ensures that it can't happen on the backend.
* create tooltips for sshconfig edit/delete buttons
For remotes that are imported, edits are not allowed. This adds a
tooltip that explains what to do instead.
Deleting remotes that are imported is allowed, but they will come back
if the user imports again. The tooltip explains a way to avoid this.
* add logo after name for imported remotes
In the connections screen, there previously was not a way to tell
imported connections from manually created connections. This change adds
a logo after the imported ones to differentiate them.
* small formatting updates
* add import tooltip to connection modal
Added the logo for an imported config to the connection modal. It also
provides a short description when it the mouse hovers over it.
* add button to import ssh config
Make the command into a button for a simple gui interface.
Also ran prettier to clean up some syntax.
* remove strict casing on WaveOptions
WaveOptions was previously very specific about the casing of the ignore
and connectmode subcommands. With this update, the casing is
automatically converted to lowercase and can be ignored.
* add status dot before name in connections screen
* add space and tooltip to connection imported icon
* re-prettier
2023-12-28 20:09:41 +01:00
|
|
|
SSHConfigSrc: rcopy.SSHConfigSrc,
|
2022-09-14 02:11:36 +02:00
|
|
|
}
|
|
|
|
err := sstore.UpsertRemote(ctx, archivedRemote)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
newMsh := MakeMShell(archivedRemote)
|
|
|
|
GlobalStore.Map[remoteId] = newMsh
|
|
|
|
go newMsh.NotifyRemoteUpdate()
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-09-14 22:01:52 +02:00
|
|
|
var partialUUIDRe = regexp.MustCompile("^[0-9a-f]{8}$")
|
|
|
|
|
|
|
|
func isPartialUUID(s string) bool {
|
|
|
|
return partialUUIDRe.MatchString(s)
|
|
|
|
}
|
|
|
|
|
2023-02-22 07:41:56 +01:00
|
|
|
func NumRemotes() int {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
return len(GlobalStore.Map)
|
|
|
|
}
|
|
|
|
|
2022-09-14 22:01:52 +02:00
|
|
|
func GetRemoteByArg(arg string) *MShellProc {
|
2022-07-02 02:38:36 +02:00
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
2022-09-14 22:01:52 +02:00
|
|
|
isPuid := isPartialUUID(arg)
|
2022-07-06 01:54:49 +02:00
|
|
|
for _, msh := range GlobalStore.Map {
|
2022-09-14 21:56:05 +02:00
|
|
|
rcopy := msh.GetRemoteCopy()
|
2022-09-14 22:01:52 +02:00
|
|
|
if rcopy.RemoteAlias == arg || rcopy.RemoteCanonicalName == arg || rcopy.RemoteId == arg {
|
|
|
|
return msh
|
|
|
|
}
|
|
|
|
if isPuid && strings.HasPrefix(rcopy.RemoteId, arg) {
|
2022-07-06 01:54:49 +02:00
|
|
|
return msh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-09-14 02:11:36 +02:00
|
|
|
func getRemoteByCanonicalName_nolock(name string) *MShellProc {
|
|
|
|
for _, msh := range GlobalStore.Map {
|
2022-09-14 21:56:05 +02:00
|
|
|
rcopy := msh.GetRemoteCopy()
|
2022-09-14 02:11:36 +02:00
|
|
|
if rcopy.RemoteCanonicalName == name {
|
|
|
|
return msh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-07-06 01:54:49 +02:00
|
|
|
func GetRemoteById(remoteId string) *MShellProc {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
return GlobalStore.Map[remoteId]
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
2022-07-01 23:57:42 +02:00
|
|
|
|
2023-03-29 21:42:04 +02:00
|
|
|
func GetRemoteCopyById(remoteId string) *sstore.RemoteType {
|
|
|
|
msh := GetRemoteById(remoteId)
|
|
|
|
if msh == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rcopy := msh.GetRemoteCopy()
|
|
|
|
return &rcopy
|
|
|
|
}
|
|
|
|
|
2022-12-31 02:01:17 +01:00
|
|
|
func GetRemoteMap() map[string]*MShellProc {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
rtn := make(map[string]*MShellProc)
|
|
|
|
for remoteId, msh := range GlobalStore.Map {
|
|
|
|
rtn[remoteId] = msh
|
|
|
|
}
|
|
|
|
return rtn
|
|
|
|
}
|
|
|
|
|
2022-10-04 20:45:24 +02:00
|
|
|
func GetLocalRemote() *MShellProc {
|
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
for _, msh := range GlobalStore.Map {
|
2022-12-29 09:07:16 +01:00
|
|
|
if msh.IsLocal() && !msh.IsSudo() {
|
2022-10-04 20:45:24 +02:00
|
|
|
return msh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-08-30 01:31:06 +02:00
|
|
|
func ResolveRemoteRef(remoteRef string) *RemoteRuntimeState {
|
2022-08-24 11:14:16 +02:00
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
|
|
|
|
_, err := uuid.Parse(remoteRef)
|
|
|
|
if err == nil {
|
|
|
|
msh := GlobalStore.Map[remoteRef]
|
|
|
|
if msh != nil {
|
2022-08-30 01:31:06 +02:00
|
|
|
state := msh.GetRemoteRuntimeState()
|
2022-08-24 11:14:16 +02:00
|
|
|
return &state
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
for _, msh := range GlobalStore.Map {
|
|
|
|
if msh.Remote.RemoteAlias == remoteRef || msh.Remote.RemoteCanonicalName == remoteRef {
|
2022-08-30 01:31:06 +02:00
|
|
|
state := msh.GetRemoteRuntimeState()
|
2022-08-24 11:14:16 +02:00
|
|
|
return &state
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-08-23 01:00:25 +02:00
|
|
|
func unquoteDQBashString(str string) (string, bool) {
|
|
|
|
if len(str) < 2 {
|
|
|
|
return str, false
|
|
|
|
}
|
|
|
|
if str[0] != '"' || str[len(str)-1] != '"' {
|
|
|
|
return str, false
|
|
|
|
}
|
|
|
|
rtn := make([]byte, 0, len(str)-2)
|
|
|
|
for idx := 1; idx < len(str)-1; idx++ {
|
|
|
|
ch := str[idx]
|
|
|
|
if ch == '"' {
|
|
|
|
return str, false
|
|
|
|
}
|
|
|
|
if ch == '\\' {
|
|
|
|
if idx == len(str)-2 {
|
|
|
|
return str, false
|
|
|
|
}
|
|
|
|
nextCh := str[idx+1]
|
|
|
|
if nextCh == '\n' {
|
|
|
|
idx++
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if nextCh == '$' || nextCh == '"' || nextCh == '\\' || nextCh == '`' {
|
|
|
|
idx++
|
|
|
|
rtn = append(rtn, nextCh)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
rtn = append(rtn, '\\')
|
|
|
|
continue
|
|
|
|
} else {
|
|
|
|
rtn = append(rtn, ch)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return string(rtn), true
|
|
|
|
}
|
|
|
|
|
2022-08-24 06:05:49 +02:00
|
|
|
func makeShortHost(host string) string {
|
|
|
|
dotIdx := strings.Index(host, ".")
|
|
|
|
if dotIdx == -1 {
|
|
|
|
return host
|
|
|
|
}
|
|
|
|
return host[0:dotIdx]
|
|
|
|
}
|
|
|
|
|
2022-10-04 20:45:24 +02:00
|
|
|
func (msh *MShellProc) IsLocal() bool {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.Remote.Local
|
|
|
|
}
|
|
|
|
|
2022-12-29 09:07:16 +01:00
|
|
|
func (msh *MShellProc) IsSudo() bool {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2023-05-02 21:43:54 +02:00
|
|
|
return msh.Remote.IsSudo()
|
2022-12-29 09:07:16 +01:00
|
|
|
}
|
|
|
|
|
2023-04-04 07:15:43 +02:00
|
|
|
func (msh *MShellProc) tryAutoInstall() {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
if !msh.Remote.AutoInstall || !msh.NeedsMShellUpgrade || msh.InstallErr != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.writeToPtyBuffer_nolock("trying auto-install\n")
|
2024-03-04 20:56:20 +01:00
|
|
|
go msh.RunInstall(true)
|
2023-04-04 07:15:43 +02:00
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
// if msh.IsConnected() then GetShellPref() should return a valid shell
|
|
|
|
// if msh is not connected, then InitPkShellType might be empty
|
|
|
|
func (msh *MShellProc) GetShellPref() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
if msh.Remote.ShellPref == sstore.ShellTypePref_Detect {
|
|
|
|
return msh.InitPkShellType
|
|
|
|
}
|
2024-02-16 02:42:43 +01:00
|
|
|
if msh.Remote.ShellPref == "" {
|
|
|
|
return packet.ShellType_bash
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
return msh.Remote.ShellPref
|
|
|
|
}
|
|
|
|
|
2022-09-04 22:51:49 +02:00
|
|
|
func (msh *MShellProc) GetRemoteRuntimeState() RemoteRuntimeState {
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
shellPref := msh.GetShellPref()
|
2022-09-04 22:51:49 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2022-08-30 01:31:06 +02:00
|
|
|
state := RemoteRuntimeState{
|
2022-09-04 22:51:49 +02:00
|
|
|
RemoteType: msh.Remote.RemoteType,
|
|
|
|
RemoteId: msh.Remote.RemoteId,
|
|
|
|
RemoteAlias: msh.Remote.RemoteAlias,
|
|
|
|
RemoteCanonicalName: msh.Remote.RemoteCanonicalName,
|
|
|
|
Status: msh.Status,
|
|
|
|
ConnectMode: msh.Remote.ConnectMode,
|
2022-09-25 04:54:06 +02:00
|
|
|
AutoInstall: msh.Remote.AutoInstall,
|
2022-09-14 02:11:36 +02:00
|
|
|
Archived: msh.Remote.Archived,
|
2022-09-14 21:06:55 +02:00
|
|
|
RemoteIdx: msh.Remote.RemoteIdx,
|
ssh config import (#156)
* create migrations for required database change
This is a first attempt that does not appear to be working properly. It
requires review.
* fix errors in db migrations
The previous commit had an extra json call that broke the update and did
not remove the imported interies during a downgrade.
* change migrations to use column instead of json
It makes more sense to associate the source of a config with the remote
type than the sshopts type. This change makes that clear in the database
structure.
* ensure adding a remote manually tags correctly
Using the usual way of adding a remote should result in a sshconfigsrc
of "waveterm-manual". This will be important for filtering out remotes
installed manually and remotes installed via import
* create basic structure for parsing ssh config
This entails creating a new command, making it possible to query only
the imported remotes from the database, and implementing the logic to
handle all of the updates needed.
This needs improvements in a few areas:
- the /etc/ssh/config needs to be parsed as well
- the logic for editing exisiting imported remotes needs to be written
- error handling needs to be improved
- update packet responses need to be provided
* add sshkey support and implement editing
We now search for the ssh identity keyfile and add it if it is found.
Additionally, the logic to edit previously imported ssh hosts has been
added.
* combine hosts from user and system ssh config
We now check both the user ~/.ssh/config as well as the /etc/ssh/config
for hosts. This loops through each file starting with the user one. For
each host, it selects the first pattern without a wildcard and chooses
that to be the alias. If any future hosts are found to have the same
alias, they are skipped. Errors are raised if neither config file can be
opened or no aliases were found.
* improve logging and error reporting
Error reporting is now shortcircuited in cases of individual remotes in
order to allow the other remotes to continue. These errors are now
printed to logs instead.
* allow imports to edit ssh port
Previously, ssh ports could not be edited after the fact. Unfortunately,
this can cause problems since the port can be changed in an ssh config
file. To address this, we allow imports to change the port if a host
with the same canonical name had previously been imported.
* fix response to parse command
* fix error handline for alias parsing
Small mistake of checking for equality instead of inequality
* fix the ability to overwrite hostName with alias
if ssh_config does not find Hostname, it won't output an error. Now we
compare against the result instead of looking for an error.
* fix the error catching for User and Port
This fixes the same problem where parsing the config doesn't give an
error in the case when nothing is found. As before, this checks for a
blank result instead.
* remove unused code
* remove repeated canonical name check
The logic that checks for an existing canonical name already exists in
the AddRemote function, so it is not needed here.
Secondly, we now only allow edits of previously created remotes if they
have not been archived. If they have, the usual logic for creating a new
remote takes precedence.
Lastly, there is no need to archive a remote that has already been
archived so an additional check has been added.
* allow archives to preserve the SSHConfigSrc
* add log message for archiving of imported remotes
* create variables for string variants
Matches existing code style
* add cleanup for opened files
* move migration 25 to migration 26 (already merged a migration 25)
* fix RemoteRuntimeState in ModelUpdate by moving type to sstore.go. Fix some bugs in remote:parse. Fix key/identityfile, return value, and remote editing (should go through msh). remote sudo. add info messages around parse status
* fix issue with archiving the sshconfigsrc
A bug in RemoteType's FromMap caused the loss of sshconfigsrc during the
conversion. This has been corrected and the schema has been updated.
* fix order of archiving removed imported remotes
Previously, if the canonical name changed, the code would try to create
a new remote before archiving the old one. This did not work if the
alias didn't change. Now we archive first and add a new remote after.
* fix ability to change port when importing config
Importing from sshconfig needs to allow the port to change. This was not
happening because of a bug that has been corrected.
* always use host in place of hostname
Since host is the key actually searched for in the ssh config file,
searching for user@hostName may not actually work. To avoid this, we now
always use user@host instead.
* automatically determine ConnectMode
This aims to select a connection mode based off what is provided in the
ssh config file. It aims for auto connections when possible but will
fall back to manual if we can't easily support it
* remove sshkeysource migration number confilict
Previously had conflicting migration numbers of 26. The change not in
the main branch has been moved to 27 to remove the conflict.
* move sshkeysource migration to migration 28
* add WaveOptions flag parsing for ssh config
This is currently being used to allow users to force manual connect mode
if desired. It will also be used to force skipping options in the future
but that is not complete in this commit.
* implement ignore flag for ssh config parsing
The ignore flag will now archive an imported remote if it previously
existed and not create a new remote in its place.
* fix discovery of identity file
Previously, a ~ in the identity file's path was not expanded to the home
dir. Because of this, files with a ~ were previously identified as
invalid files. By expanding it during the search, this is no longer the
case.
* disable frontend edit button for imported remotes
Imported Remotes should not be editable in waveterm by users. This edit
makes it clear that the button will not work for those cases. Further
edits may be needed to explain why it doesn't work and what to do
instead.
* add backend rejection of updating imported remote
As before, we don't want manual editing of an imported remote inside the
app. This ensures that it can't happen on the backend.
* create tooltips for sshconfig edit/delete buttons
For remotes that are imported, edits are not allowed. This adds a
tooltip that explains what to do instead.
Deleting remotes that are imported is allowed, but they will come back
if the user imports again. The tooltip explains a way to avoid this.
* add logo after name for imported remotes
In the connections screen, there previously was not a way to tell
imported connections from manually created connections. This change adds
a logo after the imported ones to differentiate them.
* small formatting updates
* add import tooltip to connection modal
Added the logo for an imported config to the connection modal. It also
provides a short description when it the mouse hovers over it.
* add button to import ssh config
Make the command into a button for a simple gui interface.
Also ran prettier to clean up some syntax.
* remove strict casing on WaveOptions
WaveOptions was previously very specific about the casing of the ignore
and connectmode subcommands. With this update, the casing is
automatically converted to lowercase and can be ignored.
* add status dot before name in connections screen
* add space and tooltip to connection imported icon
* re-prettier
2023-12-28 20:09:41 +01:00
|
|
|
SSHConfigSrc: msh.Remote.SSHConfigSrc,
|
2022-09-22 08:26:24 +02:00
|
|
|
UName: msh.UName,
|
2022-09-27 08:23:04 +02:00
|
|
|
InstallStatus: msh.InstallStatus,
|
|
|
|
NeedsMShellUpgrade: msh.NeedsMShellUpgrade,
|
2022-10-04 20:45:24 +02:00
|
|
|
Local: msh.Remote.Local,
|
2023-04-03 10:37:36 +02:00
|
|
|
NoInitPk: msh.ErrNoInitPk,
|
|
|
|
AuthType: sstore.RemoteAuthTypeNone,
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
ShellPref: msh.Remote.ShellPref,
|
|
|
|
DefaultShellType: shellPref,
|
2023-04-03 10:37:36 +02:00
|
|
|
}
|
|
|
|
if msh.Remote.SSHOpts != nil {
|
|
|
|
state.AuthType = msh.Remote.SSHOpts.GetAuthType()
|
2022-09-04 22:51:49 +02:00
|
|
|
}
|
2022-12-29 09:07:16 +01:00
|
|
|
if msh.Remote.RemoteOpts != nil {
|
|
|
|
optsCopy := *msh.Remote.RemoteOpts
|
|
|
|
state.RemoteOpts = &optsCopy
|
|
|
|
}
|
2022-09-04 22:51:49 +02:00
|
|
|
if msh.Err != nil {
|
|
|
|
state.ErrorStr = msh.Err.Error()
|
|
|
|
}
|
2022-09-27 08:23:04 +02:00
|
|
|
if msh.InstallErr != nil {
|
|
|
|
state.InstallErrorStr = msh.InstallErr.Error()
|
|
|
|
}
|
2022-10-01 02:22:28 +02:00
|
|
|
if msh.Status == StatusConnecting {
|
|
|
|
state.WaitingForPassword = msh.isWaitingForPassword_nolock()
|
2023-04-04 03:57:38 +02:00
|
|
|
if msh.MakeClientDeadline != nil {
|
2024-02-29 20:37:03 +01:00
|
|
|
state.ConnectTimeout = int(time.Until(*msh.MakeClientDeadline) / time.Second)
|
2023-04-04 03:57:38 +02:00
|
|
|
if state.ConnectTimeout < 0 {
|
|
|
|
state.ConnectTimeout = 0
|
|
|
|
}
|
2024-02-16 00:58:50 +01:00
|
|
|
state.CountdownActive = true
|
|
|
|
} else {
|
|
|
|
state.CountdownActive = false
|
2023-04-04 03:57:38 +02:00
|
|
|
}
|
2022-10-01 02:22:28 +02:00
|
|
|
}
|
2023-03-29 21:42:04 +02:00
|
|
|
vars := msh.Remote.StateVars
|
|
|
|
if vars == nil {
|
|
|
|
vars = make(map[string]string)
|
|
|
|
}
|
2022-09-04 22:51:49 +02:00
|
|
|
vars["user"] = msh.Remote.RemoteUser
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["bestuser"] = vars["user"]
|
2022-09-04 22:51:49 +02:00
|
|
|
vars["host"] = msh.Remote.RemoteHost
|
|
|
|
vars["shorthost"] = makeShortHost(msh.Remote.RemoteHost)
|
|
|
|
vars["alias"] = msh.Remote.RemoteAlias
|
|
|
|
vars["cname"] = msh.Remote.RemoteCanonicalName
|
|
|
|
vars["remoteid"] = msh.Remote.RemoteId
|
|
|
|
vars["status"] = msh.Status
|
|
|
|
vars["type"] = msh.Remote.RemoteType
|
2023-05-02 21:43:54 +02:00
|
|
|
if msh.Remote.IsSudo() {
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["sudo"] = "1"
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
if msh.Remote.Local {
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["local"] = "1"
|
|
|
|
}
|
2022-10-03 21:25:43 +02:00
|
|
|
vars["port"] = "22"
|
2022-10-04 04:04:48 +02:00
|
|
|
if msh.Remote.SSHOpts != nil {
|
|
|
|
if msh.Remote.SSHOpts.SSHPort != 0 {
|
|
|
|
vars["port"] = strconv.Itoa(msh.Remote.SSHOpts.SSHPort)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if msh.Remote.RemoteOpts != nil && msh.Remote.RemoteOpts.Color != "" {
|
|
|
|
vars["color"] = msh.Remote.RemoteOpts.Color
|
2022-10-03 21:25:43 +02:00
|
|
|
}
|
2022-09-04 22:51:49 +02:00
|
|
|
if msh.ServerProc != nil && msh.ServerProc.InitPk != nil {
|
2023-04-13 06:42:16 +02:00
|
|
|
initPk := msh.ServerProc.InitPk
|
|
|
|
if initPk.BuildTime == "" || initPk.BuildTime == "0" {
|
|
|
|
state.MShellVersion = initPk.Version
|
|
|
|
} else {
|
|
|
|
state.MShellVersion = fmt.Sprintf("%s+%s", initPk.Version, initPk.BuildTime)
|
|
|
|
}
|
|
|
|
vars["home"] = initPk.HomeDir
|
|
|
|
vars["remoteuser"] = initPk.User
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["bestuser"] = vars["remoteuser"]
|
2023-04-13 06:42:16 +02:00
|
|
|
vars["remotehost"] = initPk.HostName
|
|
|
|
vars["remoteshorthost"] = makeShortHost(initPk.HostName)
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["besthost"] = vars["remotehost"]
|
|
|
|
vars["bestshorthost"] = vars["remoteshorthost"]
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
_, curState := msh.StateMap.GetCurrentState(shellPref)
|
2022-11-28 09:13:00 +01:00
|
|
|
if curState != nil {
|
|
|
|
state.DefaultFeState = sstore.FeStateFromShellState(curState)
|
|
|
|
vars["cwd"] = curState.Cwd
|
|
|
|
}
|
2023-05-02 21:43:54 +02:00
|
|
|
if msh.Remote.Local && msh.Remote.IsSudo() {
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["bestuser"] = "sudo"
|
2023-05-02 21:43:54 +02:00
|
|
|
} else if msh.Remote.IsSudo() {
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["bestuser"] = "sudo@" + vars["bestuser"]
|
|
|
|
}
|
2022-10-04 20:45:24 +02:00
|
|
|
if msh.Remote.Local {
|
2022-08-24 11:14:16 +02:00
|
|
|
vars["bestname"] = vars["bestuser"] + "@local"
|
|
|
|
vars["bestshortname"] = vars["bestuser"] + "@local"
|
|
|
|
} else {
|
|
|
|
vars["bestname"] = vars["bestuser"] + "@" + vars["besthost"]
|
|
|
|
vars["bestshortname"] = vars["bestuser"] + "@" + vars["bestshorthost"]
|
2022-08-23 23:01:52 +02:00
|
|
|
}
|
2023-05-09 01:06:51 +02:00
|
|
|
if vars["remoteuser"] == "root" || vars["sudo"] == "1" {
|
|
|
|
vars["isroot"] = "1"
|
|
|
|
}
|
2024-02-08 21:37:23 +01:00
|
|
|
varsCopy := make(map[string]string)
|
|
|
|
// deep copy so that concurrent calls don't collide on this data
|
|
|
|
for key, value := range vars {
|
|
|
|
varsCopy[key] = value
|
|
|
|
}
|
|
|
|
state.RemoteVars = varsCopy
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
state.ActiveShells = msh.StateMap.GetShells()
|
2022-08-23 23:01:52 +02:00
|
|
|
return state
|
|
|
|
}
|
|
|
|
|
2022-09-05 23:49:23 +02:00
|
|
|
func (msh *MShellProc) NotifyRemoteUpdate() {
|
2022-08-30 01:31:06 +02:00
|
|
|
rstate := msh.GetRemoteRuntimeState()
|
2024-02-16 01:45:47 +01:00
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
update.AddUpdate(rstate)
|
|
|
|
scbus.MainUpdateBus.DoUpdate(update)
|
2022-08-26 22:12:17 +02:00
|
|
|
}
|
|
|
|
|
2024-02-10 02:19:44 +01:00
|
|
|
func GetAllRemoteRuntimeState() []*RemoteRuntimeState {
|
2022-07-05 07:18:01 +02:00
|
|
|
GlobalStore.Lock.Lock()
|
|
|
|
defer GlobalStore.Lock.Unlock()
|
|
|
|
|
2024-02-10 02:19:44 +01:00
|
|
|
var rtn []*RemoteRuntimeState
|
2022-07-05 07:18:01 +02:00
|
|
|
for _, proc := range GlobalStore.Map {
|
2022-08-30 01:31:06 +02:00
|
|
|
state := proc.GetRemoteRuntimeState()
|
2024-02-10 02:19:44 +01:00
|
|
|
rtn = append(rtn, &state)
|
2022-07-05 07:18:01 +02:00
|
|
|
}
|
|
|
|
return rtn
|
|
|
|
}
|
|
|
|
|
2022-07-02 02:38:36 +02:00
|
|
|
func MakeMShell(r *sstore.RemoteType) *MShellProc {
|
2022-09-15 08:10:35 +02:00
|
|
|
buf, err := circbuf.NewBuffer(CircBufSize)
|
|
|
|
if err != nil {
|
|
|
|
panic(err) // this should never happen (NewBuffer only returns an error if CirBufSize <= 0)
|
|
|
|
}
|
|
|
|
rtn := &MShellProc{
|
2022-10-28 07:00:10 +02:00
|
|
|
Lock: &sync.Mutex{},
|
|
|
|
Remote: r,
|
2022-10-28 07:22:17 +02:00
|
|
|
RemoteId: r.RemoteId,
|
2022-10-28 07:00:10 +02:00
|
|
|
Status: StatusDisconnected,
|
|
|
|
PtyBuffer: buf,
|
|
|
|
InstallStatus: StatusDisconnected,
|
2024-03-14 02:52:41 +01:00
|
|
|
RunningCmds: make(map[base.CommandKey]*RunCmdType),
|
2023-11-10 02:47:24 +01:00
|
|
|
PendingStateCmds: make(map[pendingStateKey]base.CommandKey),
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
StateMap: server.MakeShellStateMap(),
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
launcher: LegacyLauncher{}, // for conditional launch method based on ssh library in use. remove once ssh library is stabilized
|
2024-01-27 01:25:21 +01:00
|
|
|
DataPosMap: utilfn.MakeSyncMap[base.CommandKey, int64](),
|
2022-09-15 08:10:35 +02:00
|
|
|
}
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
// for conditional launch method based on ssh library in use
|
|
|
|
// remove once ssh library is stabilized
|
|
|
|
if UseSshLibrary {
|
|
|
|
rtn.launcher = NewLauncher{}
|
|
|
|
}
|
|
|
|
|
2023-04-04 06:31:40 +02:00
|
|
|
rtn.WriteToPtyBuffer("console for connection [%s]\n", r.GetName())
|
2022-07-02 02:38:36 +02:00
|
|
|
return rtn
|
2022-07-01 23:57:42 +02:00
|
|
|
}
|
|
|
|
|
2022-09-16 02:09:04 +02:00
|
|
|
func SendRemoteInput(pk *scpacket.RemoteInputPacketType) error {
|
|
|
|
data, err := base64.StdEncoding.DecodeString(pk.InputData64)
|
|
|
|
if err != nil {
|
2024-02-29 20:37:03 +01:00
|
|
|
return fmt.Errorf("cannot decode base64: %v", err)
|
2022-09-16 02:09:04 +02:00
|
|
|
}
|
|
|
|
msh := GetRemoteById(pk.RemoteId)
|
|
|
|
if msh == nil {
|
|
|
|
return fmt.Errorf("remote not found")
|
|
|
|
}
|
|
|
|
var cmdPty *os.File
|
|
|
|
msh.WithLock(func() {
|
|
|
|
cmdPty = msh.ControllingPty
|
|
|
|
})
|
|
|
|
if cmdPty == nil {
|
|
|
|
return fmt.Errorf("remote has no attached pty")
|
|
|
|
}
|
|
|
|
_, err = cmdPty.Write(data)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("writing to pty: %v", err)
|
|
|
|
}
|
2023-04-04 03:57:38 +02:00
|
|
|
msh.resetClientDeadline()
|
2022-09-16 02:09:04 +02:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-04-04 03:57:38 +02:00
|
|
|
func (msh *MShellProc) getClientDeadline() *time.Time {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.MakeClientDeadline
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) resetClientDeadline() {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
if msh.Status != StatusConnecting {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
deadline := msh.MakeClientDeadline
|
|
|
|
if deadline == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
newDeadline := time.Now().Add(RemoteConnectTimeout)
|
|
|
|
msh.MakeClientDeadline = &newDeadline
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) watchClientDeadlineTime() {
|
|
|
|
for {
|
|
|
|
time.Sleep(1 * time.Second)
|
|
|
|
status := msh.GetStatus()
|
|
|
|
if status != StatusConnecting {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
deadline := msh.getClientDeadline()
|
|
|
|
if deadline == nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if time.Now().After(*deadline) {
|
|
|
|
msh.Disconnect(false)
|
|
|
|
break
|
|
|
|
}
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-17 21:24:09 +02:00
|
|
|
func convertSSHOpts(opts *sstore.SSHOpts) shexec.SSHOpts {
|
2022-08-24 11:14:16 +02:00
|
|
|
if opts == nil || opts.Local {
|
|
|
|
opts = &sstore.SSHOpts{}
|
2022-08-17 21:24:09 +02:00
|
|
|
}
|
|
|
|
return shexec.SSHOpts{
|
|
|
|
SSHHost: opts.SSHHost,
|
|
|
|
SSHOptsStr: opts.SSHOptsStr,
|
|
|
|
SSHIdentity: opts.SSHIdentity,
|
|
|
|
SSHUser: opts.SSHUser,
|
2023-03-17 23:07:29 +01:00
|
|
|
SSHPort: opts.SSHPort,
|
2022-08-17 21:24:09 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-25 07:57:41 +02:00
|
|
|
func (msh *MShellProc) addControllingTty(ecmd *exec.Cmd) (*os.File, error) {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
|
2022-08-19 22:23:00 +02:00
|
|
|
cmdPty, cmdTty, err := pty.Open()
|
|
|
|
if err != nil {
|
2022-08-25 07:57:41 +02:00
|
|
|
return nil, err
|
2022-08-19 22:23:00 +02:00
|
|
|
}
|
2022-09-15 09:17:23 +02:00
|
|
|
pty.Setsize(cmdPty, &pty.Winsize{Rows: RemoteTermRows, Cols: RemoteTermCols})
|
2022-08-19 22:23:00 +02:00
|
|
|
msh.ControllingPty = cmdPty
|
|
|
|
ecmd.ExtraFiles = append(ecmd.ExtraFiles, cmdTty)
|
|
|
|
if ecmd.SysProcAttr == nil {
|
|
|
|
ecmd.SysProcAttr = &syscall.SysProcAttr{}
|
|
|
|
}
|
|
|
|
ecmd.SysProcAttr.Setsid = true
|
|
|
|
ecmd.SysProcAttr.Setctty = true
|
|
|
|
ecmd.SysProcAttr.Ctty = len(ecmd.ExtraFiles) + 3 - 1
|
2022-08-25 07:57:41 +02:00
|
|
|
return cmdPty, nil
|
2022-08-19 22:23:00 +02:00
|
|
|
}
|
|
|
|
|
2022-08-25 07:57:41 +02:00
|
|
|
func (msh *MShellProc) setErrorStatus(err error) {
|
2022-07-02 02:38:36 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2022-08-25 07:57:41 +02:00
|
|
|
msh.Status = StatusError
|
|
|
|
msh.Err = err
|
2022-09-05 23:49:23 +02:00
|
|
|
go msh.NotifyRemoteUpdate()
|
2022-08-25 07:57:41 +02:00
|
|
|
}
|
|
|
|
|
2022-09-27 06:09:43 +02:00
|
|
|
func (msh *MShellProc) setInstallErrorStatus(err error) {
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", err.Error())
|
2022-09-27 06:09:43 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
msh.InstallStatus = StatusError
|
|
|
|
msh.InstallErr = err
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
}
|
|
|
|
|
2022-09-14 21:56:05 +02:00
|
|
|
func (msh *MShellProc) GetRemoteCopy() sstore.RemoteType {
|
2022-08-25 07:57:41 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return *msh.Remote
|
|
|
|
}
|
2022-07-02 02:38:36 +02:00
|
|
|
|
2022-09-22 08:26:24 +02:00
|
|
|
func (msh *MShellProc) GetUName() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.UName
|
|
|
|
}
|
|
|
|
|
2022-09-01 21:47:10 +02:00
|
|
|
func (msh *MShellProc) GetNumRunningCommands() int {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return len(msh.RunningCmds)
|
|
|
|
}
|
|
|
|
|
2022-10-03 03:52:55 +02:00
|
|
|
func (msh *MShellProc) UpdateRemote(ctx context.Context, editMap map[string]interface{}) error {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
updatedRemote, err := sstore.UpdateRemote(ctx, msh.Remote.RemoteId, editMap)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if updatedRemote == nil {
|
|
|
|
return fmt.Errorf("no remote returned from UpdateRemote")
|
|
|
|
}
|
|
|
|
msh.Remote = updatedRemote
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-09-27 08:23:04 +02:00
|
|
|
func (msh *MShellProc) Disconnect(force bool) {
|
|
|
|
status := msh.GetStatus()
|
|
|
|
if status != StatusConnected && status != StatusConnecting {
|
|
|
|
msh.WriteToPtyBuffer("remote already disconnected (no action taken)\n")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
numCommands := msh.GetNumRunningCommands()
|
|
|
|
if numCommands > 0 && !force {
|
|
|
|
msh.WriteToPtyBuffer("remote not disconnected, has %d running commands. use force=1 to force disconnection\n", numCommands)
|
|
|
|
return
|
|
|
|
}
|
2022-09-01 21:47:10 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2022-09-14 02:11:36 +02:00
|
|
|
if msh.ServerProc != nil {
|
|
|
|
msh.ServerProc.Close()
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.Client = nil
|
2022-09-14 02:11:36 +02:00
|
|
|
}
|
2022-09-16 21:28:09 +02:00
|
|
|
if msh.MakeClientCancelFn != nil {
|
|
|
|
msh.MakeClientCancelFn()
|
|
|
|
msh.MakeClientCancelFn = nil
|
|
|
|
}
|
2022-09-01 21:47:10 +02:00
|
|
|
}
|
|
|
|
|
2022-09-27 08:23:04 +02:00
|
|
|
func (msh *MShellProc) CancelInstall() {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
if msh.InstallCancelFn != nil {
|
|
|
|
msh.InstallCancelFn()
|
|
|
|
msh.InstallCancelFn = nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-06 21:58:16 +02:00
|
|
|
func (msh *MShellProc) GetRemoteName() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.Remote.GetName()
|
|
|
|
}
|
|
|
|
|
2022-09-15 08:10:35 +02:00
|
|
|
func (msh *MShellProc) WriteToPtyBuffer(strFmt string, args ...interface{}) {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
msh.writeToPtyBuffer_nolock(strFmt, args...)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) writeToPtyBuffer_nolock(strFmt string, args ...interface{}) {
|
|
|
|
// inefficient string manipulation here and read of PtyBuffer, but these messages are rare, nbd
|
|
|
|
realStr := fmt.Sprintf(strFmt, args...)
|
|
|
|
if !strings.HasPrefix(realStr, "~") {
|
|
|
|
realStr = strings.ReplaceAll(realStr, "\n", "\r\n")
|
|
|
|
if !strings.HasSuffix(realStr, "\r\n") {
|
|
|
|
realStr = realStr + "\r\n"
|
|
|
|
}
|
2022-09-15 09:37:17 +02:00
|
|
|
if strings.HasPrefix(realStr, "*") {
|
2022-12-20 02:36:19 +01:00
|
|
|
realStr = "\033[0m\033[31mprompt>\033[0m " + realStr[1:]
|
2022-09-15 09:37:17 +02:00
|
|
|
} else {
|
2022-12-20 02:36:19 +01:00
|
|
|
realStr = "\033[0m\033[32mprompt>\033[0m " + realStr
|
2022-09-15 09:37:17 +02:00
|
|
|
}
|
2022-09-15 08:10:35 +02:00
|
|
|
barr := msh.PtyBuffer.Bytes()
|
|
|
|
if len(barr) > 0 && barr[len(barr)-1] != '\n' {
|
|
|
|
realStr = "\r\n" + realStr
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
realStr = realStr[1:]
|
|
|
|
}
|
2022-09-15 09:17:23 +02:00
|
|
|
curOffset := msh.PtyBuffer.TotalWritten()
|
|
|
|
data := []byte(realStr)
|
|
|
|
msh.PtyBuffer.Write(data)
|
|
|
|
sendRemotePtyUpdate(msh.Remote.RemoteId, curOffset, data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func sendRemotePtyUpdate(remoteId string, dataOffset int64, data []byte) {
|
|
|
|
data64 := base64.StdEncoding.EncodeToString(data)
|
2024-02-16 01:45:47 +01:00
|
|
|
update := scbus.MakePtyDataUpdate(&scbus.PtyDataUpdate{
|
2022-09-15 09:17:23 +02:00
|
|
|
RemoteId: remoteId,
|
|
|
|
PtyPos: dataOffset,
|
|
|
|
PtyData64: data64,
|
|
|
|
PtyDataLen: int64(len(data)),
|
2024-02-16 01:45:47 +01:00
|
|
|
})
|
|
|
|
scbus.MainUpdateBus.DoUpdate(update)
|
2022-09-15 08:10:35 +02:00
|
|
|
}
|
|
|
|
|
2022-10-01 02:22:28 +02:00
|
|
|
func (msh *MShellProc) isWaitingForPassword_nolock() bool {
|
|
|
|
barr := msh.PtyBuffer.Bytes()
|
|
|
|
if len(barr) == 0 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
nlIdx := bytes.LastIndex(barr, []byte{'\n'})
|
|
|
|
var lastLine string
|
|
|
|
if nlIdx == -1 {
|
|
|
|
lastLine = string(barr)
|
|
|
|
} else {
|
|
|
|
lastLine = string(barr[nlIdx+1:])
|
|
|
|
}
|
|
|
|
pwIdx := strings.Index(lastLine, "assword")
|
|
|
|
return pwIdx != -1
|
|
|
|
}
|
|
|
|
|
2023-12-12 23:17:53 +01:00
|
|
|
func (msh *MShellProc) isWaitingForPassphrase_nolock() bool {
|
|
|
|
barr := msh.PtyBuffer.Bytes()
|
|
|
|
if len(barr) == 0 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
nlIdx := bytes.LastIndex(barr, []byte{'\n'})
|
|
|
|
var lastLine string
|
|
|
|
if nlIdx == -1 {
|
|
|
|
lastLine = string(barr)
|
|
|
|
} else {
|
|
|
|
lastLine = string(barr[nlIdx+1:])
|
|
|
|
}
|
|
|
|
pwIdx := strings.Index(lastLine, "Enter passphrase for key")
|
|
|
|
return pwIdx != -1
|
|
|
|
}
|
|
|
|
|
2024-02-29 20:37:03 +01:00
|
|
|
func (msh *MShellProc) RunPasswordReadLoop(cmdPty *os.File) {
|
|
|
|
buf := make([]byte, PtyReadBufSize)
|
|
|
|
for {
|
|
|
|
_, readErr := cmdPty.Read(buf)
|
|
|
|
if readErr == io.EOF {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if readErr != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error reading from controlling-pty: %v\n", readErr)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var newIsWaiting bool
|
|
|
|
msh.WithLock(func() {
|
|
|
|
newIsWaiting = msh.isWaitingForPassword_nolock()
|
|
|
|
})
|
|
|
|
if newIsWaiting {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
request := &userinput.UserInputRequestType{
|
|
|
|
QueryText: "Please enter your password",
|
|
|
|
ResponseType: "text",
|
|
|
|
Title: "Sudo Password",
|
|
|
|
Markdown: false,
|
|
|
|
}
|
|
|
|
ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
|
|
|
|
defer cancelFn()
|
|
|
|
response, err := userinput.GetUserInput(ctx, scbus.MainRpcBus, request)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error timed out waiting for password: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.WithLock(func() {
|
|
|
|
curOffset := msh.PtyBuffer.TotalWritten()
|
|
|
|
msh.PtyBuffer.Write([]byte(response.Text))
|
|
|
|
sendRemotePtyUpdate(msh.Remote.RemoteId, curOffset, []byte(response.Text))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-09-16 02:44:39 +02:00
|
|
|
func (msh *MShellProc) RunPtyReadLoop(cmdPty *os.File) {
|
|
|
|
buf := make([]byte, PtyReadBufSize)
|
2022-10-01 02:22:28 +02:00
|
|
|
var isWaiting bool
|
2022-09-16 02:44:39 +02:00
|
|
|
for {
|
|
|
|
n, readErr := cmdPty.Read(buf)
|
|
|
|
if readErr == io.EOF {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if readErr != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error reading from controlling-pty: %v\n", readErr)
|
|
|
|
break
|
|
|
|
}
|
2022-10-01 02:22:28 +02:00
|
|
|
var newIsWaiting bool
|
2022-09-16 02:44:39 +02:00
|
|
|
msh.WithLock(func() {
|
|
|
|
curOffset := msh.PtyBuffer.TotalWritten()
|
|
|
|
msh.PtyBuffer.Write(buf[0:n])
|
|
|
|
sendRemotePtyUpdate(msh.Remote.RemoteId, curOffset, buf[0:n])
|
2022-10-01 02:22:28 +02:00
|
|
|
newIsWaiting = msh.isWaitingForPassword_nolock()
|
2022-09-16 02:44:39 +02:00
|
|
|
})
|
2022-10-01 02:22:28 +02:00
|
|
|
if newIsWaiting != isWaiting {
|
|
|
|
isWaiting = newIsWaiting
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-29 20:37:03 +01:00
|
|
|
func (msh *MShellProc) CheckPasswordRequested(ctx context.Context, requiresPassword chan bool) {
|
|
|
|
for {
|
|
|
|
msh.WithLock(func() {
|
|
|
|
if msh.isWaitingForPassword_nolock() {
|
|
|
|
select {
|
|
|
|
case requiresPassword <- true:
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if msh.Status != StatusConnecting {
|
|
|
|
select {
|
|
|
|
case requiresPassword <- false:
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
})
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
return
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) SendPassword(pw string) {
|
|
|
|
msh.WithLock(func() {
|
|
|
|
if msh.ControllingPty == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
pwBytes := []byte(pw + "\r")
|
|
|
|
msh.writeToPtyBuffer_nolock("~[sent password]\r\n")
|
|
|
|
_, err := msh.ControllingPty.Write(pwBytes)
|
|
|
|
if err != nil {
|
|
|
|
msh.writeToPtyBuffer_nolock("*cannot write password to controlling pty: %v\n", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) WaitAndSendPasswordNew(pw string) {
|
|
|
|
requiresPassword := make(chan bool, 1)
|
|
|
|
ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
|
|
|
|
defer cancelFn()
|
|
|
|
go msh.CheckPasswordRequested(ctx, requiresPassword)
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
err := ctx.Err()
|
|
|
|
var errMsg error
|
|
|
|
if err == context.Canceled {
|
|
|
|
errMsg = fmt.Errorf("canceled by the user")
|
|
|
|
} else {
|
|
|
|
errMsg = fmt.Errorf("timed out waiting for password prompt")
|
|
|
|
}
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg.Error())
|
|
|
|
msh.setErrorStatus(errMsg)
|
|
|
|
return
|
|
|
|
case required := <-requiresPassword:
|
|
|
|
if !required {
|
|
|
|
// we don't need user input in this case, so we exit early
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
request := &userinput.UserInputRequestType{
|
|
|
|
QueryText: "Please enter your password",
|
|
|
|
ResponseType: "text",
|
|
|
|
Title: "Sudo Password",
|
|
|
|
Markdown: false,
|
|
|
|
}
|
|
|
|
response, err := userinput.GetUserInput(ctx, scbus.MainRpcBus, request)
|
|
|
|
if err != nil {
|
|
|
|
var errMsg error
|
|
|
|
if err == context.Canceled {
|
|
|
|
errMsg = fmt.Errorf("canceled by the user")
|
|
|
|
} else {
|
|
|
|
errMsg = fmt.Errorf("timed out waiting for user input")
|
|
|
|
}
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg.Error())
|
|
|
|
msh.setErrorStatus(errMsg)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.SendPassword(response.Text)
|
|
|
|
|
|
|
|
//error out if requested again
|
|
|
|
go msh.CheckPasswordRequested(ctx, requiresPassword)
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
err := ctx.Err()
|
|
|
|
var errMsg error
|
|
|
|
if err == context.Canceled {
|
|
|
|
errMsg = fmt.Errorf("canceled by the user")
|
|
|
|
} else {
|
|
|
|
errMsg = fmt.Errorf("timed out waiting for password prompt")
|
|
|
|
}
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg.Error())
|
|
|
|
msh.setErrorStatus(errMsg)
|
|
|
|
return
|
|
|
|
case required := <-requiresPassword:
|
|
|
|
if !required {
|
|
|
|
// we don't need user input in this case, so we exit early
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
errMsg := fmt.Errorf("*error, incorrect password")
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg.Error())
|
|
|
|
msh.setErrorStatus(errMsg)
|
|
|
|
}
|
|
|
|
|
2022-10-01 02:22:28 +02:00
|
|
|
func (msh *MShellProc) WaitAndSendPassword(pw string) {
|
|
|
|
var numWaits int
|
|
|
|
for {
|
|
|
|
var isWaiting bool
|
|
|
|
var isConnecting bool
|
|
|
|
msh.WithLock(func() {
|
2023-12-12 23:17:53 +01:00
|
|
|
if msh.Remote.SSHOpts.GetAuthType() == sstore.RemoteAuthTypeKeyPassword {
|
|
|
|
isWaiting = msh.isWaitingForPassphrase_nolock()
|
|
|
|
} else {
|
|
|
|
isWaiting = msh.isWaitingForPassword_nolock()
|
|
|
|
}
|
2022-10-01 02:22:28 +02:00
|
|
|
isConnecting = msh.Status == StatusConnecting
|
|
|
|
})
|
|
|
|
if !isConnecting {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if !isWaiting {
|
|
|
|
numWaits = 0
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
numWaits++
|
|
|
|
if numWaits < 10 {
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
} else {
|
|
|
|
// send password
|
|
|
|
msh.WithLock(func() {
|
|
|
|
if msh.ControllingPty == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
pwBytes := []byte(pw + "\r")
|
|
|
|
msh.writeToPtyBuffer_nolock("~[sent password]\r\n")
|
|
|
|
_, err := msh.ControllingPty.Write(pwBytes)
|
|
|
|
if err != nil {
|
|
|
|
msh.writeToPtyBuffer_nolock("*cannot write password to controlling pty: %v\n", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
break
|
|
|
|
}
|
2022-09-16 02:44:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-04 20:56:20 +01:00
|
|
|
func (msh *MShellProc) RunInstall(autoInstall bool) {
|
2022-09-27 06:09:43 +02:00
|
|
|
remoteCopy := msh.GetRemoteCopy()
|
|
|
|
if remoteCopy.Archived {
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.WriteToPtyBuffer("*error: cannot install on archived remote\n")
|
|
|
|
return
|
|
|
|
}
|
2024-03-08 07:37:00 +01:00
|
|
|
|
|
|
|
var makeClientCtx context.Context
|
|
|
|
var makeClientCancelFn context.CancelFunc
|
|
|
|
msh.WithLock(func() {
|
|
|
|
makeClientCtx, makeClientCancelFn = context.WithCancel(context.Background())
|
|
|
|
msh.MakeClientCancelFn = makeClientCancelFn
|
|
|
|
msh.MakeClientDeadline = nil
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
defer makeClientCancelFn()
|
|
|
|
clientData, err := sstore.EnsureClientData(makeClientCtx)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error: cannot obtain client data: %v", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
hideShellPrompt := clientData.ClientOpts.ConfirmFlags["hideshellprompt"]
|
|
|
|
baseStatus := msh.GetStatus()
|
|
|
|
|
|
|
|
if baseStatus == StatusConnected {
|
|
|
|
ctx, cancelFn := context.WithTimeout(makeClientCtx, 60*time.Second)
|
|
|
|
defer cancelFn()
|
|
|
|
request := &userinput.UserInputRequestType{
|
|
|
|
ResponseType: "confirm",
|
|
|
|
QueryText: "Waveshell is running on your connection and must be restarted to re-install. Would you like to continue?",
|
|
|
|
Title: "Restart Waveshell",
|
|
|
|
}
|
|
|
|
response, err := userinput.GetUserInput(ctx, scbus.MainRpcBus, request)
|
|
|
|
if err != nil {
|
|
|
|
if err == context.Canceled {
|
|
|
|
msh.WriteToPtyBuffer("installation canceled by user\n")
|
|
|
|
} else {
|
|
|
|
msh.WriteToPtyBuffer("timed out waiting for user input\n")
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !response.Confirm {
|
|
|
|
msh.WriteToPtyBuffer("installation canceled by user\n")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
} else if !hideShellPrompt {
|
|
|
|
ctx, cancelFn := context.WithTimeout(makeClientCtx, 60*time.Second)
|
|
|
|
defer cancelFn()
|
2024-03-04 20:56:20 +01:00
|
|
|
request := &userinput.UserInputRequestType{
|
|
|
|
ResponseType: "confirm",
|
|
|
|
QueryText: "Waveshell must be reinstalled on the connection to continue. Would you like to install it?",
|
|
|
|
Title: "Install Waveshell",
|
2024-03-08 07:37:00 +01:00
|
|
|
CheckBoxMsg: "Don't show me this again",
|
2024-03-04 20:56:20 +01:00
|
|
|
}
|
|
|
|
response, err := userinput.GetUserInput(ctx, scbus.MainRpcBus, request)
|
|
|
|
if err != nil {
|
|
|
|
var errMsg error
|
|
|
|
if err == context.Canceled {
|
|
|
|
errMsg = fmt.Errorf("installation canceled by user")
|
|
|
|
} else {
|
|
|
|
errMsg = fmt.Errorf("timed out waiting for user input")
|
|
|
|
}
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = nil
|
|
|
|
})
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg)
|
|
|
|
msh.setErrorStatus(errMsg)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !response.Confirm {
|
|
|
|
errMsg := fmt.Errorf("installation canceled by user")
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", errMsg.Error())
|
|
|
|
msh.setErrorStatus(err)
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = nil
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
2024-03-08 07:37:00 +01:00
|
|
|
if response.CheckboxStat {
|
|
|
|
clientData.ClientOpts.ConfirmFlags["hideshellprompt"] = true
|
|
|
|
err = sstore.SetClientOpts(makeClientCtx, clientData.ClientOpts)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", err)
|
|
|
|
msh.setErrorStatus(err)
|
|
|
|
return
|
2024-03-04 20:56:20 +01:00
|
|
|
}
|
2024-03-08 07:37:00 +01:00
|
|
|
|
|
|
|
//reload updated clientdata before sending
|
|
|
|
clientData, err = sstore.EnsureClientData(makeClientCtx)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", err)
|
|
|
|
msh.setErrorStatus(err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
update.AddUpdate(*clientData)
|
2024-03-04 20:56:20 +01:00
|
|
|
}
|
2022-09-27 06:09:43 +02:00
|
|
|
}
|
|
|
|
curStatus := msh.GetInstallStatus()
|
|
|
|
if curStatus == StatusConnecting {
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.WriteToPtyBuffer("*error: cannot install on remote that is already trying to install, cancel current install to try again\n")
|
2022-09-27 06:09:43 +02:00
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
if remoteCopy.Local {
|
|
|
|
msh.WriteToPtyBuffer("*error: cannot install on a local remote\n")
|
|
|
|
return
|
|
|
|
}
|
2024-03-08 07:37:00 +01:00
|
|
|
_, err = shellapi.MakeShellApi(packet.ShellType_bash)
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
if msh.Client == nil {
|
2024-03-04 20:56:20 +01:00
|
|
|
remoteDisplayName := fmt.Sprintf("%s [%s]", remoteCopy.RemoteAlias, remoteCopy.RemoteCanonicalName)
|
2024-03-08 07:37:00 +01:00
|
|
|
client, err := ConnectToClient(makeClientCtx, remoteCopy.SSHOpts, remoteDisplayName)
|
2024-02-29 20:37:03 +01:00
|
|
|
if err != nil {
|
|
|
|
statusErr := fmt.Errorf("ssh cannot connect to client: %w", err)
|
|
|
|
msh.setInstallErrorStatus(statusErr)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = client
|
|
|
|
})
|
|
|
|
}
|
|
|
|
session, err := msh.Client.NewSession()
|
2022-09-27 06:09:43 +02:00
|
|
|
if err != nil {
|
2024-02-29 20:37:03 +01:00
|
|
|
statusErr := fmt.Errorf("ssh cannot connect to client: %w", err)
|
2022-09-27 06:09:43 +02:00
|
|
|
msh.setInstallErrorStatus(statusErr)
|
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
installSession := shexec.SessionWrap{Session: session, StartCmd: shexec.MakeInstallCommandStr()}
|
|
|
|
msh.WriteToPtyBuffer("installing waveshell %s to %s...\n", scbase.MShellVersion, remoteCopy.RemoteCanonicalName)
|
2022-09-27 06:09:43 +02:00
|
|
|
clientCtx, clientCancelFn := context.WithCancel(context.Background())
|
|
|
|
defer clientCancelFn()
|
|
|
|
msh.WithLock(func() {
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.InstallErr = nil
|
2022-09-27 06:09:43 +02:00
|
|
|
msh.InstallStatus = StatusConnecting
|
|
|
|
msh.InstallCancelFn = clientCancelFn
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
msgFn := func(msg string) {
|
|
|
|
msh.WriteToPtyBuffer("%s", msg)
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
err = shexec.RunInstallFromCmd(clientCtx, installSession, true, nil, scbase.MShellBinaryReader, msgFn)
|
2022-09-27 08:23:04 +02:00
|
|
|
if err == context.Canceled {
|
|
|
|
msh.WriteToPtyBuffer("*install canceled\n")
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.InstallStatus = StatusDisconnected
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
2022-09-27 06:09:43 +02:00
|
|
|
if err != nil {
|
|
|
|
statusErr := fmt.Errorf("install failed: %w", err)
|
|
|
|
msh.setInstallErrorStatus(statusErr)
|
|
|
|
return
|
|
|
|
}
|
2023-04-04 07:15:43 +02:00
|
|
|
var connectMode string
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.InstallStatus = StatusDisconnected
|
|
|
|
msh.InstallCancelFn = nil
|
|
|
|
msh.NeedsMShellUpgrade = false
|
2023-04-04 03:57:38 +02:00
|
|
|
msh.Status = StatusDisconnected
|
|
|
|
msh.Err = nil
|
2023-04-04 07:15:43 +02:00
|
|
|
connectMode = msh.Remote.ConnectMode
|
2022-09-27 08:23:04 +02:00
|
|
|
})
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.WriteToPtyBuffer("successfully installed waveshell %s to ~/.mshell\n", scbase.MShellVersion)
|
2022-09-27 08:23:04 +02:00
|
|
|
go msh.NotifyRemoteUpdate()
|
2024-03-04 20:56:20 +01:00
|
|
|
if connectMode == sstore.ConnectModeStartup || connectMode == sstore.ConnectModeAuto || autoInstall {
|
|
|
|
// the install was successful, and we didn't click the install button with manual connect mode, try to connect
|
2023-04-04 07:15:43 +02:00
|
|
|
go msh.Launch(true)
|
|
|
|
}
|
2022-09-27 06:09:43 +02:00
|
|
|
}
|
|
|
|
|
2023-03-29 21:42:04 +02:00
|
|
|
func (msh *MShellProc) updateRemoteStateVars(ctx context.Context, remoteId string, initPk *packet.InitPacketType) {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
stateVars := getStateVarsFromInitPk(initPk)
|
|
|
|
if stateVars == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.Remote.StateVars = stateVars
|
|
|
|
err := sstore.UpdateRemoteStateVars(ctx, remoteId, stateVars)
|
|
|
|
if err != nil {
|
|
|
|
// ignore error, nothing to do
|
|
|
|
log.Printf("error updating remote statevars: %v\n", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func getStateVarsFromInitPk(initPk *packet.InitPacketType) map[string]string {
|
|
|
|
if initPk == nil || initPk.NotFound {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rtn := make(map[string]string)
|
|
|
|
rtn["home"] = initPk.HomeDir
|
|
|
|
rtn["remoteuser"] = initPk.User
|
|
|
|
rtn["remotehost"] = initPk.HostName
|
|
|
|
rtn["remoteuname"] = initPk.UName
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
rtn["shelltype"] = initPk.Shell
|
2023-03-29 21:42:04 +02:00
|
|
|
return rtn
|
|
|
|
}
|
|
|
|
|
2024-01-24 02:19:03 +01:00
|
|
|
func makeReinitErrorUpdate(shellType string) sstore.ActivityUpdate {
|
|
|
|
rtn := sstore.ActivityUpdate{}
|
|
|
|
if shellType == packet.ShellType_bash {
|
|
|
|
rtn.ReinitBashErrors = 1
|
|
|
|
} else if shellType == packet.ShellType_zsh {
|
|
|
|
rtn.ReinitZshErrors = 1
|
|
|
|
}
|
|
|
|
return rtn
|
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) ReInit(ctx context.Context, shellType string) (*packet.ShellStatePacketType, error) {
|
|
|
|
if !msh.IsConnected() {
|
|
|
|
return nil, fmt.Errorf("cannot reinit, remote is not connected")
|
|
|
|
}
|
|
|
|
if shellType != packet.ShellType_bash && shellType != packet.ShellType_zsh {
|
|
|
|
return nil, fmt.Errorf("invalid shell type %q", shellType)
|
|
|
|
}
|
2022-10-28 02:10:36 +02:00
|
|
|
reinitPk := packet.MakeReInitPacket()
|
|
|
|
reinitPk.ReqId = uuid.New().String()
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
reinitPk.ShellType = shellType
|
2022-10-28 02:10:36 +02:00
|
|
|
resp, err := msh.PacketRpcRaw(ctx, reinitPk)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
return nil, fmt.Errorf("no response")
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
ssPk, ok := resp.(*packet.ShellStatePacketType)
|
2022-10-28 02:10:36 +02:00
|
|
|
if !ok {
|
2024-01-24 02:19:03 +01:00
|
|
|
sstore.UpdateActivityWrap(ctx, makeReinitErrorUpdate(shellType), "reiniterror")
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
if respPk, ok := resp.(*packet.ResponsePacketType); ok && respPk.Error != "" {
|
|
|
|
return nil, fmt.Errorf("error reinitializing remote: %s", respPk.Error)
|
|
|
|
}
|
|
|
|
return nil, fmt.Errorf("invalid reinit response (not an shellstate packet): %T", resp)
|
2022-10-28 02:10:36 +02:00
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
if ssPk.State == nil {
|
2024-01-24 02:19:03 +01:00
|
|
|
sstore.UpdateActivityWrap(ctx, makeReinitErrorUpdate(shellType), "reiniterror")
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
return nil, fmt.Errorf("invalid reinit response shellstate packet does not contain remote state")
|
2022-10-28 07:52:38 +02:00
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
// TODO: maybe we don't need to save statebase here. should be possible to save it on demand
|
|
|
|
// when it is actually used. complication from other functions that try to get the statebase
|
|
|
|
// from the DB. probably need to route those through MShellProc.
|
|
|
|
err = sstore.StoreStateBase(ctx, ssPk.State)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("error storing remote state: %w", err)
|
|
|
|
}
|
|
|
|
msh.StateMap.SetCurrentState(ssPk.State.GetShellType(), ssPk.State)
|
|
|
|
msh.WriteToPtyBuffer("initialized shell:%s state:%s\n", shellType, ssPk.State.GetHashVal(false))
|
|
|
|
return ssPk, nil
|
2022-10-28 02:10:36 +02:00
|
|
|
}
|
|
|
|
|
2024-02-08 21:37:23 +01:00
|
|
|
func (msh *MShellProc) WriteFile(ctx context.Context, writePk *packet.WriteFilePacketType) (*packet.RpcResponseIter, error) {
|
|
|
|
return msh.PacketRpcIter(ctx, writePk)
|
|
|
|
}
|
|
|
|
|
2023-09-01 07:04:31 +02:00
|
|
|
func (msh *MShellProc) StreamFile(ctx context.Context, streamPk *packet.StreamFilePacketType) (*packet.RpcResponseIter, error) {
|
|
|
|
return msh.PacketRpcIter(ctx, streamPk)
|
|
|
|
}
|
|
|
|
|
2022-11-02 05:42:56 +01:00
|
|
|
func addScVarsToState(state *packet.ShellState) *packet.ShellState {
|
|
|
|
if state == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rtn := *state
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
envMap := shellenv.DeclMapFromState(&rtn)
|
|
|
|
envMap["WAVETERM"] = &shellenv.DeclareDeclType{Name: "WAVETERM", Value: "1", Args: "x"}
|
|
|
|
envMap["WAVETERM_VERSION"] = &shellenv.DeclareDeclType{Name: "WAVETERM_VERSION", Value: scbase.WaveVersion, Args: "x"}
|
|
|
|
envMap["TERM_PROGRAM"] = &shellenv.DeclareDeclType{Name: "TERM_PROGRAM", Value: "waveterm", Args: "x"}
|
|
|
|
envMap["TERM_PROGRAM_VERSION"] = &shellenv.DeclareDeclType{Name: "TERM_PROGRAM_VERSION", Value: scbase.WaveVersion, Args: "x"}
|
2024-01-09 03:31:17 +01:00
|
|
|
if _, exists := envMap["LANG"]; !exists {
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
envMap["LANG"] = &shellenv.DeclareDeclType{Name: "LANG", Value: scbase.DetermineLang(), Args: "x"}
|
2024-01-09 03:31:17 +01:00
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
rtn.ShellVars = shellenv.SerializeDeclMap(envMap)
|
2022-11-02 05:42:56 +01:00
|
|
|
return &rtn
|
|
|
|
}
|
|
|
|
|
|
|
|
func stripScVarsFromState(state *packet.ShellState) *packet.ShellState {
|
|
|
|
if state == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rtn := *state
|
2022-11-29 03:03:02 +01:00
|
|
|
rtn.HashVal = ""
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
envMap := shellenv.DeclMapFromState(&rtn)
|
|
|
|
for key := range envVarsToStrip {
|
|
|
|
delete(envMap, key)
|
|
|
|
}
|
|
|
|
rtn.ShellVars = shellenv.SerializeDeclMap(envMap)
|
2022-11-02 05:42:56 +01:00
|
|
|
return &rtn
|
|
|
|
}
|
|
|
|
|
2022-11-29 03:03:02 +01:00
|
|
|
func stripScVarsFromStateDiff(stateDiff *packet.ShellStateDiff) *packet.ShellStateDiff {
|
|
|
|
if stateDiff == nil || len(stateDiff.VarsDiff) == 0 {
|
|
|
|
return stateDiff
|
|
|
|
}
|
|
|
|
rtn := *stateDiff
|
|
|
|
rtn.HashVal = ""
|
|
|
|
var mapDiff statediff.MapDiffType
|
|
|
|
err := mapDiff.Decode(stateDiff.VarsDiff)
|
|
|
|
if err != nil {
|
2023-04-13 21:53:15 +02:00
|
|
|
log.Printf("error decoding statediff in stripScVarsFromStateDiff: %v\n", err)
|
2022-11-29 03:03:02 +01:00
|
|
|
return stateDiff
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
for key := range envVarsToStrip {
|
|
|
|
delete(mapDiff.ToAdd, key)
|
|
|
|
}
|
2022-11-29 03:03:02 +01:00
|
|
|
rtn.VarsDiff = mapDiff.Encode()
|
|
|
|
return &rtn
|
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) getActiveShellTypes(ctx context.Context) ([]string, error) {
|
|
|
|
shellPref := msh.GetShellPref()
|
|
|
|
rtn := []string{shellPref}
|
|
|
|
activeShells, err := sstore.GetRemoteActiveShells(ctx, msh.RemoteId)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return utilfn.CombineStrArrays(rtn, activeShells), nil
|
|
|
|
}
|
|
|
|
|
2024-03-08 07:37:00 +01:00
|
|
|
func (msh *MShellProc) createWaveshellSession(clientCtx context.Context, remoteCopy sstore.RemoteType) (shexec.ConnInterface, error) {
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Err = nil
|
|
|
|
msh.ErrNoInitPk = false
|
|
|
|
msh.Status = StatusConnecting
|
|
|
|
msh.MakeClientDeadline = nil
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
sapi, err := shellapi.MakeShellApi(msh.GetShellType())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
var wsSession shexec.ConnInterface
|
|
|
|
if remoteCopy.SSHOpts.SSHHost == "" && remoteCopy.Local {
|
|
|
|
cmdStr, err := MakeLocalMShellCommandStr(remoteCopy.IsSudo())
|
|
|
|
if err != nil {
|
2024-03-04 20:56:20 +01:00
|
|
|
return nil, fmt.Errorf("cannot find local waveshell binary: %v", err)
|
2024-02-29 20:37:03 +01:00
|
|
|
}
|
|
|
|
ecmd := shexec.MakeLocalExecCmd(cmdStr, sapi)
|
|
|
|
var cmdPty *os.File
|
|
|
|
cmdPty, err = msh.addControllingTty(ecmd)
|
|
|
|
if err != nil {
|
2024-03-04 20:56:20 +01:00
|
|
|
return nil, fmt.Errorf("cannot attach controlling tty to waveshell command: %v", err)
|
2024-02-29 20:37:03 +01:00
|
|
|
}
|
|
|
|
go msh.RunPtyReadLoop(cmdPty)
|
|
|
|
go msh.WaitAndSendPasswordNew(remoteCopy.SSHOpts.SSHPassword)
|
|
|
|
wsSession = shexec.CmdWrap{Cmd: ecmd}
|
|
|
|
} else if msh.Client == nil {
|
2024-03-04 20:56:20 +01:00
|
|
|
remoteDisplayName := fmt.Sprintf("%s [%s]", remoteCopy.RemoteAlias, remoteCopy.RemoteCanonicalName)
|
2024-03-08 07:37:00 +01:00
|
|
|
client, err := ConnectToClient(clientCtx, remoteCopy.SSHOpts, remoteDisplayName)
|
2024-02-29 20:37:03 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ssh cannot connect to client: %w", err)
|
|
|
|
}
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = client
|
|
|
|
})
|
|
|
|
session, err := client.NewSession()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ssh cannot create session: %w", err)
|
|
|
|
}
|
2024-03-04 20:56:20 +01:00
|
|
|
cmd := fmt.Sprintf("%s -c %s", sapi.GetLocalShellPath(), shellescape.Quote(MakeServerCommandStr()))
|
|
|
|
wsSession = shexec.SessionWrap{Session: session, StartCmd: cmd}
|
2024-02-29 20:37:03 +01:00
|
|
|
} else {
|
|
|
|
session, err := msh.Client.NewSession()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ssh cannot create session: %w", err)
|
|
|
|
}
|
2024-03-04 20:56:20 +01:00
|
|
|
cmd := fmt.Sprintf(`%s -c %s`, sapi.GetLocalShellPath(), shellescape.Quote(MakeServerCommandStr()))
|
|
|
|
wsSession = shexec.SessionWrap{Session: session, StartCmd: cmd}
|
2024-02-29 20:37:03 +01:00
|
|
|
}
|
|
|
|
return wsSession, nil
|
|
|
|
}
|
|
|
|
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
// for conditional launch method based on ssh library in use
|
|
|
|
// remove once ssh library is stabilized
|
|
|
|
type NewLauncher struct{}
|
|
|
|
|
|
|
|
// func (msh *MShellProc) LaunchNew(interactive bool) {
|
|
|
|
func (NewLauncher) Launch(msh *MShellProc, interactive bool) {
|
|
|
|
remoteCopy := msh.GetRemoteCopy()
|
|
|
|
if remoteCopy.Archived {
|
|
|
|
msh.WriteToPtyBuffer("cannot launch archived remote\n")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
curStatus := msh.GetStatus()
|
|
|
|
if curStatus == StatusConnected {
|
|
|
|
msh.WriteToPtyBuffer("remote is already connected (no action taken)\n")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if curStatus == StatusConnecting {
|
|
|
|
msh.WriteToPtyBuffer("remote is already connecting, disconnect before trying to connect again\n")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
istatus := msh.GetInstallStatus()
|
|
|
|
if istatus == StatusConnecting {
|
|
|
|
msh.WriteToPtyBuffer("remote is trying to install, cancel install before trying to connect again\n")
|
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
var makeClientCtx context.Context
|
|
|
|
var makeClientCancelFn context.CancelFunc
|
|
|
|
msh.WithLock(func() {
|
|
|
|
makeClientCtx, makeClientCancelFn = context.WithCancel(context.Background())
|
|
|
|
msh.MakeClientCancelFn = makeClientCancelFn
|
|
|
|
msh.MakeClientDeadline = nil
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
defer makeClientCancelFn()
|
2024-03-08 07:37:00 +01:00
|
|
|
msh.WriteToPtyBuffer("connecting to %s...\n", remoteCopy.RemoteCanonicalName)
|
|
|
|
wsSession, err := msh.createWaveshellSession(makeClientCtx, remoteCopy)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", err.Error())
|
|
|
|
msh.setErrorStatus(err)
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = nil
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
cproc, err := shexec.MakeClientProc(makeClientCtx, wsSession)
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.MakeClientCancelFn = nil
|
|
|
|
msh.MakeClientDeadline = nil
|
|
|
|
})
|
|
|
|
if err == context.DeadlineExceeded {
|
|
|
|
msh.WriteToPtyBuffer("*connect timeout\n")
|
|
|
|
msh.setErrorStatus(errors.New("connect timeout"))
|
2024-02-16 00:58:50 +01:00
|
|
|
msh.WithLock(func() {
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.Client = nil
|
2024-02-16 00:58:50 +01:00
|
|
|
})
|
2024-02-29 20:37:03 +01:00
|
|
|
return
|
|
|
|
} else if err == context.Canceled {
|
|
|
|
msh.WriteToPtyBuffer("*forced disconnection\n")
|
2024-02-16 00:58:50 +01:00
|
|
|
msh.WithLock(func() {
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.Status = StatusDisconnected
|
2024-02-16 00:58:50 +01:00
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
msh.WithLock(func() {
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.Client = nil
|
|
|
|
})
|
|
|
|
return
|
|
|
|
} else if serr, ok := err.(shexec.WaveshellLaunchError); ok {
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.UName = serr.InitPk.UName
|
|
|
|
msh.NeedsMShellUpgrade = true
|
|
|
|
msh.InitPkShellType = serr.InitPk.Shell
|
2024-02-16 00:58:50 +01:00
|
|
|
})
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
msh.StateMap.Clear()
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", serr.Error())
|
|
|
|
msh.setErrorStatus(serr)
|
|
|
|
go msh.tryAutoInstall()
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
return
|
2024-02-29 20:37:03 +01:00
|
|
|
} else if err != nil {
|
2024-03-04 20:56:20 +01:00
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", err.Error())
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
msh.setErrorStatus(err)
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Client = nil
|
|
|
|
})
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
return
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.UName = cproc.InitPk.UName
|
|
|
|
msh.InitPkShellType = cproc.InitPk.Shell
|
|
|
|
msh.StateMap.Clear()
|
|
|
|
// no notify here, because we'll call notify in either case below
|
|
|
|
})
|
|
|
|
|
|
|
|
msh.updateRemoteStateVars(context.Background(), msh.RemoteId, cproc.InitPk)
|
Use ssh library for remote connections (#250)
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
2024-01-25 19:18:11 +01:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.ServerProc = cproc
|
|
|
|
msh.Status = StatusConnected
|
|
|
|
})
|
|
|
|
go func() {
|
|
|
|
exitErr := cproc.Cmd.Wait()
|
|
|
|
exitCode := shexec.GetExitCode(exitErr)
|
|
|
|
msh.WithLock(func() {
|
|
|
|
if msh.Status == StatusConnected || msh.Status == StatusConnecting {
|
|
|
|
msh.Status = StatusDisconnected
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
}
|
|
|
|
})
|
|
|
|
msh.WriteToPtyBuffer("*disconnected exitcode=%d\n", exitCode)
|
|
|
|
}()
|
|
|
|
go msh.ProcessPackets()
|
|
|
|
msh.initActiveShells()
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
}
|
|
|
|
|
|
|
|
// for conditional launch method based on ssh library in use
|
|
|
|
// remove once ssh library is stabilized
|
|
|
|
type LegacyLauncher struct{}
|
|
|
|
|
|
|
|
// func (msh *MShellProc) LaunchLegacy(interactive bool) {
|
|
|
|
func (LegacyLauncher) Launch(msh *MShellProc, interactive bool) {
|
2022-09-14 21:56:05 +02:00
|
|
|
remoteCopy := msh.GetRemoteCopy()
|
2022-09-14 02:11:36 +02:00
|
|
|
if remoteCopy.Archived {
|
2022-09-15 08:10:35 +02:00
|
|
|
msh.WriteToPtyBuffer("cannot launch archived remote\n")
|
2022-09-13 21:06:12 +02:00
|
|
|
return
|
|
|
|
}
|
2022-09-16 21:28:09 +02:00
|
|
|
curStatus := msh.GetStatus()
|
2022-09-27 08:23:04 +02:00
|
|
|
if curStatus == StatusConnected {
|
|
|
|
msh.WriteToPtyBuffer("remote is already connected (no action taken)\n")
|
|
|
|
return
|
|
|
|
}
|
2022-09-16 21:28:09 +02:00
|
|
|
if curStatus == StatusConnecting {
|
|
|
|
msh.WriteToPtyBuffer("remote is already connecting, disconnect before trying to connect again\n")
|
|
|
|
return
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
sapi, err := shellapi.MakeShellApi(msh.GetShellType())
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
2022-09-27 08:23:04 +02:00
|
|
|
istatus := msh.GetInstallStatus()
|
|
|
|
if istatus == StatusConnecting {
|
|
|
|
msh.WriteToPtyBuffer("remote is trying to install, cancel install before trying to connect again\n")
|
|
|
|
return
|
|
|
|
}
|
2023-03-17 23:07:29 +01:00
|
|
|
if remoteCopy.SSHOpts.SSHPort != 0 && remoteCopy.SSHOpts.SSHPort != 22 {
|
|
|
|
msh.WriteToPtyBuffer("connecting to %s (port %d)...\n", remoteCopy.RemoteCanonicalName, remoteCopy.SSHOpts.SSHPort)
|
|
|
|
} else {
|
|
|
|
msh.WriteToPtyBuffer("connecting to %s...\n", remoteCopy.RemoteCanonicalName)
|
|
|
|
}
|
2022-09-14 02:11:36 +02:00
|
|
|
sshOpts := convertSSHOpts(remoteCopy.SSHOpts)
|
|
|
|
sshOpts.SSHErrorsToTty = true
|
2023-01-23 22:47:57 +01:00
|
|
|
if remoteCopy.ConnectMode != sstore.ConnectModeManual && remoteCopy.SSHOpts.SSHPassword == "" && !interactive {
|
2022-10-01 01:05:48 +02:00
|
|
|
sshOpts.BatchMode = true
|
|
|
|
}
|
2022-12-29 08:09:37 +01:00
|
|
|
var cmdStr string
|
2022-12-29 09:07:16 +01:00
|
|
|
if sshOpts.SSHHost == "" && remoteCopy.Local {
|
2022-12-29 08:09:37 +01:00
|
|
|
var err error
|
2023-05-02 21:43:54 +02:00
|
|
|
cmdStr, err = MakeLocalMShellCommandStr(remoteCopy.IsSudo())
|
2022-12-29 08:09:37 +01:00
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, cannot find local mshell binary: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
cmdStr = MakeServerCommandStr()
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
ecmd := sshOpts.MakeSSHExecCmd(cmdStr, sapi)
|
2022-08-25 07:57:41 +02:00
|
|
|
cmdPty, err := msh.addControllingTty(ecmd)
|
2022-08-19 22:23:00 +02:00
|
|
|
if err != nil {
|
2022-09-04 08:36:15 +02:00
|
|
|
statusErr := fmt.Errorf("cannot attach controlling tty to mshell command: %w", err)
|
2022-09-15 09:37:17 +02:00
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", statusErr.Error())
|
2022-09-04 08:36:15 +02:00
|
|
|
msh.setErrorStatus(statusErr)
|
2022-08-19 22:23:00 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
if len(ecmd.ExtraFiles) > 0 {
|
|
|
|
ecmd.ExtraFiles[len(ecmd.ExtraFiles)-1].Close()
|
|
|
|
}
|
|
|
|
}()
|
2022-09-16 02:44:39 +02:00
|
|
|
go msh.RunPtyReadLoop(cmdPty)
|
2022-10-01 02:22:28 +02:00
|
|
|
if remoteCopy.SSHOpts.SSHPassword != "" {
|
|
|
|
go msh.WaitAndSendPassword(remoteCopy.SSHOpts.SSHPassword)
|
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
var makeClientCtx context.Context
|
|
|
|
var makeClientCancelFn context.CancelFunc
|
2022-09-16 02:44:39 +02:00
|
|
|
msh.WithLock(func() {
|
2024-02-29 20:37:03 +01:00
|
|
|
deadlineTime := time.Now().Add(RemoteConnectTimeout)
|
|
|
|
makeClientCtx, makeClientCancelFn = context.WithDeadline(context.Background(), deadlineTime)
|
|
|
|
defer makeClientCancelFn()
|
2022-09-27 08:23:04 +02:00
|
|
|
msh.Err = nil
|
2023-04-03 10:37:36 +02:00
|
|
|
msh.ErrNoInitPk = false
|
2022-09-16 02:44:39 +02:00
|
|
|
msh.Status = StatusConnecting
|
2022-09-16 21:28:09 +02:00
|
|
|
msh.MakeClientCancelFn = makeClientCancelFn
|
2023-04-04 03:57:38 +02:00
|
|
|
msh.MakeClientDeadline = &deadlineTime
|
2022-09-16 02:44:39 +02:00
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
2023-04-04 03:57:38 +02:00
|
|
|
go msh.watchClientDeadlineTime()
|
2024-02-29 20:37:03 +01:00
|
|
|
cproc, err := shexec.MakeClientProc(makeClientCtx, shexec.CmdWrap{Cmd: ecmd})
|
2022-08-25 07:57:41 +02:00
|
|
|
msh.WithLock(func() {
|
2022-09-16 21:28:09 +02:00
|
|
|
msh.MakeClientCancelFn = nil
|
2023-04-04 03:57:38 +02:00
|
|
|
msh.MakeClientDeadline = nil
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
msh.StateMap.Clear()
|
2022-09-04 22:51:49 +02:00
|
|
|
// no notify here, because we'll call notify in either case below
|
2022-08-25 07:57:41 +02:00
|
|
|
})
|
2024-02-29 20:37:03 +01:00
|
|
|
if err == context.DeadlineExceeded {
|
|
|
|
msh.WriteToPtyBuffer("*connect timeout\n")
|
|
|
|
msh.setErrorStatus(errors.New("connect timeout"))
|
2022-09-27 08:23:04 +02:00
|
|
|
return
|
2024-02-29 20:37:03 +01:00
|
|
|
} else if err == context.Canceled {
|
|
|
|
msh.WriteToPtyBuffer("*forced disconnection\n")
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.Status = StatusDisconnected
|
|
|
|
go msh.NotifyRemoteUpdate()
|
|
|
|
})
|
|
|
|
return
|
|
|
|
} else if serr, ok := err.(shexec.WaveshellLaunchError); ok {
|
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.UName = serr.InitPk.UName
|
|
|
|
if semver.Compare(serr.InitPk.Version, scbase.MShellVersion) < 0 {
|
|
|
|
// only set NeedsMShellUpgrade if we got an InitPk
|
|
|
|
msh.NeedsMShellUpgrade = true
|
|
|
|
}
|
|
|
|
msh.InitPkShellType = serr.InitPk.Shell
|
|
|
|
})
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", serr.Error())
|
|
|
|
msh.setErrorStatus(serr)
|
2023-04-04 07:15:43 +02:00
|
|
|
go msh.tryAutoInstall()
|
2022-07-02 02:38:36 +02:00
|
|
|
return
|
2024-02-29 20:37:03 +01:00
|
|
|
} else if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error, %s\n", serr.Error())
|
|
|
|
msh.setErrorStatus(err)
|
|
|
|
return
|
2022-07-01 21:17:19 +02:00
|
|
|
}
|
2024-02-29 20:37:03 +01:00
|
|
|
|
|
|
|
msh.updateRemoteStateVars(context.Background(), msh.RemoteId, cproc.InitPk)
|
2022-08-25 07:57:41 +02:00
|
|
|
msh.WithLock(func() {
|
|
|
|
msh.ServerProc = cproc
|
|
|
|
msh.Status = StatusConnected
|
|
|
|
})
|
2022-07-01 21:17:19 +02:00
|
|
|
go func() {
|
2022-07-07 04:01:00 +02:00
|
|
|
exitErr := cproc.Cmd.Wait()
|
2022-07-01 21:17:19 +02:00
|
|
|
exitCode := shexec.GetExitCode(exitErr)
|
2022-07-02 02:38:36 +02:00
|
|
|
msh.WithLock(func() {
|
2022-09-16 02:44:39 +02:00
|
|
|
if msh.Status == StatusConnected || msh.Status == StatusConnecting {
|
2022-07-02 02:38:36 +02:00
|
|
|
msh.Status = StatusDisconnected
|
2022-09-05 23:49:23 +02:00
|
|
|
go msh.NotifyRemoteUpdate()
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
|
|
|
})
|
2022-09-15 09:37:17 +02:00
|
|
|
msh.WriteToPtyBuffer("*disconnected exitcode=%d\n", exitCode)
|
2022-07-01 21:17:19 +02:00
|
|
|
}()
|
2022-07-02 02:38:36 +02:00
|
|
|
go msh.ProcessPackets()
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
msh.initActiveShells()
|
|
|
|
go msh.NotifyRemoteUpdate()
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) initActiveShells() {
|
|
|
|
ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
|
|
|
|
defer cancelFn()
|
|
|
|
activeShells, err := msh.getActiveShellTypes(ctx)
|
|
|
|
if err != nil {
|
|
|
|
// we're not going to fail the connect for this error (it will be unusable, but technically connected)
|
|
|
|
msh.WriteToPtyBuffer("*error getting active shells: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
for _, shellType := range activeShells {
|
|
|
|
_, err = msh.ReInit(ctx, shellType)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error reiniting shell %q: %v\n", shellType, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-02 02:38:36 +02:00
|
|
|
func (msh *MShellProc) IsConnected() bool {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.Status == StatusConnected
|
2022-07-01 21:17:19 +02:00
|
|
|
}
|
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) GetShellType() string {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
return msh.InitPkShellType
|
|
|
|
}
|
|
|
|
|
2022-08-24 11:14:16 +02:00
|
|
|
func replaceHomePath(pathStr string, homeDir string) string {
|
|
|
|
if homeDir == "" {
|
|
|
|
return pathStr
|
|
|
|
}
|
|
|
|
if pathStr == homeDir {
|
|
|
|
return "~"
|
|
|
|
}
|
|
|
|
if strings.HasPrefix(pathStr, homeDir+"/") {
|
|
|
|
return "~" + pathStr[len(homeDir):]
|
|
|
|
}
|
|
|
|
return pathStr
|
|
|
|
}
|
|
|
|
|
2022-07-08 07:46:28 +02:00
|
|
|
func (msh *MShellProc) IsCmdRunning(ck base.CommandKey) bool {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2024-01-27 01:25:21 +01:00
|
|
|
_, ok := msh.RunningCmds[ck]
|
|
|
|
return ok
|
2022-07-08 07:46:28 +02:00
|
|
|
}
|
|
|
|
|
2022-09-06 01:31:22 +02:00
|
|
|
func (msh *MShellProc) SendInput(dataPk *packet.DataPacketType) error {
|
2022-07-08 07:46:28 +02:00
|
|
|
if !msh.IsConnected() {
|
|
|
|
return fmt.Errorf("remote is not connected, cannot send input")
|
|
|
|
}
|
2022-09-06 01:31:22 +02:00
|
|
|
if !msh.IsCmdRunning(dataPk.CK) {
|
2022-07-08 07:46:28 +02:00
|
|
|
return fmt.Errorf("cannot send input, cmd is not running")
|
|
|
|
}
|
|
|
|
return msh.ServerProc.Input.SendPacket(dataPk)
|
|
|
|
}
|
|
|
|
|
2024-01-27 01:25:21 +01:00
|
|
|
func (msh *MShellProc) KillRunningCommandAndWait(ctx context.Context, ck base.CommandKey) error {
|
|
|
|
if !msh.IsCmdRunning(ck) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
siPk := packet.MakeSpecialInputPacket()
|
|
|
|
siPk.CK = ck
|
|
|
|
siPk.SigName = "SIGTERM"
|
|
|
|
err := msh.SendSpecialInput(siPk)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("error trying to kill running cmd: %w", err)
|
|
|
|
}
|
|
|
|
for {
|
|
|
|
if ctx.Err() != nil {
|
|
|
|
return ctx.Err()
|
|
|
|
}
|
|
|
|
if !msh.IsCmdRunning(ck) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// TODO fix busy wait (sync with msh.RunningCmds)
|
|
|
|
// not a huge deal though since this is not processor intensive and not widely used
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-06 05:08:59 +02:00
|
|
|
func (msh *MShellProc) SendSpecialInput(siPk *packet.SpecialInputPacketType) error {
|
|
|
|
if !msh.IsConnected() {
|
|
|
|
return fmt.Errorf("remote is not connected, cannot send input")
|
|
|
|
}
|
|
|
|
if !msh.IsCmdRunning(siPk.CK) {
|
|
|
|
return fmt.Errorf("cannot send input, cmd is not running")
|
|
|
|
}
|
|
|
|
return msh.ServerProc.Input.SendPacket(siPk)
|
|
|
|
}
|
|
|
|
|
2023-09-01 07:04:31 +02:00
|
|
|
func (msh *MShellProc) SendFileData(dataPk *packet.FileDataPacketType) error {
|
|
|
|
if !msh.IsConnected() {
|
|
|
|
return fmt.Errorf("remote is not connected, cannot send input")
|
|
|
|
}
|
|
|
|
return msh.ServerProc.Input.SendPacket(dataPk)
|
|
|
|
}
|
|
|
|
|
2022-09-04 08:36:15 +02:00
|
|
|
func makeTermOpts(runPk *packet.RunPacketType) sstore.TermOpts {
|
2023-12-12 23:24:09 +01:00
|
|
|
return sstore.TermOpts{Rows: int64(runPk.TermOpts.Rows), Cols: int64(runPk.TermOpts.Cols), FlexRows: runPk.TermOpts.FlexRows, MaxPtySize: DefaultMaxPtySize}
|
2022-07-07 09:10:37 +02:00
|
|
|
}
|
|
|
|
|
2022-10-28 07:00:10 +02:00
|
|
|
// returns (ok, currentPSC)
|
2024-03-14 02:52:41 +01:00
|
|
|
// if ok is true, currentPSC will be nil
|
|
|
|
// if ok is false, currentPSC will be the existing pending state command (not nil)
|
2023-11-10 02:47:24 +01:00
|
|
|
func (msh *MShellProc) testAndSetPendingStateCmd(screenId string, rptr sstore.RemotePtrType, newCK *base.CommandKey) (bool, *base.CommandKey) {
|
|
|
|
key := pendingStateKey{ScreenId: screenId, RemotePtr: rptr}
|
2022-10-28 07:00:10 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2023-11-10 02:47:24 +01:00
|
|
|
ck, found := msh.PendingStateCmds[key]
|
2022-10-28 07:00:10 +02:00
|
|
|
if found {
|
|
|
|
return false, &ck
|
|
|
|
}
|
|
|
|
if newCK != nil {
|
2023-11-10 02:47:24 +01:00
|
|
|
msh.PendingStateCmds[key] = *newCK
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
2023-11-10 02:47:24 +01:00
|
|
|
func (msh *MShellProc) removePendingStateCmd(screenId string, rptr sstore.RemotePtrType, ck base.CommandKey) {
|
|
|
|
key := pendingStateKey{ScreenId: screenId, RemotePtr: rptr}
|
2022-10-28 07:00:10 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2023-11-10 02:47:24 +01:00
|
|
|
existingCK, found := msh.PendingStateCmds[key]
|
2022-10-28 07:00:10 +02:00
|
|
|
if !found {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if existingCK == ck {
|
2023-11-10 02:47:24 +01:00
|
|
|
delete(msh.PendingStateCmds, key)
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-07 01:37:54 +01:00
|
|
|
func ResolveCurrentScreenStatePtr(ctx context.Context, sessionId string, screenId string, remotePtr sstore.RemotePtrType) (*sstore.ShellStatePtr, error) {
|
|
|
|
statePtr, err := sstore.GetRemoteStatePtr(ctx, sessionId, screenId, remotePtr)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("cannot get current connection stateptr: %w", err)
|
|
|
|
}
|
|
|
|
if statePtr == nil {
|
|
|
|
msh := GetRemoteById(remotePtr.RemoteId)
|
|
|
|
err := msh.EnsureShellType(ctx, msh.GetShellPref()) // make sure shellType is initialized
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
statePtr = msh.GetDefaultStatePtr(msh.GetShellPref())
|
|
|
|
if statePtr == nil {
|
|
|
|
return nil, fmt.Errorf("no valid default connection stateptr")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return statePtr, nil
|
|
|
|
}
|
|
|
|
|
2024-01-27 01:25:21 +01:00
|
|
|
type RunCommandOpts struct {
|
|
|
|
SessionId string
|
|
|
|
ScreenId string
|
|
|
|
RemotePtr sstore.RemotePtrType
|
|
|
|
|
|
|
|
// optional, if not provided shellstate will look up state from remote instance
|
|
|
|
// ReturnState cannot be used with StatePtr
|
|
|
|
// this will also cause this command to bypass the pending state cmd logic
|
|
|
|
StatePtr *sstore.ShellStatePtr
|
|
|
|
|
|
|
|
// set to true to skip creating the pty file (for restarted commands)
|
|
|
|
NoCreateCmdPtyFile bool
|
2024-03-14 02:52:41 +01:00
|
|
|
|
|
|
|
// this command will not go into the DB, and will not have a ptyout file created
|
|
|
|
// forces special packet handling (sets RunCommandType.Ephemeral)
|
|
|
|
Ephemeral bool
|
2024-01-27 01:25:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// returns (CmdType, allow-updates-callback, err)
|
|
|
|
// we must persist the CmdType to the DB before calling the callback to allow updates
|
|
|
|
// otherwise an early CmdDone packet might not get processed (since cmd will not exist in DB)
|
|
|
|
func RunCommand(ctx context.Context, rcOpts RunCommandOpts, runPacket *packet.RunPacketType) (rtnCmd *sstore.CmdType, rtnCallback func(), rtnErr error) {
|
|
|
|
sessionId, screenId, remotePtr := rcOpts.SessionId, rcOpts.ScreenId, rcOpts.RemotePtr
|
2022-08-24 22:21:54 +02:00
|
|
|
if remotePtr.OwnerId != "" {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("cannot run command against another user's remote '%s'", remotePtr.MakeFullRemoteRef())
|
2022-08-24 22:21:54 +02:00
|
|
|
}
|
2023-03-21 03:20:57 +01:00
|
|
|
if screenId != runPacket.CK.GetGroupId() {
|
|
|
|
return nil, nil, fmt.Errorf("run commands screenids do not match")
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
2022-08-24 22:21:54 +02:00
|
|
|
msh := GetRemoteById(remotePtr.RemoteId)
|
2022-07-06 01:54:49 +02:00
|
|
|
if msh == nil {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("no remote id=%s found", remotePtr.RemoteId)
|
2022-07-06 01:54:49 +02:00
|
|
|
}
|
|
|
|
if !msh.IsConnected() {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("remote '%s' is not connected", remotePtr.RemoteId)
|
2022-07-16 02:37:32 +02:00
|
|
|
}
|
2022-10-28 07:52:38 +02:00
|
|
|
if runPacket.State != nil {
|
|
|
|
return nil, nil, fmt.Errorf("runPacket.State should not be set, it is set in RunCommand")
|
2022-07-06 01:54:49 +02:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
if rcOpts.StatePtr != nil && runPacket.ReturnState {
|
|
|
|
return nil, nil, fmt.Errorf("RunCommand: cannot use ReturnState with StatePtr")
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
|
|
|
|
// pending state command logic
|
|
|
|
// if we are currently running a command that can change the state, we need to wait for it to finish
|
|
|
|
if rcOpts.StatePtr == nil {
|
|
|
|
var newPSC *base.CommandKey
|
|
|
|
if runPacket.ReturnState {
|
|
|
|
newPSC = &runPacket.CK
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
ok, existingPSC := msh.testAndSetPendingStateCmd(screenId, remotePtr, newPSC)
|
|
|
|
if !ok {
|
2024-03-14 02:52:41 +01:00
|
|
|
rct := msh.GetRunningCmd(*existingPSC)
|
|
|
|
if rct.Ephemeral {
|
|
|
|
// if the existing command is ephemeral, we cancel it and continue
|
|
|
|
rct.EphCancled.Store(true)
|
|
|
|
} else {
|
|
|
|
line, _, err := sstore.GetLineCmdByLineId(ctx, screenId, existingPSC.GetCmdId())
|
|
|
|
return nil, nil, makePSCLineError(*existingPSC, line, err)
|
2024-01-27 01:25:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if newPSC != nil {
|
|
|
|
defer func() {
|
|
|
|
// if we get an error, remove the pending state cmd
|
|
|
|
// if no error, PSC will get removed when we see a CmdDone or CmdFinal packet
|
|
|
|
if rtnErr != nil {
|
|
|
|
msh.removePendingStateCmd(screenId, remotePtr, *newPSC)
|
|
|
|
}
|
|
|
|
}()
|
2022-10-28 02:10:36 +02:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
}
|
|
|
|
|
2022-10-28 07:52:38 +02:00
|
|
|
// get current remote-instance state
|
2024-01-27 01:25:21 +01:00
|
|
|
var statePtr *sstore.ShellStatePtr
|
|
|
|
if rcOpts.StatePtr != nil {
|
|
|
|
statePtr = rcOpts.StatePtr
|
|
|
|
} else {
|
|
|
|
var err error
|
2024-03-07 01:37:54 +01:00
|
|
|
statePtr, err = ResolveCurrentScreenStatePtr(ctx, sessionId, screenId, remotePtr)
|
2024-01-27 01:25:21 +01:00
|
|
|
if err != nil {
|
2024-03-07 01:37:54 +01:00
|
|
|
return nil, nil, fmt.Errorf("cannot run command: %w", err)
|
2024-01-27 01:25:21 +01:00
|
|
|
}
|
2022-11-29 03:03:02 +01:00
|
|
|
}
|
|
|
|
currentState, err := sstore.GetFullState(ctx, *statePtr)
|
|
|
|
if err != nil || currentState == nil {
|
2024-01-27 01:25:21 +01:00
|
|
|
return nil, nil, fmt.Errorf("cannot load current remote state: %w", err)
|
2022-10-28 07:52:38 +02:00
|
|
|
}
|
2022-11-02 05:42:56 +01:00
|
|
|
runPacket.State = addScVarsToState(currentState)
|
2022-10-28 07:52:38 +02:00
|
|
|
runPacket.StateComplete = true
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
runPacket.ShellType = currentState.GetShellType()
|
2024-01-27 01:25:21 +01:00
|
|
|
err = msh.EnsureShellType(ctx, runPacket.ShellType) // make sure shellType is initialized
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
|
|
|
|
// start cmdwait. must be started before sending the run packet
|
|
|
|
// this ensures that we don't process output, or cmddone packets until we set up the line, cmd, and ptyout file
|
|
|
|
startCmdWait(runPacket.CK)
|
|
|
|
defer func() {
|
|
|
|
// if we get an error, remove the cmdwait
|
|
|
|
// if no error, cmdwait will get removed by the caller w/ the callback fn that's returned on success
|
|
|
|
if rtnErr != nil {
|
|
|
|
removeCmdWait(runPacket.CK)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// RegisterRpc + WaitForResponse is used to get any waveshell side errors
|
|
|
|
// waveshell will either return an error (in a ResponsePacketType) or a CmdStartPacketType
|
2022-07-07 04:01:00 +02:00
|
|
|
msh.ServerProc.Output.RegisterRpc(runPacket.ReqId)
|
2022-10-28 07:52:38 +02:00
|
|
|
err = shexec.SendRunPacketAndRunData(ctx, msh.ServerProc.Input, runPacket)
|
2022-07-07 04:01:00 +02:00
|
|
|
if err != nil {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("sending run packet to remote: %w", err)
|
2022-07-07 04:01:00 +02:00
|
|
|
}
|
|
|
|
rtnPk := msh.ServerProc.Output.WaitForResponse(ctx, runPacket.ReqId)
|
2022-08-31 21:01:16 +02:00
|
|
|
if rtnPk == nil {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, ctx.Err()
|
2022-08-31 21:01:16 +02:00
|
|
|
}
|
2022-07-07 09:10:37 +02:00
|
|
|
startPk, ok := rtnPk.(*packet.CmdStartPacketType)
|
|
|
|
if !ok {
|
|
|
|
respPk, ok := rtnPk.(*packet.ResponsePacketType)
|
|
|
|
if !ok {
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("invalid response received from server for run packet: %s", packet.AsString(rtnPk))
|
2022-07-07 09:10:37 +02:00
|
|
|
}
|
2022-07-07 04:01:00 +02:00
|
|
|
if respPk.Error != "" {
|
2024-03-07 01:37:54 +01:00
|
|
|
return nil, nil, respPk.Err()
|
2022-07-07 04:01:00 +02:00
|
|
|
}
|
2022-09-05 23:49:23 +02:00
|
|
|
return nil, nil, fmt.Errorf("invalid response received from server for run packet: %s", packet.AsString(rtnPk))
|
2022-07-07 09:10:37 +02:00
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
|
|
|
|
// command is now successfully runnning
|
2022-07-08 01:29:14 +02:00
|
|
|
status := sstore.CmdStatusRunning
|
|
|
|
if runPacket.Detached {
|
|
|
|
status = sstore.CmdStatusDetached
|
|
|
|
}
|
2022-07-07 09:10:37 +02:00
|
|
|
cmd := &sstore.CmdType{
|
2023-07-31 02:16:43 +02:00
|
|
|
ScreenId: runPacket.CK.GetGroupId(),
|
|
|
|
LineId: runPacket.CK.GetCmdId(),
|
|
|
|
CmdStr: runPacket.Command,
|
|
|
|
RawCmdStr: runPacket.Command,
|
|
|
|
Remote: remotePtr,
|
|
|
|
FeState: sstore.FeStateFromShellState(currentState),
|
|
|
|
StatePtr: *statePtr,
|
|
|
|
TermOpts: makeTermOpts(runPacket),
|
|
|
|
Status: status,
|
|
|
|
CmdPid: startPk.Pid,
|
|
|
|
RemotePid: startPk.MShellPid,
|
|
|
|
ExitCode: 0,
|
|
|
|
DurationMs: 0,
|
|
|
|
RunOut: nil,
|
|
|
|
RtnState: runPacket.ReturnState,
|
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
if !rcOpts.NoCreateCmdPtyFile && !rcOpts.Ephemeral {
|
2024-01-27 01:25:21 +01:00
|
|
|
err = sstore.CreateCmdPtyFile(ctx, cmd.ScreenId, cmd.LineId, cmd.TermOpts.MaxPtySize)
|
|
|
|
if err != nil {
|
|
|
|
// TODO the cmd is running, so this is a tricky error to handle
|
|
|
|
return nil, nil, fmt.Errorf("cannot create local ptyout file for running command: %v", err)
|
2022-10-28 07:52:38 +02:00
|
|
|
}
|
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
msh.AddRunningCmd(&RunCmdType{
|
|
|
|
CK: runPacket.CK,
|
2024-01-27 01:25:21 +01:00
|
|
|
SessionId: sessionId,
|
|
|
|
ScreenId: screenId,
|
|
|
|
RemotePtr: remotePtr,
|
|
|
|
RunPacket: runPacket,
|
2024-03-14 02:52:41 +01:00
|
|
|
Ephemeral: rcOpts.Ephemeral,
|
2024-01-27 01:25:21 +01:00
|
|
|
})
|
2024-01-28 22:47:36 +01:00
|
|
|
|
2024-01-27 01:25:21 +01:00
|
|
|
return cmd, func() { removeCmdWait(runPacket.CK) }, nil
|
2022-10-28 07:52:38 +02:00
|
|
|
}
|
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
// helper func to construct the proper error given what information we have
|
|
|
|
func makePSCLineError(existingPSC base.CommandKey, line *sstore.LineType, lineErr error) error {
|
|
|
|
if lineErr != nil {
|
|
|
|
return fmt.Errorf("cannot run command while a stateful command is still running: %v", lineErr)
|
|
|
|
}
|
|
|
|
if line == nil {
|
|
|
|
return fmt.Errorf("cannot run command while a stateful command is still running %s", existingPSC)
|
|
|
|
}
|
|
|
|
return fmt.Errorf("cannot run command while a stateful command (linenum=%d) is still running", line.LineNum)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) AddRunningCmd(rct *RunCmdType) {
|
2022-10-28 07:22:17 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
msh.RunningCmds[rct.RunPacket.CK] = rct
|
2022-07-06 01:54:49 +02:00
|
|
|
}
|
|
|
|
|
2022-10-28 07:22:17 +02:00
|
|
|
func (msh *MShellProc) GetRunningCmd(ck base.CommandKey) *RunCmdType {
|
2022-07-08 07:13:45 +02:00
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2024-03-14 02:52:41 +01:00
|
|
|
return msh.RunningCmds[ck]
|
2022-09-27 08:23:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) RemoveRunningCmd(ck base.CommandKey) {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
|
|
|
delete(msh.RunningCmds, ck)
|
2023-11-10 02:47:24 +01:00
|
|
|
for key, pendingCk := range msh.PendingStateCmds {
|
2022-10-28 07:00:10 +02:00
|
|
|
if pendingCk == ck {
|
2023-11-10 02:47:24 +01:00
|
|
|
delete(msh.PendingStateCmds, key)
|
2022-10-28 07:00:10 +02:00
|
|
|
}
|
|
|
|
}
|
2022-07-08 07:13:45 +02:00
|
|
|
}
|
|
|
|
|
2023-09-01 07:04:31 +02:00
|
|
|
func (msh *MShellProc) PacketRpcIter(ctx context.Context, pk packet.RpcPacketType) (*packet.RpcResponseIter, error) {
|
|
|
|
if !msh.IsConnected() {
|
|
|
|
return nil, fmt.Errorf("remote is not connected")
|
|
|
|
}
|
|
|
|
if pk == nil {
|
|
|
|
return nil, fmt.Errorf("PacketRpc passed nil packet")
|
|
|
|
}
|
|
|
|
reqId := pk.GetReqId()
|
2024-02-08 21:37:23 +01:00
|
|
|
msh.ServerProc.Output.RegisterRpcSz(reqId, RpcIterChannelSize)
|
2023-09-01 07:04:31 +02:00
|
|
|
err := msh.ServerProc.Input.SendPacketCtx(ctx, pk)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return msh.ServerProc.Output.GetResponseIter(reqId), nil
|
|
|
|
}
|
|
|
|
|
2022-10-28 02:10:36 +02:00
|
|
|
func (msh *MShellProc) PacketRpcRaw(ctx context.Context, pk packet.RpcPacketType) (packet.RpcResponsePacketType, error) {
|
2022-07-07 04:01:00 +02:00
|
|
|
if !msh.IsConnected() {
|
2023-09-01 07:04:31 +02:00
|
|
|
return nil, fmt.Errorf("remote is not connected")
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
2022-07-01 21:17:19 +02:00
|
|
|
if pk == nil {
|
|
|
|
return nil, fmt.Errorf("PacketRpc passed nil packet")
|
|
|
|
}
|
2022-07-07 04:01:00 +02:00
|
|
|
reqId := pk.GetReqId()
|
|
|
|
msh.ServerProc.Output.RegisterRpc(reqId)
|
|
|
|
defer msh.ServerProc.Output.UnRegisterRpc(reqId)
|
|
|
|
err := msh.ServerProc.Input.SendPacketCtx(ctx, pk)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
rtnPk := msh.ServerProc.Output.WaitForResponse(ctx, reqId)
|
|
|
|
if rtnPk == nil {
|
|
|
|
return nil, ctx.Err()
|
2022-07-01 21:17:19 +02:00
|
|
|
}
|
2022-10-28 02:10:36 +02:00
|
|
|
return rtnPk, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) PacketRpc(ctx context.Context, pk packet.RpcPacketType) (*packet.ResponsePacketType, error) {
|
|
|
|
rtnPk, err := msh.PacketRpcRaw(ctx, pk)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-07-07 04:01:00 +02:00
|
|
|
if respPk, ok := rtnPk.(*packet.ResponsePacketType); ok {
|
|
|
|
return respPk, nil
|
|
|
|
}
|
|
|
|
return nil, fmt.Errorf("invalid response packet received: %s", packet.AsString(rtnPk))
|
2022-07-01 21:17:19 +02:00
|
|
|
}
|
|
|
|
|
2022-09-04 22:51:49 +02:00
|
|
|
func (msh *MShellProc) WithLock(fn func()) {
|
|
|
|
msh.Lock.Lock()
|
|
|
|
defer msh.Lock.Unlock()
|
2022-07-02 02:38:36 +02:00
|
|
|
fn()
|
|
|
|
}
|
|
|
|
|
2022-07-07 07:46:22 +02:00
|
|
|
func makeDataAckPacket(ck base.CommandKey, fdNum int, ackLen int, err error) *packet.DataAckPacketType {
|
|
|
|
ack := packet.MakeDataAckPacket()
|
|
|
|
ack.CK = ck
|
|
|
|
ack.FdNum = fdNum
|
|
|
|
ack.AckLen = ackLen
|
|
|
|
if err != nil {
|
|
|
|
ack.Error = err.Error()
|
|
|
|
}
|
|
|
|
return ack
|
|
|
|
}
|
|
|
|
|
2022-09-05 23:49:23 +02:00
|
|
|
func (msh *MShellProc) notifyHangups_nolock() {
|
2023-12-08 22:39:13 +01:00
|
|
|
for ck := range msh.RunningCmds {
|
2023-03-21 03:20:57 +01:00
|
|
|
cmd, err := sstore.GetCmdByScreenId(context.Background(), ck.GetGroupId(), ck.GetCmdId())
|
2022-09-05 23:49:23 +02:00
|
|
|
if err != nil {
|
|
|
|
continue
|
|
|
|
}
|
2024-02-16 01:45:47 +01:00
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
update.AddUpdate(*cmd)
|
|
|
|
scbus.MainUpdateBus.DoScreenUpdate(ck.GetGroupId(), update)
|
2024-01-28 22:47:36 +01:00
|
|
|
go pushNumRunningCmdsUpdate(&ck, -1)
|
2022-09-05 23:49:23 +02:00
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
msh.RunningCmds = make(map[base.CommandKey]*RunCmdType)
|
2023-11-10 03:29:11 +01:00
|
|
|
msh.PendingStateCmds = make(map[pendingStateKey]base.CommandKey)
|
2022-09-05 23:49:23 +02:00
|
|
|
}
|
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
// either fullstate or statediff will be set (not both) <- this is so the result is compatible with the sstore.UpdateRemoteState function
|
|
|
|
// note that this function *does* touch the DB, if FinalStateDiff is set, will ensure that StateBase is written to DB
|
|
|
|
func (msh *MShellProc) makeStatePtrFromFinalState(ctx context.Context, donePk *packet.CmdDonePacketType) (*sstore.ShellStatePtr, map[string]string, *packet.ShellState, *packet.ShellStateDiff, error) {
|
2022-11-02 05:42:56 +01:00
|
|
|
if donePk.FinalState != nil {
|
2024-03-14 02:52:41 +01:00
|
|
|
finalState := stripScVarsFromState(donePk.FinalState)
|
|
|
|
feState := sstore.FeStateFromShellState(finalState)
|
|
|
|
statePtr := &sstore.ShellStatePtr{BaseHash: finalState.GetHashVal(false)}
|
|
|
|
return statePtr, feState, finalState, nil, nil
|
2022-11-02 05:42:56 +01:00
|
|
|
}
|
2022-11-29 03:03:02 +01:00
|
|
|
if donePk.FinalStateDiff != nil {
|
2024-03-14 02:52:41 +01:00
|
|
|
stateDiff := stripScVarsFromStateDiff(donePk.FinalStateDiff)
|
|
|
|
feState, err := msh.getFeStateFromDiff(stateDiff)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, nil, nil, err
|
|
|
|
}
|
|
|
|
fullState := msh.StateMap.GetStateByHash(stateDiff.GetShellType(), stateDiff.BaseHash)
|
|
|
|
if fullState != nil {
|
|
|
|
sstore.StoreStateBase(ctx, fullState)
|
|
|
|
}
|
|
|
|
diffHashArr := append(([]string)(nil), donePk.FinalStateDiff.DiffHashArr...)
|
|
|
|
diffHashArr = append(diffHashArr, donePk.FinalStateDiff.GetHashVal(false))
|
|
|
|
statePtr := &sstore.ShellStatePtr{BaseHash: donePk.FinalStateDiff.BaseHash, DiffHashArr: diffHashArr}
|
|
|
|
return statePtr, feState, nil, stateDiff, nil
|
2022-11-29 03:03:02 +01:00
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
return nil, nil, nil, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (msh *MShellProc) handleCmdDonePacket(rct *RunCmdType, donePk *packet.CmdDonePacketType) {
|
|
|
|
if rct == nil {
|
|
|
|
log.Printf("cmddone packet received, but no running command found for it %q\n", donePk.CK)
|
2022-07-08 01:29:14 +02:00
|
|
|
return
|
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
// this will remove from RunningCmds and from PendingStateCmds
|
|
|
|
defer msh.RemoveRunningCmd(donePk.CK)
|
|
|
|
if rct.Ephemeral && rct.EphCancled.Load() {
|
|
|
|
// do nothing when an ephemeral command is canceled
|
|
|
|
return
|
2022-10-12 08:11:43 +02:00
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
|
|
|
|
defer cancelFn()
|
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
if !rct.Ephemeral {
|
|
|
|
// only update DB for non-ephemeral commands
|
|
|
|
err := sstore.UpdateCmdDoneInfo(ctx, update, donePk.CK, donePk, sstore.CmdStatusDone)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error updating cmddone: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
screen, err := sstore.UpdateScreenFocusForDoneCmd(ctx, donePk.CK.GetGroupId(), donePk.CK.GetCmdId())
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error trying to update screen focus type: %v\n", err)
|
|
|
|
// fall-through (nothing to do)
|
|
|
|
}
|
|
|
|
if screen != nil {
|
|
|
|
update.AddUpdate(*screen)
|
|
|
|
}
|
2023-03-25 02:35:29 +01:00
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
// ephemeral commands *do* update the remote state
|
|
|
|
if donePk.FinalState != nil || donePk.FinalStateDiff != nil {
|
|
|
|
statePtr, feState, finalState, finalStateDiff, err := msh.makeStatePtrFromFinalState(ctx, donePk)
|
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error trying to read final command state: %v\n", err)
|
|
|
|
}
|
|
|
|
remoteInst, err := sstore.UpdateRemoteState(ctx, rct.SessionId, rct.ScreenId, rct.RemotePtr, feState, finalState, finalStateDiff)
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
msh.WriteToPtyBuffer("*error trying to update remotestate: %v\n", err)
|
|
|
|
// fall-through (nothing to do)
|
|
|
|
}
|
|
|
|
if remoteInst != nil {
|
2024-02-16 01:45:47 +01:00
|
|
|
update.AddUpdate(sstore.MakeSessionUpdateForRemote(rct.SessionId, remoteInst))
|
2022-11-28 09:13:00 +01:00
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
// ephemeral commands *do not* update cmd state (there is no command)
|
|
|
|
if statePtr != nil && !rct.Ephemeral {
|
|
|
|
err = sstore.UpdateCmdRtnState(ctx, donePk.CK, *statePtr)
|
2022-10-28 07:22:17 +02:00
|
|
|
if err != nil {
|
2024-03-14 02:52:41 +01:00
|
|
|
msh.WriteToPtyBuffer("*error trying to update cmd rtnstate: %v\n", err)
|
2022-10-28 07:22:17 +02:00
|
|
|
// fall-through (nothing to do)
|
|
|
|
}
|
|
|
|
}
|
2022-07-08 07:13:45 +02:00
|
|
|
}
|
2024-02-16 01:45:47 +01:00
|
|
|
scbus.MainUpdateBus.DoUpdate(update)
|
2022-07-08 01:29:14 +02:00
|
|
|
}
|
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
func (msh *MShellProc) handleCmdFinalPacket(rct *RunCmdType, finalPk *packet.CmdFinalPacketType) {
|
|
|
|
if rct == nil {
|
|
|
|
// this is somewhat expected, since cmddone should have removed the running command
|
|
|
|
return
|
|
|
|
}
|
2022-11-27 23:12:15 +01:00
|
|
|
defer msh.RemoveRunningCmd(finalPk.CK)
|
2024-03-14 02:52:41 +01:00
|
|
|
if rct.Ephemeral {
|
|
|
|
// just remove the running command, but there is no DB state to update in this case
|
|
|
|
return
|
|
|
|
}
|
2023-03-21 03:20:57 +01:00
|
|
|
rtnCmd, err := sstore.GetCmdByScreenId(context.Background(), finalPk.CK.GetGroupId(), finalPk.CK.GetCmdId())
|
2022-11-27 23:12:15 +01:00
|
|
|
if err != nil {
|
|
|
|
log.Printf("error calling GetCmdById in handleCmdFinalPacket: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
2023-07-31 02:16:43 +02:00
|
|
|
if rtnCmd == nil || rtnCmd.DoneTs > 0 {
|
2022-11-27 23:12:15 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
log.Printf("finalpk %s (hangup): %s\n", finalPk.CK, finalPk.Error)
|
2023-04-13 21:53:15 +02:00
|
|
|
screen, err := sstore.HangupCmd(context.Background(), finalPk.CK)
|
|
|
|
if err != nil {
|
|
|
|
log.Printf("error in hangup-cmd in handleCmdFinalPacket: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
2023-03-21 03:20:57 +01:00
|
|
|
rtnCmd, err = sstore.GetCmdByScreenId(context.Background(), finalPk.CK.GetGroupId(), finalPk.CK.GetCmdId())
|
2022-11-27 23:12:15 +01:00
|
|
|
if err != nil {
|
|
|
|
log.Printf("error getting cmd(2) in handleCmdFinalPacket: %v\n", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if rtnCmd == nil {
|
|
|
|
log.Printf("error getting cmd(2) in handleCmdFinalPacket (not found)\n")
|
|
|
|
return
|
|
|
|
}
|
2024-02-16 01:45:47 +01:00
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
update.AddUpdate(*rtnCmd)
|
2023-04-13 21:53:15 +02:00
|
|
|
if screen != nil {
|
2024-02-16 01:45:47 +01:00
|
|
|
update.AddUpdate(*screen)
|
2023-04-13 21:53:15 +02:00
|
|
|
}
|
2024-01-28 22:47:36 +01:00
|
|
|
go pushNumRunningCmdsUpdate(&finalPk.CK, -1)
|
2024-02-16 01:45:47 +01:00
|
|
|
scbus.MainUpdateBus.DoUpdate(update)
|
2022-11-27 23:12:15 +01:00
|
|
|
}
|
|
|
|
|
2024-01-27 01:25:21 +01:00
|
|
|
func (msh *MShellProc) ResetDataPos(ck base.CommandKey) {
|
|
|
|
msh.DataPosMap.Delete(ck)
|
|
|
|
}
|
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
func (msh *MShellProc) handleDataPacket(rct *RunCmdType, dataPk *packet.DataPacketType, dataPosMap *utilfn.SyncMap[base.CommandKey, int64]) {
|
|
|
|
if rct == nil {
|
|
|
|
ack := makeDataAckPacket(dataPk.CK, dataPk.FdNum, 0, fmt.Errorf("no running cmd found"))
|
|
|
|
msh.ServerProc.Input.SendPacket(ack)
|
|
|
|
return
|
|
|
|
}
|
2022-09-05 23:49:23 +02:00
|
|
|
realData, err := base64.StdEncoding.DecodeString(dataPk.Data64)
|
|
|
|
if err != nil {
|
|
|
|
ack := makeDataAckPacket(dataPk.CK, dataPk.FdNum, 0, err)
|
|
|
|
msh.ServerProc.Input.SendPacket(ack)
|
|
|
|
return
|
|
|
|
}
|
2024-03-14 02:52:41 +01:00
|
|
|
if rct.Ephemeral {
|
|
|
|
ack := makeDataAckPacket(dataPk.CK, dataPk.FdNum, len(realData), nil)
|
|
|
|
msh.ServerProc.Input.SendPacket(ack)
|
|
|
|
return
|
|
|
|
}
|
2022-09-05 23:49:23 +02:00
|
|
|
var ack *packet.DataAckPacketType
|
|
|
|
if len(realData) > 0 {
|
2024-01-27 01:25:21 +01:00
|
|
|
dataPos := dataPosMap.Get(dataPk.CK)
|
2024-03-14 02:52:41 +01:00
|
|
|
update, err := sstore.AppendToCmdPtyBlob(context.Background(), rct.ScreenId, dataPk.CK.GetCmdId(), realData, dataPos)
|
2022-08-20 02:14:53 +02:00
|
|
|
if err != nil {
|
2022-09-05 23:49:23 +02:00
|
|
|
ack = makeDataAckPacket(dataPk.CK, dataPk.FdNum, 0, err)
|
|
|
|
} else {
|
|
|
|
ack = makeDataAckPacket(dataPk.CK, dataPk.FdNum, len(realData), nil)
|
|
|
|
}
|
2024-01-27 01:25:21 +01:00
|
|
|
utilfn.IncSyncMap(dataPosMap, dataPk.CK, int64(len(realData)))
|
2022-09-05 23:49:23 +02:00
|
|
|
if update != nil {
|
2024-02-16 01:45:47 +01:00
|
|
|
scbus.MainUpdateBus.DoScreenUpdate(dataPk.CK.GetGroupId(), update)
|
2022-07-08 07:13:45 +02:00
|
|
|
}
|
|
|
|
}
|
2022-09-05 23:49:23 +02:00
|
|
|
if ack != nil {
|
|
|
|
msh.ServerProc.Input.SendPacket(ack)
|
|
|
|
}
|
2022-11-27 23:12:15 +01:00
|
|
|
}
|
|
|
|
|
2023-04-13 21:53:15 +02:00
|
|
|
func sendScreenUpdates(screens []*sstore.ScreenType) {
|
|
|
|
for _, screen := range screens {
|
2024-02-16 01:45:47 +01:00
|
|
|
update := scbus.MakeUpdatePacket()
|
|
|
|
update.AddUpdate(*screen)
|
|
|
|
scbus.MainUpdateBus.DoUpdate(update)
|
2023-04-13 21:53:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-14 02:52:41 +01:00
|
|
|
func (msh *MShellProc) processSinglePacket(pk packet.PacketType) {
|
|
|
|
if _, ok := pk.(*packet.DataAckPacketType); ok {
|
|
|
|
// TODO process ack (need to keep track of buffer size for sending)
|
|
|
|
// this is low priority though since most input is coming from keyboard and won't overflow this buffer
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if dataPk, ok := pk.(*packet.DataPacketType); ok {
|
|
|
|
runCmdUpdateFn(dataPk.CK, func() {
|
|
|
|
rct := msh.GetRunningCmd(dataPk.CK)
|
|
|
|
msh.handleDataPacket(rct, dataPk, msh.DataPosMap)
|
|
|
|
})
|
|
|
|
go pushStatusIndicatorUpdate(&dataPk.CK, sstore.StatusIndicatorLevel_Output)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if donePk, ok := pk.(*packet.CmdDonePacketType); ok {
|
|
|
|
runCmdUpdateFn(donePk.CK, func() {
|
|
|
|
rct := msh.GetRunningCmd(donePk.CK)
|
|
|
|
msh.handleCmdDonePacket(rct, donePk)
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if finalPk, ok := pk.(*packet.CmdFinalPacketType); ok {
|
|
|
|
runCmdUpdateFn(finalPk.CK, func() {
|
|
|
|
rct := msh.GetRunningCmd(finalPk.CK)
|
|
|
|
msh.handleCmdFinalPacket(rct, finalPk)
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if msgPk, ok := pk.(*packet.MessagePacketType); ok {
|
|
|
|
msh.WriteToPtyBuffer("msg> [remote %s] [%s] %s\n", msh.GetRemoteName(), msgPk.CK, msgPk.Message)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if rawPk, ok := pk.(*packet.RawPacketType); ok {
|
|
|
|
msh.WriteToPtyBuffer("stderr> [remote %s] %s\n", msh.GetRemoteName(), rawPk.Data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.WriteToPtyBuffer("MSH> [remote %s] unhandled packet %s\n", msh.GetRemoteName(), packet.AsString(pk))
|
|
|
|
}
|
|
|
|
|
2022-09-04 22:51:49 +02:00
|
|
|
func (msh *MShellProc) ProcessPackets() {
|
|
|
|
defer msh.WithLock(func() {
|
|
|
|
if msh.Status == StatusConnected {
|
|
|
|
msh.Status = StatusDisconnected
|
2022-07-02 02:38:36 +02:00
|
|
|
}
|
2023-04-13 21:53:15 +02:00
|
|
|
screens, err := sstore.HangupRunningCmdsByRemoteId(context.Background(), msh.Remote.RemoteId)
|
2022-07-08 01:29:14 +02:00
|
|
|
if err != nil {
|
2022-09-15 08:10:35 +02:00
|
|
|
msh.writeToPtyBuffer_nolock("error calling HUP on cmds %v\n", err)
|
2022-07-08 01:29:14 +02:00
|
|
|
}
|
2022-09-04 22:51:49 +02:00
|
|
|
msh.notifyHangups_nolock()
|
2022-09-05 23:49:23 +02:00
|
|
|
go msh.NotifyRemoteUpdate()
|
2023-04-13 21:53:15 +02:00
|
|
|
if len(screens) > 0 {
|
|
|
|
go sendScreenUpdates(screens)
|
|
|
|
}
|
2022-07-02 02:38:36 +02:00
|
|
|
})
|
2022-09-04 22:51:49 +02:00
|
|
|
for pk := range msh.ServerProc.Output.MainCh {
|
2024-03-14 02:52:41 +01:00
|
|
|
msh.processSinglePacket(pk)
|
2022-07-01 21:17:19 +02:00
|
|
|
}
|
|
|
|
}
|
2022-08-24 06:05:49 +02:00
|
|
|
|
2022-08-24 11:14:16 +02:00
|
|
|
// returns number of chars (including braces) for brace-expr
|
|
|
|
func getBracedStr(runeStr []rune) int {
|
|
|
|
if len(runeStr) < 3 {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
if runeStr[0] != '{' {
|
|
|
|
return 0
|
2022-08-24 06:05:49 +02:00
|
|
|
}
|
2022-08-24 11:14:16 +02:00
|
|
|
for i := 1; i < len(runeStr); i++ {
|
|
|
|
if runeStr[i] == '}' {
|
|
|
|
if i == 1 { // cannot have {}
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
return i + 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
func isDigit(r rune) bool {
|
|
|
|
return r >= '0' && r <= '9' // just check ascii digits (not unicode)
|
|
|
|
}
|
|
|
|
|
2022-10-17 08:51:04 +02:00
|
|
|
func EvalPrompt(promptFmt string, vars map[string]string, state *packet.ShellState) string {
|
2022-08-24 11:14:16 +02:00
|
|
|
var buf bytes.Buffer
|
|
|
|
promptRunes := []rune(promptFmt)
|
|
|
|
for i := 0; i < len(promptRunes); i++ {
|
|
|
|
ch := promptRunes[i]
|
|
|
|
if ch == '\\' && i != len(promptRunes)-1 {
|
|
|
|
nextCh := promptRunes[i+1]
|
|
|
|
if nextCh == 'x' || nextCh == 'y' {
|
|
|
|
nr := getBracedStr(promptRunes[i+2:])
|
|
|
|
if nr > 0 {
|
|
|
|
escCode := string(promptRunes[i+1 : i+1+nr+1]) // start at "x" or "y", extend nr+1 runes
|
|
|
|
escStr := evalPromptEsc(escCode, vars, state)
|
|
|
|
buf.WriteString(escStr)
|
|
|
|
i += nr + 1
|
|
|
|
continue
|
|
|
|
} else {
|
|
|
|
buf.WriteRune(ch) // invalid escape, so just write ch and move on
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
} else if isDigit(nextCh) {
|
|
|
|
if len(promptRunes) >= i+4 && isDigit(promptRunes[i+2]) && isDigit(promptRunes[i+3]) {
|
|
|
|
i += 3
|
|
|
|
escStr := evalPromptEsc(string(promptRunes[i+1:i+4]), vars, state)
|
|
|
|
buf.WriteString(escStr)
|
|
|
|
continue
|
|
|
|
} else {
|
|
|
|
buf.WriteRune(ch) // invalid escape, so just write ch and move on
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
i += 1
|
|
|
|
escStr := evalPromptEsc(string(nextCh), vars, state)
|
|
|
|
buf.WriteString(escStr)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buf.WriteRune(ch)
|
|
|
|
}
|
|
|
|
return buf.String()
|
|
|
|
}
|
|
|
|
|
2022-10-17 08:51:04 +02:00
|
|
|
func evalPromptEsc(escCode string, vars map[string]string, state *packet.ShellState) string {
|
2022-08-24 06:05:49 +02:00
|
|
|
if strings.HasPrefix(escCode, "x{") && strings.HasSuffix(escCode, "}") {
|
|
|
|
varName := escCode[2 : len(escCode)-1]
|
|
|
|
return vars[varName]
|
|
|
|
}
|
|
|
|
if strings.HasPrefix(escCode, "y{") && strings.HasSuffix(escCode, "}") {
|
2022-08-24 11:14:16 +02:00
|
|
|
if state == nil {
|
|
|
|
return ""
|
|
|
|
}
|
2022-08-24 06:05:49 +02:00
|
|
|
varName := escCode[2 : len(escCode)-1]
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
varMap := shellenv.ShellVarMapFromState(state)
|
2022-08-24 06:05:49 +02:00
|
|
|
return varMap[varName]
|
|
|
|
}
|
|
|
|
if escCode == "h" {
|
|
|
|
return vars["remoteshorthost"]
|
|
|
|
}
|
|
|
|
if escCode == "H" {
|
|
|
|
return vars["remotehost"]
|
|
|
|
}
|
|
|
|
if escCode == "s" {
|
|
|
|
return "mshell"
|
|
|
|
}
|
|
|
|
if escCode == "u" {
|
|
|
|
return vars["remoteuser"]
|
|
|
|
}
|
|
|
|
if escCode == "w" {
|
2022-08-24 11:14:16 +02:00
|
|
|
if state == nil {
|
|
|
|
return "?"
|
|
|
|
}
|
|
|
|
return replaceHomePath(state.Cwd, vars["home"])
|
2022-08-24 06:05:49 +02:00
|
|
|
}
|
|
|
|
if escCode == "W" {
|
2022-08-24 11:14:16 +02:00
|
|
|
if state == nil {
|
|
|
|
return "?"
|
|
|
|
}
|
|
|
|
return path.Base(replaceHomePath(state.Cwd, vars["home"]))
|
2022-08-24 06:05:49 +02:00
|
|
|
}
|
|
|
|
if escCode == "$" {
|
2022-08-24 11:14:16 +02:00
|
|
|
if vars["remoteuser"] == "root" || vars["sudo"] == "1" {
|
2022-08-24 06:05:49 +02:00
|
|
|
return "#"
|
|
|
|
} else {
|
|
|
|
return "$"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(escCode) == 3 {
|
|
|
|
// \nnn escape
|
|
|
|
ival, err := strconv.ParseInt(escCode, 8, 32)
|
|
|
|
if err != nil {
|
|
|
|
return escCode
|
|
|
|
}
|
2023-12-27 22:11:53 +01:00
|
|
|
if ival >= 0 && ival <= 255 {
|
|
|
|
return string([]byte{byte(ival)})
|
|
|
|
} else {
|
|
|
|
// if it was out of range just return the string (invalid escape)
|
|
|
|
return escCode
|
|
|
|
}
|
2022-08-24 06:05:49 +02:00
|
|
|
}
|
|
|
|
if escCode == "e" {
|
|
|
|
return "\033"
|
|
|
|
}
|
|
|
|
if escCode == "n" {
|
|
|
|
return "\n"
|
|
|
|
}
|
|
|
|
if escCode == "r" {
|
|
|
|
return "\r"
|
|
|
|
}
|
|
|
|
if escCode == "a" {
|
|
|
|
return "\007"
|
|
|
|
}
|
|
|
|
if escCode == "\\" {
|
|
|
|
return "\\"
|
|
|
|
}
|
|
|
|
if escCode == "[" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
if escCode == "]" {
|
|
|
|
return ""
|
|
|
|
}
|
2022-08-24 11:14:16 +02:00
|
|
|
|
|
|
|
// we don't support date/time escapes (d, t, T, @), version escapes (v, V), cmd number (#, !), terminal device (l), jobs (j)
|
2022-08-24 06:05:49 +02:00
|
|
|
return "(" + escCode + ")"
|
|
|
|
}
|
2022-11-28 09:13:00 +01:00
|
|
|
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
func (msh *MShellProc) getFullState(shellType string, stateDiff *packet.ShellStateDiff) (*packet.ShellState, error) {
|
|
|
|
baseState := msh.StateMap.GetStateByHash(shellType, stateDiff.BaseHash)
|
2022-11-28 09:13:00 +01:00
|
|
|
if baseState != nil && len(stateDiff.DiffHashArr) == 0 {
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
sapi, err := shellapi.MakeShellApi(baseState.GetShellType())
|
|
|
|
newState, err := sapi.ApplyShellStateDiff(baseState, stateDiff)
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
return newState, nil
|
2022-11-28 09:13:00 +01:00
|
|
|
} else {
|
2023-12-08 22:39:13 +01:00
|
|
|
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{BaseHash: stateDiff.BaseHash, DiffHashArr: stateDiff.DiffHashArr})
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
sapi, err := shellapi.MakeShellApi(fullState.GetShellType())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
newState, err := sapi.ApplyShellStateDiff(fullState, stateDiff)
|
|
|
|
return newState, nil
|
2022-11-28 09:13:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// internal func, first tries the StateMap, otherwise will fallback on sstore.GetFullState
|
2023-04-12 08:54:18 +02:00
|
|
|
func (msh *MShellProc) getFeStateFromDiff(stateDiff *packet.ShellStateDiff) (map[string]string, error) {
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
baseState := msh.StateMap.GetStateByHash(stateDiff.GetShellType(), stateDiff.BaseHash)
|
2022-11-28 09:13:00 +01:00
|
|
|
if baseState != nil && len(stateDiff.DiffHashArr) == 0 {
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
sapi, err := shellapi.MakeShellApi(baseState.GetShellType())
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
newState, err := sapi.ApplyShellStateDiff(baseState, stateDiff)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return sstore.FeStateFromShellState(newState), nil
|
2022-11-28 09:13:00 +01:00
|
|
|
} else {
|
2023-12-08 22:39:13 +01:00
|
|
|
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{BaseHash: stateDiff.BaseHash, DiffHashArr: stateDiff.DiffHashArr})
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
sapi, err := shellapi.MakeShellApi(fullState.GetShellType())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
newState, err := sapi.ApplyShellStateDiff(fullState, stateDiff)
|
2022-11-28 09:13:00 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
zsh support (#227)
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
2024-01-17 01:11:04 +01:00
|
|
|
return sstore.FeStateFromShellState(newState), nil
|
2022-11-28 09:13:00 +01:00
|
|
|
}
|
|
|
|
}
|
2022-12-28 22:56:19 +01:00
|
|
|
|
|
|
|
func (msh *MShellProc) TryAutoConnect() error {
|
|
|
|
if msh.IsConnected() {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rcopy := msh.GetRemoteCopy()
|
2022-12-29 01:59:54 +01:00
|
|
|
if rcopy.ConnectMode == sstore.ConnectModeManual {
|
2022-12-28 22:56:19 +01:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
var err error
|
|
|
|
msh.WithLock(func() {
|
|
|
|
if msh.NumTryConnect > 5 {
|
2022-12-29 01:59:54 +01:00
|
|
|
err = fmt.Errorf("too many unsuccessful tries")
|
2022-12-28 22:56:19 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
msh.NumTryConnect++
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2023-01-23 22:47:57 +01:00
|
|
|
msh.Launch(false)
|
2022-12-29 01:59:54 +01:00
|
|
|
if !msh.IsConnected() {
|
|
|
|
return fmt.Errorf("error connecting")
|
|
|
|
}
|
2022-12-28 22:56:19 +01:00
|
|
|
return nil
|
|
|
|
}
|
2022-12-31 02:01:17 +01:00
|
|
|
|
|
|
|
func (msh *MShellProc) GetDisplayName() string {
|
|
|
|
rcopy := msh.GetRemoteCopy()
|
|
|
|
return rcopy.GetName()
|
|
|
|
}
|
2024-01-17 19:07:01 +01:00
|
|
|
|
|
|
|
// Identify the screen for a given CommandKey and push the given status indicator update for that screen
|
|
|
|
func pushStatusIndicatorUpdate(ck *base.CommandKey, level sstore.StatusIndicatorLevel) {
|
|
|
|
screenId := ck.GetGroupId()
|
2024-01-28 22:47:36 +01:00
|
|
|
err := sstore.SetStatusIndicatorLevel(context.Background(), screenId, level, false)
|
|
|
|
if err != nil {
|
|
|
|
log.Printf("error setting status indicator level: %v\n", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func pushNumRunningCmdsUpdate(ck *base.CommandKey, delta int) {
|
|
|
|
screenId := ck.GetGroupId()
|
|
|
|
sstore.IncrementNumRunningCmds(screenId, delta)
|
2024-01-17 19:07:01 +01:00
|
|
|
}
|