Skip to content

fix: only use the permission bits for chmod #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2025
Merged

fix: only use the permission bits for chmod #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4951e
fix: only use the permission bits for chmod
nearora-msft Jun 16, 2025
abc72b5
test: skip the TestChmodIfPermissionMismatch test for windows
nearora-msft Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/blob/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,9 +1092,11 @@ func chmodIfPermissionMismatch(targetPath string, mode os.FileMode) error {
return err
}
perm := info.Mode() & os.ModePerm
if perm != mode {
klog.V(2).Infof("chmod targetPath(%s, mode:0%o) with permissions(0%o)", targetPath, info.Mode(), mode)
if err := os.Chmod(targetPath, mode); err != nil {
expectedPerms := mode & os.ModePerm
if perm != expectedPerms {
klog.V(2).Infof("chmod targetPath(%s, mode:0%o) with permissions(0%o)", targetPath, info.Mode(), expectedPerms)
// only change the permission mode bits, keep the other bits as is
if err := os.Chmod(targetPath, (info.Mode()&^os.ModePerm)|os.FileMode(expectedPerms)); err != nil {
return err
}
} else {
Expand Down
89 changes: 77 additions & 12 deletions pkg/blob/blob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"fmt"
"os"
"reflect"
"runtime"
"sort"
"strings"
"testing"
Expand Down Expand Up @@ -1508,6 +1509,10 @@ func TestIsSupportedContainerNamePrefix(t *testing.T) {
}

func TestChmodIfPermissionMismatch(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("Skipping test on Windows")
}

permissionMatchingPath, _ := getWorkDirPath("permissionMatchingPath")
_ = makeDir(permissionMatchingPath)
defer os.RemoveAll(permissionMatchingPath)
Expand All @@ -1516,11 +1521,23 @@ func TestChmodIfPermissionMismatch(t *testing.T) {
_ = os.MkdirAll(permissionMismatchPath, os.FileMode(0721))
defer os.RemoveAll(permissionMismatchPath)

permissionMatchGidMismatchPath, _ := getWorkDirPath("permissionMatchGidMismatchPath")
_ = os.MkdirAll(permissionMatchGidMismatchPath, os.FileMode(0755))
_ = os.Chmod(permissionMatchGidMismatchPath, 0755|os.ModeSetgid) // Setgid bit is set
defer os.RemoveAll(permissionMatchGidMismatchPath)

permissionMismatchGidMismatch, _ := getWorkDirPath("permissionMismatchGidMismatch")
_ = os.MkdirAll(permissionMismatchGidMismatch, os.FileMode(0721))
_ = os.Chmod(permissionMismatchGidMismatch, 0721|os.ModeSetgid) // Setgid bit is set
defer os.RemoveAll(permissionMismatchGidMismatch)

tests := []struct {
desc string
path string
mode os.FileMode
expectedError error
desc string
path string
mode os.FileMode
expectedPerms os.FileMode
expectedGidBit bool
expectedError error
}{
{
desc: "Invalid path",
Expand All @@ -1529,16 +1546,52 @@ func TestChmodIfPermissionMismatch(t *testing.T) {
expectedError: fmt.Errorf("CreateFile invalid-path: The system cannot find the file specified"),
},
{
desc: "permission matching path",
path: permissionMatchingPath,
mode: 0755,
expectedError: nil,
desc: "permission matching path",
path: permissionMatchingPath,
mode: 0755,
expectedPerms: 0755,
expectedGidBit: false,
expectedError: nil,
},
{
desc: "permission mismatch path",
path: permissionMismatchPath,
mode: 0755,
expectedError: nil,
desc: "permission mismatch path",
path: permissionMismatchPath,
mode: 0755,
expectedPerms: 0755,
expectedGidBit: false,
expectedError: nil,
},
{
desc: "permission mismatch path",
path: permissionMismatchPath,
mode: 0755,
expectedPerms: 0755,
expectedGidBit: false,
expectedError: nil,
},
{
desc: "only match the permission mode bits",
path: permissionMatchGidMismatchPath,
mode: 0755,
expectedPerms: 0755,
expectedGidBit: true,
expectedError: nil,
},
{
desc: "only change the permission mode bits when gid is set",
path: permissionMismatchGidMismatch,
mode: 0755,
expectedPerms: 0755,
expectedGidBit: true,
expectedError: nil,
},
{
desc: "only change the permission mode bits when gid is not set but mode bits have gid set",
path: permissionMismatchPath,
mode: 02755,
expectedPerms: 0755,
expectedGidBit: false,
expectedError: nil,
},
}

Expand All @@ -1549,7 +1602,19 @@ func TestChmodIfPermissionMismatch(t *testing.T) {
t.Errorf("test[%s]: unexpected error: %v, expected error: %v", test.desc, err, test.expectedError)
}
}

if test.expectedError == nil {
info, _ := os.Lstat(test.path)
if test.expectedError == nil && (info.Mode()&os.ModePerm != test.expectedPerms) {
t.Errorf("test[%s]: unexpected perms: %v, expected perms: %v, ", test.desc, info.Mode()&os.ModePerm, test.expectedPerms)
}

if (info.Mode()&os.ModeSetgid != 0) != test.expectedGidBit {
t.Errorf("test[%s]: unexpected gid bit: %v, expected gid bit: %v", test.desc, info.Mode()&os.ModeSetgid != 0, test.expectedGidBit)
}
}
}

}

// getWorkDirPath returns the path to the current working directory
Expand Down
Loading