Host.WriteFile move from os to syscall style

Change Host.WriteFile to receive mode bits like os.Chmod, to fix issues with os abstraction preventing some bits from being set (eg: SUID).

commit-id:80a7ec02

host/host.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"os"
 	"os/user"
 )
 
@@ -54,8 +53,8 @@ type Host interface {
 	// // Symlink works similar to os.Symlink.
 	// Symlink(ctx context.Context, oldname, newname string) error
 
-	// WriteFile works similar to os.WriteFile.
-	WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error
+	// WriteFile works similar to os.WriteFile, but receives mode as is syscall.Chmod argument.
+	WriteFile(ctx context.Context, name string, data []byte, mode uint32) error
 
 	// A string representation of the host which uniquely identifies it, eg, its FQDN.
 	String() string

internal/host/agent_grpc_client.go

@@ -406,7 +406,7 @@ func (a AgentGrpcClient) Run(ctx context.Context, cmd host.Cmd) (host.WaitStatus
 	// return cs.WaitStatus, nil
 }
 
-func (a AgentGrpcClient) WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error {
+func (a AgentGrpcClient) WriteFile(ctx context.Context, name string, data []byte, mode uint32) error {
 	panic("todo write file")
 	// 	logger := log.MustLogger(ctx)
 

internal/host/agent_http_client.go

@@ -476,16 +476,16 @@ func (a AgentHttpClient) Run(ctx context.Context, cmd host.Cmd) (host.WaitStatus
 	return cs.WaitStatus, nil
 }
 
-func (a AgentHttpClient) WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error {
+func (a AgentHttpClient) WriteFile(ctx context.Context, name string, data []byte, mode uint32) error {
 	logger := log.MustLogger(ctx)
 
-	logger.Debug("WriteFile", "name", name, "data", data, "perm", perm)
+	logger.Debug("WriteFile", "name", name, "data", data, "mode", mode)
 
 	if !filepath.IsAbs(name) {
 		return fmt.Errorf("path must be absolute: %s", name)
 	}
 
-	_, err := a.put(fmt.Sprintf("/file%s?perm=%d", name, perm), bytes.NewReader(data))
+	_, err := a.put(fmt.Sprintf("/file%s?mode=%d", name, mode), bytes.NewReader(data))
 	if err != nil {
 		return err
 	}

internal/host/agent_server_http/main_linux.go

@@ -72,29 +72,33 @@ func PutFileFn(ctx context.Context) func(http.ResponseWriter, *http.Request) {
 		}
 		name = fmt.Sprintf("%c%s", os.PathSeparator, name)
 
-		perms, ok := r.URL.Query()["perm"]
+		modes, ok := r.URL.Query()["mode"]
 		if !ok {
-			internalServerError(w, errors.New("missing perm from query"))
+			internalServerError(w, errors.New("missing mode from query"))
 			return
 		}
-		if len(perms) != 1 {
-			internalServerError(w, fmt.Errorf("received multiple perm: %#v", perms))
+		if len(modes) != 1 {
+			internalServerError(w, fmt.Errorf("received multiple mode: %#v", modes))
 			return
 		}
-		permInt, err := strconv.ParseInt(perms[0], 10, 32)
+		modeInt, err := strconv.ParseUint(modes[0], 10, 32)
 		if err != nil {
-			internalServerError(w, fmt.Errorf("failed to parse perm: %#v: %s", perms[0], err))
+			internalServerError(w, fmt.Errorf("failed to parse mode: %#v: %s", modes[0], err))
 			return
 		}
-		perm := os.FileMode(permInt)
+		mode := uint32(modeInt)
 
 		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			internalServerError(w, err)
 			return
 		}
 
-		if err := os.WriteFile(name, body, perm); err != nil {
+		if err := os.WriteFile(name, body, fs.FileMode(mode)); err != nil {
+			internalServerError(w, err)
+			return
+		}
+		if err := syscall.Chmod(name, mode); err != nil {
 			internalServerError(w, err)
 			return
 		}

internal/host/cmd_run.go

@@ -540,10 +540,10 @@ func (br cmdHost) Remove(ctx context.Context, name string) error {
 	return nil
 }
 
-func (br cmdHost) WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error {
+func (br cmdHost) WriteFile(ctx context.Context, name string, data []byte, mode uint32) error {
 	logger := log.MustLogger(ctx)
 
-	logger.Debug("WriteFile", "name", name, "data", data, "perm", perm)
+	logger.Debug("WriteFile", "name", name, "data", data, "mode", mode)
 
 	if !filepath.IsAbs(name) {
 		return &fs.PathError{
@@ -553,10 +553,6 @@ func (br cmdHost) WriteFile(ctx context.Context, name string, data []byte, perm
 		}
 	}
 
-	var chmod bool
-	if _, err := br.Lstat(ctx, name); errors.Is(err, os.ErrNotExist) {
-		chmod = true
-	}
 	cmd := host.Cmd{
 		Path:  "sh",
 		Args:  []string{"-c", fmt.Sprintf("cat > %s", shellescape.Quote(name))},
@@ -581,8 +577,6 @@ func (br cmdHost) WriteFile(ctx context.Context, name string, data []byte, perm
 			cmd, waitStatus.String(), stdout, stderr,
 		)
 	}
-	if chmod {
-		return br.Chmod(ctx, name, uint32(perm))
-	}
-	return nil
+
+	return br.Chmod(ctx, name, mode)
 }

internal/host/cmd_run_linux_test.go

@@ -3,7 +3,6 @@ package host
 import (
 	"context"
 	"errors"
-	"os"
 	"os/user"
 	"testing"
 
@@ -65,7 +64,7 @@ func (h cmdHostOnly) Remove(ctx context.Context, name string) error {
 	return err
 }
 
-func (h cmdHostOnly) WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error {
+func (h cmdHostOnly) WriteFile(ctx context.Context, name string, data []byte, mode uint32) error {
 	err := errors.New("unexpected call received: WriteFile")
 	h.T.Fatal(err)
 	return err

internal/host/local_linux.go

@@ -157,9 +157,9 @@ func (l Local) Run(ctx context.Context, cmd host.Cmd) (host.WaitStatus, error) {
 	return local_run.Run(ctx, cmd)
 }
 
-func (l Local) WriteFile(ctx context.Context, name string, data []byte, perm os.FileMode) error {
+func (l Local) WriteFile(ctx context.Context, name string, data []byte, mode uint32) error {
 	logger := log.MustLogger(ctx)
-	logger.Debug("WriteFile", "name", name, "data", data, "perm", perm)
+	logger.Debug("WriteFile", "name", name, "data", data, "mode", mode)
 
 	if !filepath.IsAbs(name) {
 		return &fs.PathError{
@@ -169,7 +169,10 @@ func (l Local) WriteFile(ctx context.Context, name string, data []byte, perm os.
 		}
 	}
 
-	return os.WriteFile(name, data, perm)
+	if err := os.WriteFile(name, data, fs.FileMode(mode)); err != nil {
+		return err
+	}
+	return syscall.Chmod(name, mode)
 }
 
 func (l Local) String() string {

internal/host/test_helpers_linux.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/fs"
 	"net"
 	"os"
 	"os/user"
@@ -559,16 +558,15 @@ func testHost(t *testing.T, hst host.Host) {
 			outputBuffer.Reset()
 			name := filepath.Join(t.TempDir(), "foo")
 			data := []byte("foo")
-			fileMode := os.FileMode(0600)
+			var fileMode uint32 = 01607
 			err := hst.WriteFile(ctx, name, data, fileMode)
 			require.NoError(t, err)
 			readData, err := os.ReadFile(name)
 			require.NoError(t, err)
 			require.Equal(t, data, readData)
-			fileInfo, err := os.Lstat(name)
-			require.NoError(t, err)
-			require.False(t, fileInfo.IsDir())
-			require.Equal(t, fileMode, fileInfo.Mode()&fs.ModePerm)
+			var stat_t syscall.Stat_t
+			require.NoError(t, syscall.Lstat(name, &stat_t))
+			require.Equal(t, fileMode, stat_t.Mode&07777)
 		})
 		t.Run("path must be absolute", func(t *testing.T) {
 			outputBuffer.Reset()
@@ -584,27 +582,26 @@ func testHost(t *testing.T, hst host.Host) {
 		t.Run("ovewrite file", func(t *testing.T) {
 			outputBuffer.Reset()
 			name := filepath.Join(t.TempDir(), "foo")
-			fileMode := os.FileMode(0600)
+			var fileMode uint32 = 01607
 			err := hst.WriteFile(ctx, name, []byte{}, fileMode)
 			require.NoError(t, err)
 			data := []byte("foo")
-			newFileMode := os.FileMode(0640)
+			var newFileMode uint32 = 02675
 			err = hst.WriteFile(ctx, name, data, newFileMode)
 			require.NoError(t, err)
 			readData, err := os.ReadFile(name)
 			require.NoError(t, err)
 			require.Equal(t, data, readData)
-			fileInfo, err := os.Lstat(name)
-			require.NoError(t, err)
-			require.False(t, fileInfo.IsDir())
-			require.Equal(t, fileMode, fileInfo.Mode()&fs.ModePerm)
+			var stat_t syscall.Stat_t
+			require.NoError(t, syscall.Lstat(name, &stat_t))
+			require.Equal(t, newFileMode, stat_t.Mode&07777)
 		})
 		t.Run("is directory", func(t *testing.T) {
 			outputBuffer.Reset()
 			name := filepath.Join(t.TempDir(), "foo")
 			err := os.Mkdir(name, os.FileMode(0700))
 			require.NoError(t, err)
-			err = hst.WriteFile(ctx, name, []byte{}, os.FileMode(0640))
+			err = hst.WriteFile(ctx, name, []byte{}, 0640)
 			require.Error(t, err)
 		})
 		t.Run("ErrNotExist", func(t *testing.T) {

internal/plan/prep_linux_test.go

@@ -65,7 +65,7 @@ func TestSaveOriginalResourcesState(t *testing.T) {
 	filePath := filepath.Join(t.TempDir(), "foo")
 	fileContent := "foo"
 	var fileMode uint32 = 0644
-	err := host.WriteFile(ctx, filePath, []byte("foo"), os.FileMode(fileMode))
+	err := host.WriteFile(ctx, filePath, []byte("foo"), fileMode)
 	require.NoError(t, err)
 	fileResource := &resouresPkg.File{
 		Path:    filePath,
@@ -107,8 +107,8 @@ func TestLoadOrCreateAndSaveLastBlueprintWithValidation(t *testing.T) {
 
 	filePath := filepath.Join(t.TempDir(), "foo")
 	fileContent := "foo"
-	filePerm := os.FileMode(0644)
-	err := host.WriteFile(ctx, filePath, []byte("foo"), filePerm)
+	var fileMode uint32 = 0644
+	err := host.WriteFile(ctx, filePath, []byte("foo"), fileMode)
 	require.NoError(t, err)
 	fileResource := &resouresPkg.File{
 		Path:    filePath,

internal/store/host.go

@@ -222,7 +222,7 @@ func (s *HostStore) saveYaml(ctx context.Context, obj any, path string) error {
 		return err
 	}
 
-	return s.Host.WriteFile(ctx, path, blueprintBytes, os.FileMode(0600))
+	return s.Host.WriteFile(ctx, path, blueprintBytes, 0600)
 }
 
 func (s *HostStore) SaveLastBlueprint(ctx context.Context, blueprint *blueprintPkg.Blueprint) error {

resources/file.go

@@ -126,7 +126,7 @@ func (f *File) Apply(ctx context.Context, hst host.Host) error {
 	}
 
 	// Content
-	if err := hst.WriteFile(ctx, string(f.Path), []byte(f.Content), os.FileMode(f.Mode)); err != nil {
+	if err := hst.WriteFile(ctx, string(f.Path), []byte(f.Content), f.Mode); err != nil {
 		return err
 	}