lordwelch/breakglass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lordwelch:67b8cd24490021a08ee60c424b7a5e587a5421f6
Branches Tags
lordwelch:main
...
compare: lordwelch:main
Branches Tags
lordwelch:main

2 Commits
67b8cd2449 ... main

Author SHA1 Message Date
Timmy Welch
e452de8806 Fix check shell before executing
Some checks failed
Push / CI (push) Has been cancelled
Details
2025-07-12 18:03:48 -07:00
Timmy Welch
88cba45310 Check shell before executing
Some checks failed
Push / CI (push) Has been cancelled
Details
2025-07-12 16:59:32 -07:00
1 changed files with 12 additions and 3 deletions
Expand all files Collapse all files

15
ssh.go
View File

@ -14,6 +14,7 @@ import (
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
"time"
"unsafe" "unsafe"
"github.com/gokrazy/gokrazy" "github.com/gokrazy/gokrazy"
@ -220,6 +221,14 @@ type exitStatus struct {
Status uint32 Status uint32
} }
func shellWorks(shell string) bool {
ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
defer cancel()
cmd := exec.CommandContext(ctx, shell, "-c", "exit 58")
cmd.Run()
return cmd.ProcessState != nil && cmd.ProcessState.ExitCode() == 58
}
func findShell() string { func findShell() string {
if _, err := os.Stat(wellKnownBusybox); err == nil { if _, err := os.Stat(wellKnownBusybox); err == nil {
// Install busybox to /bin to provide the typical userspace utilities // Install busybox to /bin to provide the typical userspace utilities
@ -229,13 +238,13 @@ func findShell() string {
// fallthrough, we don't return /bin/sh as we read /etc/passwd // fallthrough, we don't return /bin/sh as we read /etc/passwd
} }
} }
if _, err := exec.LookPath(shell); path.IsAbs(shell) && err == nil { if _, err := exec.LookPath(shell); path.IsAbs(shell) && shellWorks(shell) && err == nil {
return shell return shell
} }
if path, err := exec.LookPath("bash"); err == nil { if path, err := exec.LookPath("bash"); shellWorks(path) && err == nil {
return path return path
} }
if path, err := exec.LookPath("sh"); err == nil { if path, err := exec.LookPath("sh"); shellWorks(path) && err == nil {
return path return path
} }
const wellKnownSerialShell = "/tmp/serial-busybox/ash" const wellKnownSerialShell = "/tmp/serial-busybox/ash"