Merge pull request k0sproject#337 from jnummelin/fix/remote-machine-f…

…ile-perms Fix file permissions when provisioning RemoteMachines
makhov · Nov 13, 2023 · a6d05fd · a6d05fd
2 parents e115e84 + 85e341e
commit a6d05fd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/internal/cloudinit/cloudinit.go b/internal/cloudinit/cloudinit.go
@@ -57,6 +57,7 @@ func (c *CloudInit) AsBytes() ([]byte, error) {
 	return b.Bytes(), nil
 }
 
-func (f File) PermissionsAsInt() (int, error) {
-	return strconv.Atoi(f.Permissions)
+func (f File) PermissionsAsInt() (int64, error) {
+
+	return strconv.ParseInt(f.Permissions, 8, 32)
 }
diff --git a/internal/cloudinit/cloudinit_test.go b/internal/cloudinit/cloudinit_test.go
@@ -51,3 +51,15 @@ runcmd:
   - echo 'hello world'
 `, s)
 }
+
+func TestPermissions(t *testing.T) {
+	f := File{
+		Path:        "/etc/hosts",
+		Content:     "foobar",
+		Permissions: "0644",
+	}
+
+	perm, err := f.PermissionsAsInt()
+	assert.NoError(t, err)
+	assert.Equal(t, int64(420), perm)
+}
diff --git a/internal/controller/infrastructure/provisioner.go b/internal/controller/infrastructure/provisioner.go
@@ -166,7 +166,7 @@ func (p *Provisioner) uploadFile(conn *rig.Connection, file cloudinit.File) erro
 		return fmt.Errorf("failed to create directory: %w", err)
 	}
 
-	destFile, err := fsys.OpenFile(file.Path, rigfs.ModeCreate, rigfs.ModeReadWrite)
+	destFile, err := fsys.OpenFile(file.Path, rigfs.ModeCreate, rigfs.FileMode(perms))
 	if err != nil {
 		return fmt.Errorf("failed to open remote file for writing: %w", err)
 	}
@@ -175,5 +175,6 @@ func (p *Provisioner) uploadFile(conn *rig.Connection, file cloudinit.File) erro
 		return fmt.Errorf("failed to write to remote file: %w", err)
 	}
 
+	p.log.Info("uploaded file", "path", file.Path, "permissions", perms)
 	return nil
 }