Have the setup's sudo grant remove itself within the hour, and keep a target from reading as an ssh option

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ilker ManapandClaude Opus 5.5 committed 2026-10-04 10:17:52 +02:00
1 parent 1f406247e4
commit ebf437a36a
4 files changed
+47 -7

No files matched your search

+24 -6
View File
@@ -227,6 +227,9 @@ func (g *GoSSH) hostKeyCallback() (ssh.HostKeyCallback, error) {
// sudoersDrop is the grant PrepareSudo writes and RevokeSudo removes.
const sudoersDrop = "/etc/sudoers.d/llmgw-setup"
// sudoGrantLife is how long the grant lasts if nothing removes it sooner.
const sudoGrantLife = time.Hour
// CanSudo reports whether the user can sudo without a password now.
func (g *GoSSH) CanSudo(ctx context.Context) bool {
_, err := g.Run(ctx, "sudo -n true", nil)
@@ -245,17 +248,14 @@ func (g *GoSSH) PrepareSudo(ctx context.Context) error {
if g.SudoPassword == "" {
return fmt.Errorf("%s cannot use sudo without a password, and none was given", g.User)
}
line := fmt.Sprintf("%s ALL=(ALL) NOPASSWD:ALL", g.User)
// Checked by visudo before it is put in place: a broken file in
// sudoers.d breaks sudo for everyone on the machine.
inner := fmt.Sprintf("umask 337; printf '%%s\\n' %s %s > %[3]s.new && visudo -cf %[3]s.new >/dev/null && mv -f %[3]s.new %[3]s",
shellQuote("# llmgw setup: removed when it finishes"), shellQuote(line), sudoersDrop)
script := "sudo -S -p '' sh -c " + shellQuote(inner)
script := "sudo -S -p '' sh -c " + shellQuote(sudoGrantScript(g.User))
if out, err := g.Run(ctx, script, []byte(g.SudoPassword+"\n")); err != nil {
return fmt.Errorf("sudo with the password given failed on %s: %v: %s", g.Addr, err, strings.TrimSpace(string(out)))
}
g.mu.Lock()
g.sudoGrant = true
// Not needed again: the grant stands in for it from here on.
g.SudoPassword = ""
g.mu.Unlock()
return nil
}
@@ -276,3 +276,21 @@ func (g *GoSSH) RevokeSudo(ctx context.Context) error {
g.mu.Unlock()
return nil
}
// sudoGrantScript writes the grant, run as root.
func sudoGrantScript(user string) string {
line := fmt.Sprintf("%s ALL=(ALL) NOPASSWD:ALL", user)
// Checked by visudo before it is put in place: a broken file in
// sudoers.d breaks sudo for everyone on the machine.
//
// And it removes itself an hour later whatever happens to this process:
// RevokeSudo is called when the setup finishes, and a setup that crashes
// or is interrupted never gets there — which would leave a permanent
// passwordless root behind.
inner := fmt.Sprintf("umask 337; printf '%%s\\n' %s %s > %[3]s.new && visudo -cf %[3]s.new >/dev/null && mv -f %[3]s.new %[3]s && "+
"{ systemd-run --quiet --on-active=%[4]d /bin/rm -f %[3]s >/dev/null 2>&1 || "+
"(setsid nohup sh -c 'sleep %[4]d; rm -f %[3]s' >/dev/null 2>&1 &) ; }",
shellQuote("# llmgw setup: removed when it finishes, or within the hour"), shellQuote(line), sudoersDrop,
int(sudoGrantLife.Seconds()))
return inner
}
+14
View File
@@ -8,6 +8,7 @@ import (
"errors"
"net/http"
"net/http/httptest"
"os/exec"
"regexp"
"runtime"
"strings"
@@ -375,3 +376,16 @@ func TestTheFabricsGivenAreCheckedAsDeclared(t *testing.T) {
t.Errorf("doctor was not told the fabric: %v", m.scripts)
}
}
func TestTheSudoGrantRemovesItselfWithinTheHour(t *testing.T) {
inner := sudoGrantScript("ilker")
if !strings.Contains(inner, "--on-active=3600") || !strings.Contains(inner, "sleep 3600; rm -f "+sudoersDrop) {
t.Errorf("no removal scheduled: %s", inner)
}
if !strings.Contains(inner, "visudo -cf") {
t.Error("written without visudo's check")
}
if out, err := exec.Command("sh", "-n", "-c", inner).CombinedOutput(); err != nil {
t.Errorf("not shell: %v %s\n%s", err, out, inner)
}
}
+3 -1
View File
@@ -41,7 +41,9 @@ func (s *SSH) Run(ctx context.Context, script string, stdin []byte) ([]byte, err
if s.User != "" {
target = s.User + "@" + s.Addr
}
args := append(append([]string{}, sshOptions...), target, "sh", "-c", shellQuote(script))
// "--" before the target: an address beginning with "-" is not read as
// an option.
args := append(append([]string{}, sshOptions...), "--", target, "sh", "-c", shellQuote(script))
cmd := exec.CommandContext(ctx, "ssh", args...)
if stdin != nil {
cmd.Stdin = bytes.NewReader(stdin)