Skip to content

Commit

Permalink
Add shortcut for SELinux detection
Browse files Browse the repository at this point in the history
Skip parsing of /proc/mounts if SELinux is disabled on the machine.
  • Loading branch information
jsafrane committed Nov 9, 2021
1 parent 8ddc296 commit 9286d72
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
13 changes: 11 additions & 2 deletions pkg/volume/util/hostutil/hostutil_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

"golang.org/x/sys/unix"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/util/selinux"
"k8s.io/mount-utils"
utilpath "k8s.io/utils/path"
)
Expand Down Expand Up @@ -229,8 +230,16 @@ func DoMakeRShared(path string, mountInfoFilename string) error {
return nil
}

// selinux.SELinuxEnabled implementation for unit tests
type seLinuxEnabledFunc func() bool

// GetSELinux is common implementation of GetSELinuxSupport on Linux.
func GetSELinux(path string, mountInfoFilename string) (bool, error) {
func GetSELinux(path string, mountInfoFilename string, selinuxEnabled seLinuxEnabledFunc) (bool, error) {
// Skip /proc/mounts parsing if SELinux is disabled.
if !selinuxEnabled() {
return false, nil
}

info, err := findMountInfo(path, mountInfoFilename)
if err != nil {
return false, err
Expand All @@ -253,7 +262,7 @@ func GetSELinux(path string, mountInfoFilename string) (bool, error) {
// GetSELinuxSupport returns true if given path is on a mount that supports
// SELinux.
func (hu *HostUtil) GetSELinuxSupport(pathname string) (bool, error) {
return GetSELinux(pathname, procMountInfoPath)
return GetSELinux(pathname, procMountInfoPath, selinux.SELinuxEnabled)
}

// GetOwner returns the integer ID for the user and group of the given path
Expand Down
12 changes: 11 additions & 1 deletion pkg/volume/util/hostutil/hostutil_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,37 @@ func TestGetSELinuxSupport(t *testing.T) {
tests := []struct {
name string
mountPoint string
selinuxEnabled bool
expectedResult bool
}{
{
"ext4 on / with disabled SELinux",
"/",
false,
false,
},
{
"ext4 on /",
"/",
true,
true,
},
{
"tmpfs on /var/lib/bar",
"/var/lib/bar",
true,
false,
},
{
"nfsv4",
"/media/nfs_vol",
true,
false,
},
}

for _, test := range tests {
out, err := GetSELinux(test.mountPoint, filename)
out, err := GetSELinux(test.mountPoint, filename, func() bool { return test.selinuxEnabled })
if err != nil {
t.Errorf("Test %s failed with error: %s", test.name, err)
}
Expand Down

0 comments on commit 9286d72

Please sign in to comment.