runtime sockets: close the local-user race window around control-plane creation

Previously the daemon socket, per-VM firecracker API socket, and vsock
socket were transiently world-exposed on hosts without XDG_RUNTIME_DIR:
the runtime directory landed in /tmp at 0755, Firecracker ran with
umask 000 (mode 0666 sockets), and only a follow-up chown/chmod in
EnsureSocketAccess tightened them. A local attacker could race into
bangerd.sock or the firecracker API socket during that window.

Three changes:

- internal/paths/paths.go: RuntimeDir is now created (and re-chmod'd if
  stale) at 0700 unconditionally. When XDG_RUNTIME_DIR is unset and we
  fall back to /tmp/banger-runtime-<uid>, Ensure() now verifies the
  parent dir is owned by the current uid and 0700 mode — refusing to
  place sockets inside a directory someone else created. Symlink swaps
  rejected via Lstat.

- internal/firecracker/client.go: launch firecracker with umask 077
  instead of umask 000 so the API socket is mode 0600 from birth. The
  chown in fcproc.EnsureSocketAccess still transfers ownership from
  root to the invoking user afterwards.

- internal/daemon/fcproc/fcproc.go: EnsureSocketDir now creates (and
  re-chmod's) the runtime socket directory at 0700.

Tests cover the tightening path — an existing 0755 RuntimeDir is
re-chmod'd on Ensure.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Thales Maciel 2026-04-20 12:53:47 -03:00
parent 2b6437d1b4
commit b930c51990
No known key found for this signature in database
GPG key ID: 33112E6833C34679
5 changed files with 119 additions and 13 deletions

View file

@ -84,12 +84,39 @@ func TestEnsureCreatesAllDirs(t *testing.T) {
}
}
// RuntimeDir holds sockets; must be 0700.
info, err := os.Stat(layout.RuntimeDir)
if err != nil {
t.Fatalf("stat runtime: %v", err)
}
if perm := info.Mode().Perm(); perm != 0o700 {
t.Errorf("RuntimeDir mode = %#o, want 0700", perm)
}
// Idempotent.
if err := Ensure(layout); err != nil {
t.Fatalf("Ensure (second run): %v", err)
}
}
func TestEnsureTightensStaleRuntimeDirMode(t *testing.T) {
base := t.TempDir()
runtime := filepath.Join(base, "runtime")
if err := os.MkdirAll(runtime, 0o755); err != nil {
t.Fatalf("MkdirAll: %v", err)
}
if err := Ensure(Layout{RuntimeDir: runtime}); err != nil {
t.Fatalf("Ensure: %v", err)
}
info, err := os.Stat(runtime)
if err != nil {
t.Fatalf("stat: %v", err)
}
if perm := info.Mode().Perm(); perm != 0o700 {
t.Errorf("mode = %#o, want 0700 after Ensure", perm)
}
}
func TestBangerdPathEnvOverride(t *testing.T) {
t.Setenv("BANGER_DAEMON_BIN", "/tmp/custom-bangerd")
got, err := BangerdPath()

View file

@ -6,6 +6,7 @@ import (
"os"
"path/filepath"
"strings"
"syscall"
)
type Layout struct {
@ -26,6 +27,13 @@ type Layout struct {
OCICacheDir string
SSHDir string
KnownHostsPath string
// runtimeHomeFallback is true when we fabricated the RuntimeHome path
// under /tmp because XDG_RUNTIME_DIR was unset. Ensure() uses the flag
// to apply strict ownership + mode checks on the fallback parent (a
// world-writable /tmp needs us to own and lock the subtree ourselves;
// a systemd-provisioned /run/user/<uid> is already 0700 and trusted).
runtimeHomeFallback bool
}
func Resolve() (Layout, error) {
@ -37,19 +45,22 @@ func Resolve() (Layout, error) {
stateHome := getenvDefault("XDG_STATE_HOME", filepath.Join(home, ".local", "state"))
cacheHome := getenvDefault("XDG_CACHE_HOME", filepath.Join(home, ".cache"))
runtimeHome := os.Getenv("XDG_RUNTIME_DIR")
runtimeFallback := false
if runtimeHome == "" {
runtimeHome = filepath.Join(os.TempDir(), fmt.Sprintf("banger-runtime-%d", os.Getuid()))
runtimeFallback = true
}
layout := Layout{
ConfigHome: configHome,
StateHome: stateHome,
CacheHome: cacheHome,
RuntimeHome: runtimeHome,
ConfigDir: filepath.Join(configHome, "banger"),
StateDir: filepath.Join(stateHome, "banger"),
CacheDir: filepath.Join(cacheHome, "banger"),
RuntimeDir: filepath.Join(runtimeHome, "banger"),
ConfigHome: configHome,
StateHome: stateHome,
CacheHome: cacheHome,
RuntimeHome: runtimeHome,
runtimeHomeFallback: runtimeFallback,
ConfigDir: filepath.Join(configHome, "banger"),
StateDir: filepath.Join(stateHome, "banger"),
CacheDir: filepath.Join(cacheHome, "banger"),
RuntimeDir: filepath.Join(runtimeHome, "banger"),
}
layout.SocketPath = filepath.Join(layout.RuntimeDir, "bangerd.sock")
layout.DBPath = filepath.Join(layout.StateDir, "state.db")
@ -64,7 +75,32 @@ func Resolve() (Layout, error) {
}
func Ensure(layout Layout) error {
for _, dir := range []string{layout.ConfigDir, layout.StateDir, layout.CacheDir, layout.RuntimeDir, layout.VMsDir, layout.ImagesDir, layout.KernelsDir, layout.OCICacheDir} {
// When we're using the /tmp fallback, we must create and own the
// runtime-home parent ourselves and reject any pre-existing directory
// that isn't 0700 + owned by the current uid. Otherwise a local
// attacker could pre-create that path and have banger's control
// sockets land inside a directory they control.
if layout.runtimeHomeFallback && strings.TrimSpace(layout.RuntimeHome) != "" {
if err := ensureSafeRuntimeHome(layout.RuntimeHome); err != nil {
return err
}
}
// RuntimeDir holds bangerd.sock + per-VM firecracker API + vsock
// sockets. Lock it to 0700 unconditionally so even if the parent
// runtime-home is traversable by others, none of our sockets are
// reachable.
if strings.TrimSpace(layout.RuntimeDir) != "" {
if err := os.MkdirAll(layout.RuntimeDir, 0o700); err != nil {
return err
}
if err := os.Chmod(layout.RuntimeDir, 0o700); err != nil {
return err
}
}
for _, dir := range []string{layout.ConfigDir, layout.StateDir, layout.CacheDir, layout.VMsDir, layout.ImagesDir, layout.KernelsDir, layout.OCICacheDir} {
if strings.TrimSpace(dir) == "" {
continue
}
if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
@ -81,6 +117,36 @@ func Ensure(layout Layout) error {
return nil
}
// ensureSafeRuntimeHome creates path at 0700 if missing, or validates
// existing ownership + mode. Returns an error describing how to remediate
// when the existing directory doesn't meet the bar.
func ensureSafeRuntimeHome(path string) error {
if err := os.MkdirAll(path, 0o700); err != nil {
return err
}
info, err := os.Lstat(path)
if err != nil {
return err
}
// Must be a real directory, not a symlink an attacker could swap.
if info.Mode()&os.ModeSymlink != 0 {
return fmt.Errorf("runtime dir %s is a symlink; refusing to place sockets there — remove it or set XDG_RUNTIME_DIR", path)
}
if !info.IsDir() {
return fmt.Errorf("runtime dir %s exists but is not a directory", path)
}
sys, ok := info.Sys().(*syscall.Stat_t)
if ok && int(sys.Uid) != os.Getuid() {
return fmt.Errorf("runtime dir %s is owned by uid %d, not %d; remove it or set XDG_RUNTIME_DIR", path, sys.Uid, os.Getuid())
}
if info.Mode().Perm() != 0o700 {
if err := os.Chmod(path, 0o700); err != nil {
return fmt.Errorf("runtime dir %s has insecure mode %#o and chmod failed: %w", path, info.Mode().Perm(), err)
}
}
return nil
}
var executablePath = os.Executable
func BangerdPath() (string, error) {