guest sshd: drop DEBUG3 + StrictModes no; normalise /root perms
Previously /etc/ssh/sshd_config.d/99-banger.conf landed with: LogLevel DEBUG3 PermitRootLogin yes PubkeyAuthentication yes AuthorizedKeysFile /root/.ssh/authorized_keys StrictModes no DEBUG3 was debug leftover that floods journald in normal use. StrictModes no was a workaround for /root perm drift on the work disk — the real fix is to make those perms correct at provisioning time. New drop-in: PermitRootLogin prohibit-password PubkeyAuthentication yes PasswordAuthentication no KbdInteractiveAuthentication no AuthorizedKeysFile /root/.ssh/authorized_keys prohibit-password blocks password root login even if PasswordAuth gets flipped on elsewhere; KbdInteractiveAuth no closes the last interactive fallback; StrictModes is now on (sshd's default). normaliseHomeDirPerms chown/chmods /root to 0755 root:root at every work-disk mount (ensureAuthorizedKeyOnWorkDisk, seedAuthorizedKeyOnExt4Image); the .ssh dir also explicitly chown'd root:root. Verified end-to-end against a real VM: `sshd -T` reports strictmodes yes and all five directives match. Regression test (sshd_config_test.go) pins the allow-list and the deny-list (DEBUG3, StrictModes no, bare `PermitRootLogin yes`) so the next accidental reintroduction fails fast. README's Security section updated to reflect the new posture.
This commit is contained in:
parent
6cd52d12f4
commit
2e6e64bc04
6 changed files with 175 additions and 22 deletions
|
|
@ -34,6 +34,13 @@ func (d *Daemon) seedAuthorizedKeyOnExt4Image(ctx context.Context, imagePath str
|
|||
return "", err
|
||||
}
|
||||
|
||||
// Same rationale as in ensureAuthorizedKeyOnWorkDisk — the seed's
|
||||
// filesystem root becomes /root inside the guest, and sshd's
|
||||
// StrictModes check walks its ownership and mode.
|
||||
if err := normaliseHomeDirPerms(ctx, d.runner, mountDir); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
sshDir := filepath.Join(mountDir, ".ssh")
|
||||
if _, err := d.runner.RunSudo(ctx, "mkdir", "-p", sshDir); err != nil {
|
||||
return "", err
|
||||
|
|
@ -41,6 +48,9 @@ func (d *Daemon) seedAuthorizedKeyOnExt4Image(ctx context.Context, imagePath str
|
|||
if _, err := d.runner.RunSudo(ctx, "chmod", "700", sshDir); err != nil {
|
||||
return "", err
|
||||
}
|
||||
if _, err := d.runner.RunSudo(ctx, "chown", "0:0", sshDir); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
authorizedKeysPath := filepath.Join(sshDir, "authorized_keys")
|
||||
existing, err := d.runner.RunSudo(ctx, "cat", authorizedKeysPath)
|
||||
|
|
|
|||
59
internal/daemon/sshd_config_test.go
Normal file
59
internal/daemon/sshd_config_test.go
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
package daemon
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestSshdGuestConfig_Hardened is a regression guard for the guest
|
||||
// SSH posture. An earlier version shipped `LogLevel DEBUG3` and
|
||||
// `StrictModes no`; both are gone and must not come back without an
|
||||
// explicit call-out.
|
||||
func TestSshdGuestConfig_Hardened(t *testing.T) {
|
||||
cfg := sshdGuestConfig()
|
||||
|
||||
// Posture: key-only, root via pubkey, no password / keyboard-
|
||||
// interactive fallback, pinned authorized_keys path.
|
||||
mustContain := []string{
|
||||
"PermitRootLogin prohibit-password",
|
||||
"PubkeyAuthentication yes",
|
||||
"PasswordAuthentication no",
|
||||
"KbdInteractiveAuthentication no",
|
||||
"AuthorizedKeysFile /root/.ssh/authorized_keys",
|
||||
}
|
||||
for _, line := range mustContain {
|
||||
if !strings.Contains(cfg, line) {
|
||||
t.Errorf("sshd drop-in missing %q:\n%s", line, cfg)
|
||||
}
|
||||
}
|
||||
|
||||
// Things that must NOT appear. Each has a history and a reason.
|
||||
mustNotContain := map[string]string{
|
||||
"LogLevel DEBUG3": "was debug leftover; floods journald",
|
||||
"StrictModes no": "masked a /root perm drift; real fix is in normaliseHomeDirPerms",
|
||||
// Blanket "PermitRootLogin yes" (without prohibit-password)
|
||||
// would re-enable password root login if something else
|
||||
// flipped PasswordAuthentication back to yes.
|
||||
"PermitRootLogin yes": "use prohibit-password instead",
|
||||
}
|
||||
for needle, why := range mustNotContain {
|
||||
if strings.Contains(cfg, needle) {
|
||||
t.Errorf("sshd drop-in contains %q (%s):\n%s", needle, why, cfg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSshdGuestConfig_IsCompleteLines(t *testing.T) {
|
||||
// Every directive should be a full line on its own. Trailing
|
||||
// newline matters — sshd_config.d files without a newline sometimes
|
||||
// get misparsed when concatenated with other drop-ins.
|
||||
cfg := sshdGuestConfig()
|
||||
if !strings.HasSuffix(cfg, "\n") {
|
||||
t.Errorf("sshd drop-in should end with newline:\n%q", cfg)
|
||||
}
|
||||
for _, line := range strings.Split(strings.TrimRight(cfg, "\n"), "\n") {
|
||||
if strings.TrimSpace(line) == "" {
|
||||
t.Errorf("sshd drop-in has blank line:\n%s", cfg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -47,6 +47,14 @@ func (d *Daemon) ensureAuthorizedKeyOnWorkDisk(ctx context.Context, vm *model.VM
|
|||
return err
|
||||
}
|
||||
|
||||
// Normalise the work-disk filesystem root: inside the guest this
|
||||
// mounts at /root, which sshd inspects when StrictModes is on (the
|
||||
// default after the hardening drop-in). Any drift — owner != root,
|
||||
// group/other-writable — would make sshd silently reject the key.
|
||||
if err := normaliseHomeDirPerms(ctx, d.runner, workMount); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sshDir := filepath.Join(workMount, ".ssh")
|
||||
if _, err := d.runner.RunSudo(ctx, "mkdir", "-p", sshDir); err != nil {
|
||||
return err
|
||||
|
|
@ -54,6 +62,9 @@ func (d *Daemon) ensureAuthorizedKeyOnWorkDisk(ctx context.Context, vm *model.VM
|
|||
if _, err := d.runner.RunSudo(ctx, "chmod", "700", sshDir); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := d.runner.RunSudo(ctx, "chown", "0:0", sshDir); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
authorizedKeysPath := filepath.Join(sshDir, "authorized_keys")
|
||||
existing, err := d.runner.RunSudo(ctx, "cat", authorizedKeysPath)
|
||||
|
|
@ -90,6 +101,25 @@ func (d *Daemon) ensureAuthorizedKeyOnWorkDisk(ctx context.Context, vm *model.VM
|
|||
return nil
|
||||
}
|
||||
|
||||
// normaliseHomeDirPerms forces the home-directory mount point to
|
||||
// 0755 root:root. sshd's StrictModes (the default, re-enabled after
|
||||
// banger stopped shipping "StrictModes no") rejects authorized_keys
|
||||
// if the user's HOME — here the work-disk filesystem root — is
|
||||
// group/other-writable or owned by anyone other than root. mkfs.ext4
|
||||
// normally creates an ext4 root dir at 0755 root:root, but older
|
||||
// work-seed images may have drifted, and `cp -a` on a non-standard
|
||||
// source can carry weird bits forward. Forcing a known-good state
|
||||
// here is cheap insurance.
|
||||
func normaliseHomeDirPerms(ctx context.Context, runner system.CommandRunner, workMount string) error {
|
||||
if _, err := runner.RunSudo(ctx, "chown", "0:0", workMount); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := runner.RunSudo(ctx, "chmod", "0755", workMount); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *Daemon) ensureGitIdentityOnWorkDisk(ctx context.Context, vm *model.VMRecord) error {
|
||||
runner := d.runner
|
||||
if runner == nil {
|
||||
|
|
|
|||
|
|
@ -30,14 +30,7 @@ func (d *Daemon) patchRootOverlay(ctx context.Context, vm model.VMRecord, image
|
|||
resolv := []byte(fmt.Sprintf("nameserver %s\n", d.config.DefaultDNS))
|
||||
hostname := []byte(vm.Name + "\n")
|
||||
hosts := []byte(fmt.Sprintf("127.0.0.1 localhost\n127.0.1.1 %s\n", vm.Name))
|
||||
sshdConfig := []byte(strings.Join([]string{
|
||||
"LogLevel DEBUG3",
|
||||
"PermitRootLogin yes",
|
||||
"PubkeyAuthentication yes",
|
||||
"AuthorizedKeysFile /root/.ssh/authorized_keys",
|
||||
"StrictModes no",
|
||||
"",
|
||||
}, "\n"))
|
||||
sshdConfig := []byte(sshdGuestConfig())
|
||||
fstab, err := system.ReadDebugFSText(ctx, d.runner, vm.Runtime.DMDev, "/etc/fstab")
|
||||
if err != nil {
|
||||
fstab = ""
|
||||
|
|
@ -136,6 +129,55 @@ func (d *Daemon) ensureWorkDisk(ctx context.Context, vm *model.VMRecord, image m
|
|||
return workDiskPreparation{}, nil
|
||||
}
|
||||
|
||||
// sshdGuestConfig is the banger-authored drop-in that lands at
|
||||
// /etc/ssh/sshd_config.d/99-banger.conf inside every guest.
|
||||
//
|
||||
// Banger VMs are single-user root sandboxes reachable only through the
|
||||
// host bridge (default 172.16.0.0/24). The drop-in sets the minimum
|
||||
// needed to make that usable while keeping the posture tight enough
|
||||
// that a misconfigured host bridge does not immediately hand over an
|
||||
// unauthenticated root shell.
|
||||
//
|
||||
// Why each line is here:
|
||||
//
|
||||
// - PermitRootLogin prohibit-password
|
||||
// The guest IS root — there's no other account. prohibit-password
|
||||
// allows pubkey login and blocks password auth at the source even
|
||||
// if some future config flips PasswordAuthentication on.
|
||||
//
|
||||
// - PubkeyAuthentication yes
|
||||
// The only auth method we expect. Explicit in case a future
|
||||
// Debian default or distro package flips it off.
|
||||
//
|
||||
// - PasswordAuthentication no
|
||||
//
|
||||
// - KbdInteractiveAuthentication no
|
||||
// Belt-and-braces: every interactive auth path is off, not just
|
||||
// the PermitRootLogin path. These are already Debian defaults but
|
||||
// stating them here means the drop-in documents the intent.
|
||||
//
|
||||
// - AuthorizedKeysFile /root/.ssh/authorized_keys
|
||||
// Pins the lookup path so the banger-written file always wins,
|
||||
// regardless of distro default ($HOME/.ssh/authorized_keys) and
|
||||
// regardless of any per-image weirdness.
|
||||
//
|
||||
// Previously this file also contained `LogLevel DEBUG3` and
|
||||
// `StrictModes no`. DEBUG3 was a leftover from debugging the
|
||||
// first-boot flow and flooded journald in normal use. StrictModes no
|
||||
// was a workaround for perm drift on /root inside the work disk; the
|
||||
// real fix — normalising /root permissions at provisioning time — is
|
||||
// in ensureAuthorizedKeyOnWorkDisk / seedAuthorizedKeyOnExt4Image.
|
||||
func sshdGuestConfig() string {
|
||||
return strings.Join([]string{
|
||||
"PermitRootLogin prohibit-password",
|
||||
"PubkeyAuthentication yes",
|
||||
"PasswordAuthentication no",
|
||||
"KbdInteractiveAuthentication no",
|
||||
"AuthorizedKeysFile /root/.ssh/authorized_keys",
|
||||
"",
|
||||
}, "\n")
|
||||
}
|
||||
|
||||
func (d *Daemon) flattenNestedWorkHome(ctx context.Context, workMount string) error {
|
||||
nestedHome := filepath.Join(workMount, "root")
|
||||
if !exists(nestedHome) {
|
||||
|
|
|
|||
|
|
@ -1857,13 +1857,18 @@ func (r *filesystemRunner) RunSudo(ctx context.Context, args ...string) ([]byte,
|
|||
}
|
||||
return nil, os.WriteFile(dst, data, os.FileMode(mode))
|
||||
case "chown":
|
||||
// chown -R OWNER TARGET — owner is ignored under test; we
|
||||
// already run as the test user and os.Chown would require
|
||||
// CAP_CHOWN.
|
||||
if len(args) != 4 || args[1] != "-R" {
|
||||
// Recognised forms, both no-op under test (we run as the test
|
||||
// user and os.Chown would need CAP_CHOWN):
|
||||
// chown OWNER TARGET
|
||||
// chown -R OWNER TARGET
|
||||
switch {
|
||||
case len(args) == 3:
|
||||
return nil, nil
|
||||
case len(args) == 4 && args[1] == "-R":
|
||||
return nil, nil
|
||||
default:
|
||||
return nil, fmt.Errorf("unexpected chown args: %v", args)
|
||||
}
|
||||
return nil, nil
|
||||
default:
|
||||
return nil, fmt.Errorf("unexpected sudo command: %v", args)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue