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

only send 1 line from pw file, explicitly close pw file descriptor before running command

Browse Source
This commit is contained in:
sawka 2022-06-27 15:59:14 -07:00
parent 0f5ee87a76
commit ec4bd5eaa1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main-mshell.go
View File

@ -7,6 +7,7 @@
package main package main
import ( import (
"bytes"
"fmt" "fmt"
"os" "os"
"os/signal" "os/signal"
@ -347,7 +348,10 @@ func parseClientOpts() (*shexec.ClientOpts, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot read --sudo-with-passfile file '%s': %w", fileName, err) return nil, fmt.Errorf("cannot read --sudo-with-passfile file '%s': %w", fileName, err)
} }
opts.SudoPw = string(contents) if newlineIdx := bytes.Index(contents, []byte{'\n'}); newlineIdx != -1 {
contents = contents[0:newlineIdx]
}
opts.SudoPw = string(contents) + "\n"
continue continue
} }
if argStr == "--" { if argStr == "--" {

9
pkg/shexec/shexec.go
View File

@ -42,8 +42,8 @@ fi
` `
const RunCommandFmt = `%s` const RunCommandFmt = `%s`
const RunSudoCommandFmt = `sudo -C %d bash /dev/fd/%d` const RunSudoCommandFmt = `sudo -n -C %d bash /dev/fd/%d`
const RunSudoPasswordCommandFmt = `cat /dev/fd/%d | sudo -S -C %d bash -c "echo '[from-mshell]'; bash /dev/fd/%d < /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 ShExecType struct { type ShExecType struct {
Lock *sync.Mutex Lock *sync.Mutex
@ -281,7 +281,7 @@ func (opts *ClientOpts) MakeRunPacket() (*packet.RunPacketType, error) {
opts.Fds = append(opts.Fds, commandStdinRfd) opts.Fds = append(opts.Fds, commandStdinRfd)
opts.CommandStdinFdNum = commandStdinFdNum opts.CommandStdinFdNum = commandStdinFdNum
maxFdNum := opts.MaxFdNum() maxFdNum := opts.MaxFdNum()
runPacket.Command = fmt.Sprintf(RunSudoPasswordCommandFmt, pwFdNum, maxFdNum+1, commandFdNum, commandStdinFdNum) runPacket.Command = fmt.Sprintf(RunSudoPasswordCommandFmt, pwFdNum, maxFdNum+1, pwFdNum, commandFdNum, commandStdinFdNum)
runPacket.Fds = opts.Fds runPacket.Fds = opts.Fds
return runPacket, nil return runPacket, nil
} else { } else {
@ -423,6 +423,9 @@ func RunClientSSHCommandAndWait(opts *ClientOpts) (*packet.CmdDonePacketType, er
return nil, fmt.Errorf("invalid remote mshell version 'v%s', must be v0.1.0", initPk.Version) return nil, fmt.Errorf("invalid remote mshell version 'v%s', must be v0.1.0", initPk.Version)
} }
versionOk = true versionOk = true
if opts.Debug {
fmt.Printf("VERSION> %s\n", initPk.Version)
}
break break
} }
} }