mirror of
https://github.com/tailscale/tailscale.git
synced 2025-01-08 09:07:44 +00:00
cmd/tailscale/cli: fix ssh CLI command breaking the Wasm build
Adds a stub for syscall.Exec when GOOS=js. We also had a separate branch for Windows, might as well use the same mechanism there too. For #3157 Signed-off-by: Mihai Parparita <mihai@tailscale.com>
This commit is contained in:
parent
cc91a05686
commit
eda647cb47
@ -16,7 +16,6 @@
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"github.com/peterbourgon/ff/v3/ffcli"
|
"github.com/peterbourgon/ff/v3/ffcli"
|
||||||
"inet.af/netaddr"
|
"inet.af/netaddr"
|
||||||
@ -116,24 +115,7 @@ func runSSH(ctx context.Context, args []string) error {
|
|||||||
log.Printf("Running: %q, %q ...", ssh, argv)
|
log.Printf("Running: %q, %q ...", ssh, argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if runtime.GOOS == "windows" {
|
return execSSH(ssh, argv)
|
||||||
// Don't use syscall.Exec on Windows.
|
|
||||||
cmd := exec.Command(ssh, argv[1:]...)
|
|
||||||
cmd.Stdin = os.Stdin
|
|
||||||
cmd.Stdout = os.Stdout
|
|
||||||
cmd.Stderr = os.Stderr
|
|
||||||
var ee *exec.ExitError
|
|
||||||
err := cmd.Run()
|
|
||||||
if errors.As(err, &ee) {
|
|
||||||
os.Exit(ee.ExitCode())
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := syscall.Exec(ssh, argv, os.Environ()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return errors.New("unreachable")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeKnownHosts(st *ipnstate.Status) (knownHostsFile string, err error) {
|
func writeKnownHosts(st *ipnstate.Status) (knownHostsFile string, err error) {
|
||||||
|
21
cmd/tailscale/cli/ssh_exec.go
Normal file
21
cmd/tailscale/cli/ssh_exec.go
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
//go:build !js && !windows
|
||||||
|
// +build !js,!windows
|
||||||
|
|
||||||
|
package cli
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
func execSSH(ssh string, argv []string) error {
|
||||||
|
if err := syscall.Exec(ssh, argv, os.Environ()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return errors.New("unreachable")
|
||||||
|
}
|
13
cmd/tailscale/cli/ssh_exec_js.go
Normal file
13
cmd/tailscale/cli/ssh_exec_js.go
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cli
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
func execSSH(ssh string, argv []string) error {
|
||||||
|
return errors.New("Not implemented")
|
||||||
|
}
|
25
cmd/tailscale/cli/ssh_exec_windows.go
Normal file
25
cmd/tailscale/cli/ssh_exec_windows.go
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cli
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
)
|
||||||
|
|
||||||
|
func execSSH(ssh string, argv []string) error {
|
||||||
|
// Don't use syscall.Exec on Windows, it's not fully implemented.
|
||||||
|
cmd := exec.Command(ssh, argv[1:]...)
|
||||||
|
cmd.Stdin = os.Stdin
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
var ee *exec.ExitError
|
||||||
|
err := cmd.Run()
|
||||||
|
if errors.As(err, &ee) {
|
||||||
|
os.Exit(ee.ExitCode())
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user