Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-04-03 18:17:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

return defined bash aliases in initpk

Browse Source
This commit is contained in:
sawka 2022-10-15 13:45:52 -07:00
parent d8e7c915e5
commit 1c2c8c2f4d
3 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main-mshell.go
View File

@ -452,10 +452,19 @@ func handleEnv() (int, error) {
if err != nil {
return 1, err
}
fmt.Printf("%s\x00", cwd)
fmt.Printf("%s\x00\x00", cwd)
fullEnv := os.Environ()
var linePrinted bool
for _, envLine := range fullEnv {
fmt.Printf("%s\x00", envLine)
if envLine != "" {
fmt.Printf("%s\x00", envLine)
linePrinted = true
}
}
if linePrinted {
fmt.Printf("\x00")
} else {
fmt.Printf("\x00\x00")
}
return 0, nil
}

1
pkg/packet/packet.go
View File

@ -441,6 +441,7 @@ type InitPacketType struct {
HomeDir string `json:"homedir,omitempty"`
Cwd string `json:"cwd,omitempty"`
Env0 []byte `json:"env0,omitempty"` // "env -0" format
Aliases string `json:"aliases,omitempty"`
User string `json:"user,omitempty"`
HostName string `json:"hostname,omitempty"`
NotFound bool `json:"notfound,omitempty"`

37
pkg/shexec/shexec.go
View File

@ -81,6 +81,12 @@ const RunCommandFmt = `%s`
const RunSudoCommandFmt = `sudo -n -C %d bash /dev/fd/%d`
const RunSudoPasswordCommandFmt = `cat /dev/fd/%d | sudo -k -S -C %d bash -c "echo '[from-mshell]'; exec %d>&-; bash /dev/fd/%d < /dev/fd/%d"`
type CurrentState struct {
Cwd string
Env0 []byte
Aliases string
}
type ShExecType struct {
StartTs time.Time
CK base.CommandKey
@ -1221,12 +1227,13 @@ func MakeInitPacket() *packet.InitPacketType {
func MakeServerInitPacket() (*packet.InitPacketType, error) {
var err error
initPacket := MakeInitPacket()
cwd, env, err := GetCurrentState()
cstate, err := GetCurrentState()
if err != nil {
return nil, err
}
initPacket.Cwd = cwd
initPacket.Env0 = env
initPacket.Cwd = cstate.Cwd
initPacket.Env0 = cstate.Env0
initPacket.Aliases = cstate.Aliases
initPacket.RemoteId, err = base.GetRemoteId()
if err != nil {
return nil, err
@ -1315,20 +1322,28 @@ func runSimpleCmdInPty(ecmd *exec.Cmd) ([]byte, error) {
return outputBuf.Bytes(), nil
}
func GetCurrentState() (string, []byte, error) {
func GetCurrentState() (*CurrentState, error) {
execFile, err := os.Executable()
if err != nil {
return "", nil, fmt.Errorf("cannot find local mshell executable: %w", err)
return nil, fmt.Errorf("cannot find local mshell executable: %w", err)
}
ctx, _ := context.WithTimeout(context.Background(), GetStateTimeout)
ecmd := exec.CommandContext(ctx, "bash", "-l", "-i", "-c", fmt.Sprintf("%s --env", shellescape.Quote(execFile)))
ecmd := exec.CommandContext(ctx, "bash", "-l", "-i", "-c", fmt.Sprintf("%s --env; alias -p", shellescape.Quote(execFile)))
outputBytes, err := runSimpleCmdInPty(ecmd)
if err != nil {
return "", nil, err
return nil, err
}
idx := bytes.Index(outputBytes, []byte{0})
if idx == -1 {
return "", nil, fmt.Errorf("invalid current state output no NUL byte separator")
firstSep := bytes.Index(outputBytes, []byte{0, 0})
if firstSep == -1 {
return nil, fmt.Errorf("invalid current state output no NUL separator")
}
return string(outputBytes[0:idx]), outputBytes[idx+1:], nil
cwd := string(outputBytes[0:firstSep])
secondSep := bytes.Index(outputBytes[firstSep+2:], []byte{0, 0})
if secondSep == -1 {
return nil, fmt.Errorf("invalid current state output, no second NUL separator")
}
secondSep += firstSep + 2
env0 := outputBytes[firstSep+2 : secondSep+1] // grab one of the NUL bytes (end of env0)
aliases := string(outputBytes[secondSep+2:])
return &CurrentState{Cwd: cwd, Env0: env0, Aliases: aliases}, nil
}