fix(agent): unify agent and openresty runtime user as openflare

Introduce the shared openflare service account for the agent process and
OpenResty workers, normalize data_dir ownership on startup, and ensure
managed paths are chowned with 0755/0644 during sync and apply. Docker
entrypoint fixes volume ownership before dropping privileges; local systemd
install runs the service as openflare with CAP_NET_BIND_SERVICE.

internal/apps/agent/nginx/manager.go

@@ -25,6 +25,7 @@ import (
 	"github.com/Rain-kl/Wavelet/pkg/utils"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/protocol"
+	"github.com/Rain-kl/Wavelet/internal/apps/agent/runtimeuser"
 )
 
 // RuntimeConfigDirPlaceholder is substituted into generated configs at apply time.
@@ -187,6 +188,7 @@ const (
 )
 
 const safeDefaultFallbackMainConfig = `# This file is generated by OpenFlare safe default fallback.
+user ` + OpenFlareRuntimeUser + `;
 worker_processes auto;
 pid logs/nginx.pid;
 
@@ -278,64 +280,32 @@ func (m *Manager) writeTargetFiles(mainConfig string, routeConfig string, suppor
 	return m.ensureOpenRestyWorkerReadAccess()
 }
 
-// ensureOpenRestyWorkerReadAccess makes runtime config and Lua paths traversable by the
-// unprivileged OpenResty worker user (typically nobody). Volume mounts may create parent
-// directories as 0700 root-owned; MkdirAll does not fix existing modes.
+// ensureOpenRestyWorkerReadAccess assigns runtime ownership and normalized modes
+// on agent-managed paths so the agent and OpenResty workers share access.
 func (m *Manager) ensureOpenRestyWorkerReadAccess() error {
 	targets := []string{
 		m.RuntimeConfigDir,
 		m.LuaDir,
+		m.PagesDir,
 		filepath.Dir(m.MainConfigPath),
 		filepath.Dir(m.RouteConfigPath),
 	}
 	if m.AccessLogPath != "" {
 		targets = append(targets, filepath.Dir(m.AccessLogPath))
 	}
+	seen := make(map[string]struct{}, len(targets))
 	for _, target := range targets {
-		if err := ensureWorldTraversablePath(target); err != nil {
-			return err
-		}
-	}
-	if strings.TrimSpace(m.RuntimeConfigDir) == "" {
-		return nil
-	}
-	entries, err := os.ReadDir(m.RuntimeConfigDir)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	for _, entry := range entries {
-		if entry.IsDir() {
+		cleaned := filepath.Clean(strings.TrimSpace(target))
+		if cleaned == "" || cleaned == "." {
 			continue
 		}
-		path := filepath.Join(m.RuntimeConfigDir, entry.Name())
-		if chmodErr := os.Chmod(path, nginxConfigFilePerm); chmodErr != nil && !os.IsNotExist(chmodErr) {
-			return chmodErr
+		if _, ok := seen[cleaned]; ok {
+			continue
 		}
-	}
-	return nil
-}
-
-func ensureWorldTraversablePath(targetDir string) error {
-	const maxDepth = 12
-	current := filepath.Clean(strings.TrimSpace(targetDir))
-	if current == "" || current == "." {
-		return nil
-	}
-	for depth := 0; depth < maxDepth; depth++ {
-		if err := os.Chmod(current, nginxDirPerm); err != nil {
-			if os.IsNotExist(err) || os.IsPermission(err) {
-				break
-			}
-			return fmt.Errorf("chmod %s: %w", current, err)
+		seen[cleaned] = struct{}{}
+		if err := runtimeuser.EnsurePathOwnership(cleaned, nginxDirPerm, nginxConfigFilePerm); err != nil {
+			return err
 		}
-		parent := filepath.Dir(current)
-		if parent == current {
-			break
-		}
-		current = parent
 	}
 	return nil
 }

internal/apps/agent/nginx/manager_test.go

@@ -979,8 +979,8 @@ func TestEnsureWorldTraversableChainFixesRestrictedParentDirs(t *testing.T) {
 		t.Fatalf("WriteFile failed: %v", err)
 	}
 
-	if err := ensureWorldTraversablePath(runtimeDir); err != nil {
-		t.Fatalf("ensureWorldTraversablePath failed: %v", err)
+	if err := EnsureWorldTraversablePath(runtimeDir); err != nil {
+		t.Fatalf("EnsureWorldTraversablePath failed: %v", err)
 	}
 
 	info, err := os.Stat(filepath.Join(dataDir, "etc"))

internal/apps/agent/nginx/runtime_access.go

@@ -0,0 +1,31 @@
+package nginx
+
+import (
+	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
+
+	"github.com/Rain-kl/Wavelet/internal/apps/agent/runtimeuser"
+)
+
+// OpenFlareRuntimeUser is the shared OS account for the agent process and
+// OpenResty worker processes.
+const OpenFlareRuntimeUser = openrestyrender.OpenFlareRuntimeUser
+
+// OpenRestyWorkerUser is an alias kept for internal call sites.
+const OpenRestyWorkerUser = OpenFlareRuntimeUser
+
+// EnsureWorldTraversablePath makes targetDir and its ancestors world-traversable.
+func EnsureWorldTraversablePath(targetDir string) error {
+	return runtimeuser.EnsurePathOwnership(targetDir, nginxDirPerm, nginxConfigFilePerm)
+}
+
+// EnsureWorkerReadableTree normalizes ownership and modes under root for the
+// shared runtime user.
+func EnsureWorkerReadableTree(rootDir string) error {
+	return runtimeuser.EnsurePathOwnership(rootDir, nginxDirPerm, nginxConfigFilePerm)
+}
+
+// EnsureWorkerReadAccess makes agent-managed runtime paths accessible to the
+// shared runtime user.
+func (m *Manager) EnsureWorkerReadAccess() error {
+	return m.ensureOpenRestyWorkerReadAccess()
+}

internal/apps/agent/nginx/runtime_access_test.go

@@ -0,0 +1,75 @@
+package nginx
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestEnsureWorkerReadableTreeFixesRestrictedPagesFiles(t *testing.T) {
+	tempDir := t.TempDir()
+	pagesDir := filepath.Join(tempDir, "data", "var", "lib", "openflare", "pages")
+	releaseDir := filepath.Join(pagesDir, "deployments", "1", "releases", "abc123")
+	if err := os.MkdirAll(releaseDir, 0o700); err != nil {
+		t.Fatalf("MkdirAll failed: %v", err)
+	}
+	indexPath := filepath.Join(releaseDir, "index.html")
+	if err := os.WriteFile(indexPath, []byte("<html></html>"), 0o600); err != nil {
+		t.Fatalf("WriteFile failed: %v", err)
+	}
+
+	if err := EnsureWorldTraversablePath(pagesDir); err != nil {
+		t.Fatalf("EnsureWorldTraversablePath failed: %v", err)
+	}
+	if err := EnsureWorkerReadableTree(pagesDir); err != nil {
+		t.Fatalf("EnsureWorkerReadableTree failed: %v", err)
+	}
+
+	info, err := os.Stat(indexPath)
+	if err != nil {
+		t.Fatalf("Stat failed: %v", err)
+	}
+	if info.Mode().Perm() != nginxConfigFilePerm {
+		t.Fatalf("expected index.html mode %o, got %o", nginxConfigFilePerm, info.Mode().Perm())
+	}
+	etcInfo, err := os.Stat(filepath.Join(tempDir, "data", "var"))
+	if err != nil {
+		t.Fatalf("Stat var failed: %v", err)
+	}
+	if etcInfo.Mode().Perm()&0o005 == 0 {
+		t.Fatalf("expected var directory to be world-traversable, got %o", etcInfo.Mode().Perm())
+	}
+}
+
+func TestManagerEnsureWorkerReadAccessIncludesPagesDir(t *testing.T) {
+	tempDir := t.TempDir()
+	dataDir := filepath.Join(tempDir, "data")
+	pagesRoot := filepath.Join(dataDir, "var", "lib", "openflare", "pages")
+	releaseDir := filepath.Join(pagesRoot, "deployments", "1", "releases", "abc123")
+	if err := os.MkdirAll(releaseDir, 0o700); err != nil {
+		t.Fatalf("MkdirAll failed: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(releaseDir, "index.html"), []byte("ok"), 0o600); err != nil {
+		t.Fatalf("WriteFile failed: %v", err)
+	}
+
+	manager := &Manager{PagesDir: pagesRoot}
+	if err := manager.EnsureWorkerReadAccess(); err != nil {
+		t.Fatalf("EnsureWorkerReadAccess failed: %v", err)
+	}
+
+	info, err := os.Stat(filepath.Join(tempDir, "data"))
+	if err != nil {
+		t.Fatalf("Stat data failed: %v", err)
+	}
+	if info.Mode().Perm()&0o005 == 0 {
+		t.Fatalf("expected data directory to be world-traversable, got %o", info.Mode().Perm())
+	}
+	indexInfo, err := os.Stat(filepath.Join(releaseDir, "index.html"))
+	if err != nil {
+		t.Fatalf("Stat index failed: %v", err)
+	}
+	if indexInfo.Mode().Perm() != nginxConfigFilePerm {
+		t.Fatalf("expected index.html mode %o, got %o", nginxConfigFilePerm, indexInfo.Mode().Perm())
+	}
+}

internal/apps/agent/runtimeuser/runtimeuser.go

@@ -0,0 +1,111 @@
+// Package runtimeuser defines the shared OS account used by the agent process
+// and OpenResty worker processes so file ownership stays aligned.
+package runtimeuser
+
+import (
+	"errors"
+	"fmt"
+	"log/slog"
+	"os"
+	"os/user"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
+)
+
+// Name is the dedicated service account shared by the agent and OpenResty workers.
+const Name = openrestyrender.OpenFlareRuntimeUser
+
+const (
+	// DefaultDirPerm is the normalized permission for runtime directories.
+	DefaultDirPerm = 0o755
+	// DefaultFilePerm is the normalized permission for runtime files.
+	DefaultFilePerm = 0o644
+)
+
+// Account holds the resolved UID/GID for Name on the current host.
+type Account struct {
+	Name string
+	UID  int
+	GID  int
+}
+
+// Lookup resolves the runtime account on the current host.
+func Lookup() (*Account, error) {
+	record, err := user.Lookup(Name)
+	if err != nil {
+		return nil, fmt.Errorf("lookup %s: %w", Name, err)
+	}
+	uid, err := strconv.Atoi(record.Uid)
+	if err != nil {
+		return nil, fmt.Errorf("parse uid for %s: %w", Name, err)
+	}
+	gid, err := strconv.Atoi(record.Gid)
+	if err != nil {
+		return nil, fmt.Errorf("parse gid for %s: %w", Name, err)
+	}
+	return &Account{Name: Name, UID: uid, GID: gid}, nil
+}
+
+// CurrentEUID returns the effective UID of the current process.
+func CurrentEUID() int {
+	return os.Geteuid()
+}
+
+// IsRuntimeUser reports whether the current process runs as Name.
+func IsRuntimeUser() bool {
+	account, err := Lookup()
+	if err != nil {
+		return false
+	}
+	return os.Geteuid() == account.UID
+}
+
+// EnsureProcessUser drops from root to Name when possible so the agent writes
+// files with the same ownership OpenResty workers read.
+func EnsureProcessUser() error {
+	account, err := Lookup()
+	if err != nil {
+		slog.Warn("runtime user unavailable, agent continues as current user", "user", Name, "euid", os.Geteuid(), "error", err)
+		return nil
+	}
+	if os.Geteuid() == account.UID {
+		slog.Info("agent running as runtime user", "user", Name, "uid", account.UID)
+		return nil
+	}
+	if os.Geteuid() != 0 {
+		slog.Warn("agent is not running as runtime user", "expected", Name, "euid", os.Geteuid())
+		return nil
+	}
+	if dropErr := dropTo(account); dropErr != nil {
+		return dropErr
+	}
+	slog.Info("agent dropped privileges to runtime user", "user", Name, "uid", account.UID)
+	return nil
+}
+
+// EnsurePathOwnership makes root and its ancestors traversable, assigns runtime
+// ownership when running as root, and normalizes directory/file modes.
+func EnsurePathOwnership(root string, dirPerm os.FileMode, filePerm os.FileMode) error {
+	root = filepath.Clean(strings.TrimSpace(root))
+	if root == "" || root == "." {
+		return nil
+	}
+	if err := ensureWorldTraversablePath(root); err != nil {
+		return err
+	}
+	if _, statErr := os.Stat(root); os.IsNotExist(statErr) {
+		return nil
+	}
+	account, lookupErr := Lookup()
+	if lookupErr != nil {
+		var unknown user.UnknownUserError
+		if errors.As(lookupErr, &unknown) {
+			return ensureModesOnly(root, dirPerm, filePerm)
+		}
+		return lookupErr
+	}
+	return applyOwnershipAndModes(root, account, dirPerm, filePerm)
+}

internal/apps/agent/runtimeuser/runtimeuser_test.go

@@ -0,0 +1,39 @@
+package runtimeuser
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestEnsurePathOwnershipNormalizesModes(t *testing.T) {
+	tempDir := t.TempDir()
+	dataDir := filepath.Join(tempDir, "data")
+	releaseDir := filepath.Join(dataDir, "var", "lib", "openflare", "pages", "releases", "abc")
+	if err := os.MkdirAll(releaseDir, 0o700); err != nil {
+		t.Fatalf("MkdirAll failed: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(releaseDir, "index.html"), []byte("ok"), 0o600); err != nil {
+		t.Fatalf("WriteFile failed: %v", err)
+	}
+
+	pagesRoot := filepath.Join(dataDir, "var", "lib", "openflare", "pages")
+	if err := EnsurePathOwnership(pagesRoot, 0o755, 0o644); err != nil {
+		t.Fatalf("EnsurePathOwnership failed: %v", err)
+	}
+
+	dataInfo, err := os.Stat(dataDir)
+	if err != nil {
+		t.Fatalf("Stat dataDir failed: %v", err)
+	}
+	if dataInfo.Mode().Perm()&0o005 == 0 {
+		t.Fatalf("expected dataDir to be world-traversable, got %o", dataInfo.Mode().Perm())
+	}
+	indexInfo, err := os.Stat(filepath.Join(releaseDir, "index.html"))
+	if err != nil {
+		t.Fatalf("Stat index failed: %v", err)
+	}
+	if indexInfo.Mode().Perm() != 0o644 {
+		t.Fatalf("expected mode 0644, got %o", indexInfo.Mode().Perm())
+	}
+}

internal/apps/agent/runtimeuser/runtimeuser_unix.go

@@ -0,0 +1,99 @@
+//go:build unix
+
+package runtimeuser
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"syscall"
+)
+
+func dropTo(account *Account) error {
+	if err := syscall.Setgid(account.GID); err != nil {
+		return fmt.Errorf("setgid %d: %w", account.GID, err)
+	}
+	if err := syscall.Setuid(account.UID); err != nil {
+		return fmt.Errorf("setuid %d: %w", account.UID, err)
+	}
+	return nil
+}
+
+func ensureWorldTraversablePath(targetDir string) error {
+	const maxDepth = 12
+	current := filepath.Clean(strings.TrimSpace(targetDir))
+	if current == "" || current == "." {
+		return nil
+	}
+	for depth := 0; depth < maxDepth; depth++ {
+		if err := os.Chmod(current, DefaultDirPerm); err != nil { //nolint:gosec // parent dirs must be traversable by the runtime user
+			if os.IsNotExist(err) || os.IsPermission(err) {
+				break
+			}
+			return fmt.Errorf("chmod %s: %w", current, err)
+		}
+		parent := filepath.Dir(current)
+		if parent == current {
+			break
+		}
+		current = parent
+	}
+	return nil
+}
+
+func applyOwnershipAndModes(root string, account *Account, dirPerm os.FileMode, filePerm os.FileMode) error {
+	return filepath.WalkDir(root, func(path string, entry os.DirEntry, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		info, err := entry.Info()
+		if err != nil {
+			return err
+		}
+		if os.Geteuid() == 0 {
+			if chownErr := os.Chown(path, account.UID, account.GID); chownErr != nil && !os.IsNotExist(chownErr) { //nolint:gosec // path is under managed root walk
+				return fmt.Errorf("chown %s: %w", path, chownErr)
+			}
+		}
+		if entry.IsDir() {
+			if chmodErr := os.Chmod(path, dirPerm); chmodErr != nil && !os.IsNotExist(chmodErr) { //nolint:gosec // path is under managed root walk
+				return fmt.Errorf("chmod dir %s: %w", path, chmodErr)
+			}
+			return nil
+		}
+		if !info.Mode().IsRegular() {
+			return nil
+		}
+		mode := filePerm
+		if chmodErr := os.Chmod(path, mode); chmodErr != nil && !os.IsNotExist(chmodErr) { //nolint:gosec // path is under managed root walk
+			return fmt.Errorf("chmod file %s: %w", path, chmodErr)
+		}
+		return nil
+	})
+}
+
+func ensureModesOnly(root string, dirPerm os.FileMode, filePerm os.FileMode) error {
+	return filepath.WalkDir(root, func(path string, entry os.DirEntry, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		info, err := entry.Info()
+		if err != nil {
+			return err
+		}
+		if entry.IsDir() {
+			if chmodErr := os.Chmod(path, dirPerm); chmodErr != nil && !os.IsNotExist(chmodErr) { //nolint:gosec // path is under managed root walk
+				return fmt.Errorf("chmod dir %s: %w", path, chmodErr)
+			}
+			return nil
+		}
+		if !info.Mode().IsRegular() {
+			return nil
+		}
+		if chmodErr := os.Chmod(path, filePerm); chmodErr != nil && !os.IsNotExist(chmodErr) { //nolint:gosec // path is under managed root walk
+			return fmt.Errorf("chmod file %s: %w", path, chmodErr)
+		}
+		return nil
+	})
+}

internal/apps/agent/sync/pages.go

@@ -24,6 +24,7 @@ import (
 const (
 	pagesMaxExtractedFileBytes = 100 * 1024 * 1024
 	pagesDirPerm               = 0o755
+	pagesFilePerm              = 0o644
 	pagesManifestFilePerm      = 0o644
 )
 
@@ -137,6 +138,11 @@ func (s *Service) syncPagesDeployments(ctx context.Context, snapshot *state.Snap
 			return err
 		}
 	}
+	if s.nginxManager != nil {
+		if err := s.nginxManager.EnsureWorkerReadAccess(); err != nil {
+			return fmt.Errorf("ensure openresty worker read access: %w", err)
+		}
+	}
 	return nil
 }
 
@@ -333,7 +339,7 @@ func extractPagesFile(item *zip.File, targetPath string) error {
 		return err
 	}
 	defer func() { _ = source.Close() }()
-	target, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, item.FileInfo().Mode().Perm()) //nolint:gosec // targetPath is under managed PagesDir from validated zip entry
+	target, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, pagesFilePerm) //nolint:gosec // targetPath is under managed PagesDir from validated zip entry
 	if err != nil {
 		return err
 	}
@@ -416,10 +422,6 @@ func copyPagesDir(sourceDir string, targetDir string) error {
 		if entry.IsDir() {
 			return os.MkdirAll(targetPath, pagesDirPerm)
 		}
-		info, err := entry.Info()
-		if err != nil {
-			return err
-		}
 		input, err := os.Open(sourcePath) //nolint:gosec // sourcePath is under managed PagesDir walk root
 		if err != nil {
 			return err
@@ -428,7 +430,7 @@ func copyPagesDir(sourceDir string, targetDir string) error {
 		if err := os.MkdirAll(filepath.Dir(targetPath), pagesDirPerm); err != nil {
 			return err
 		}
-		output, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, info.Mode().Perm()) //nolint:gosec // targetPath is under managed PagesDir walk root
+		output, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, pagesFilePerm) //nolint:gosec // targetPath is under managed PagesDir walk root
 		if err != nil {
 			return err
 		}

internal/apps/agent/sync/service.go

@@ -43,6 +43,7 @@ type NginxManager interface {
 	CurrentChecksum() (string, error)
 	WAFIPGroupChecksums() (map[string]string, error)
 	SyncWAFIPGroups(groups []protocol.WAFIPGroup) error
+	EnsureWorkerReadAccess() error
 }
 
 // Service orchestrates configuration synchronisation between the server and the local OpenResty instance.

internal/apps/agent/sync/service_test.go

@@ -141,6 +141,10 @@ func (m *fakeManager) SyncWAFIPGroups(groups []protocol.WAFIPGroup) error {
 	return nil
 }
 
+func (m *fakeManager) EnsureWorkerReadAccess() error {
+	return nil
+}
+
 func TestSyncOnceSuccess(t *testing.T) {
 	client := &fakeClient{
 		config: protocol.ActiveConfigResponse{
@@ -254,6 +258,54 @@ func TestSyncOnceDownloadsPagesDeploymentBeforeApply(t *testing.T) {
 	}
 }
 
+func TestSyncPagesDeploymentEnsuresWorkerReadAccess(t *testing.T) {
+	tempDir := t.TempDir()
+	dataDir := filepath.Join(tempDir, "data")
+	if err := os.MkdirAll(dataDir, 0o700); err != nil {
+		t.Fatalf("MkdirAll failed: %v", err)
+	}
+	pagesDir := filepath.Join(dataDir, "var", "lib", "openflare", "pages")
+
+	packageBytes := testPagesPackage(t, map[string]string{"index.html": "hello"})
+	checksum := testBytesChecksum(packageBytes)
+	config := protocol.ActiveConfigResponse{
+		Version:          "20260309-106",
+		Checksum:         "pages-config-checksum",
+		SourceConfigJSON: testPagesSourceConfigJSON(7, checksum),
+		CreatedAt:        time.Now().Format(time.RFC3339),
+	}
+	client := &fakeClient{
+		config:        config,
+		pagesPackages: map[uint][]byte{7: packageBytes},
+	}
+	stateStore := state.NewStore(filepath.Join(tempDir, "state.json"))
+	snapshot, _ := stateStore.Load()
+
+	runtimeManager := &nginx.Manager{PagesDir: pagesDir}
+	service := New(client, runtimeManager, stateStore)
+	service.SetPagesDir(pagesDir)
+
+	if err := service.syncPagesDeployments(context.Background(), snapshot, &config); err != nil {
+		t.Fatalf("syncPagesDeployments failed: %v", err)
+	}
+
+	dataInfo, err := os.Stat(dataDir)
+	if err != nil {
+		t.Fatalf("Stat dataDir failed: %v", err)
+	}
+	if dataInfo.Mode().Perm()&0o005 == 0 {
+		t.Fatalf("expected dataDir to be world-traversable, got %o", dataInfo.Mode().Perm())
+	}
+	indexPath := filepath.Join(pagesDir, "deployments", "7", "current", "index.html")
+	indexInfo, err := os.Stat(indexPath)
+	if err != nil {
+		t.Fatalf("expected Pages file to be extracted: %v", err)
+	}
+	if indexInfo.Mode().Perm() != 0o644 {
+		t.Fatalf("expected index.html mode 0644, got %o", indexInfo.Mode().Perm())
+	}
+}
+
 func TestSyncOnceExtractsPagesPackageWithZeroByteFiles(t *testing.T) {
 	packageBytes := testPagesPackage(t, map[string]string{
 		"index.html": "hello",