github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89736 from gnufied/force-sgid-bit-off

Browse Source 
Force sgid bit to be off before checking volume permission
This commit is contained in:
Kubernetes Prow Robot 2020-04-01 09:35:27 -07:00 committed by GitHub
commit c6a942249f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/volume/volume_linux_test.go
View File

@ -154,15 +154,19 @@ func TestSkipPermissionChange(t *testing.T) {
mask := rwMask mask := rwMask
if test.sgidMatch {
mask |= os.ModeSetgid
}
if test.permissionMatch { if test.permissionMatch {
mask |= execMask mask |= execMask
} }
err = os.Chmod(tmpDir, info.Mode()|mask) if test.sgidMatch {
mask |= os.ModeSetgid
mask = info.Mode() | mask
} else {
nosgidPerm := info.Mode() &^ os.ModeSetgid
mask = nosgidPerm | mask
}
err = os.Chmod(tmpDir, mask)
if err != nil { if err != nil {
t.Errorf("Chmod failed on %v: %v", tmpDir, err) t.Errorf("Chmod failed on %v: %v", tmpDir, err)
} }
@ -206,7 +210,8 @@ func TestSetVolumeOwnership(t *testing.T) {
// create a subdirectory with invalid permissions // create a subdirectory with invalid permissions
rogueDir := filepath.Join(path, "roguedir") rogueDir := filepath.Join(path, "roguedir")
err = os.Mkdir(rogueDir, info.Mode()) nosgidPerm := info.Mode() &^ os.ModeSetgid
err = os.Mkdir(rogueDir, nosgidPerm)
if err != nil { if err != nil {
return err return err
} }