Skip to content

runtime: add linux default fs validation #121

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
mrunalp merged 2 commits into from
Jun 30, 2016
Merged

runtime: add linux default fs validation #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cfd018
runtime: add linux default fs validation
Jun 23, 2016
e4b2183
split linux-specific validations
Jun 24, 2016
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
50 changes: 47 additions & 3 deletions cmd/runtimetest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ import (
// the kernel
const PR_GET_NO_NEW_PRIVS = 39

var (
defaultFS = map[string]string{
"/proc": "proc",
"/sys": "sysfs",
"/dev/pts": "devpts",
"/dev/shm": "tmpfs",
}
)

type validation func(*rspec.Spec) error

func loadSpecConfig() (spec *rspec.Spec, err error) {
Expand Down Expand Up @@ -229,6 +238,28 @@ func validateRootFS(spec *rspec.Spec) error {
return nil
}

func validateDefaultFS(spec *rspec.Spec) error {
logrus.Debugf("validating linux default filesystem")

mountInfos, err := mount.GetMounts()
if err != nil {
return err
}

mountsMap := make(map[string]string)
for _, mountInfo := range mountInfos {
mountsMap[mountInfo.Mountpoint] = mountInfo.Fstype
}

for fs, fstype := range defaultFS {
if !(mountsMap[fs] == fstype) {
return fmt.Errorf("%v must exist and expected type is %v", fs, fstype)
}
}

return nil
}

func validateMaskedPaths(spec *rspec.Spec) error {
logrus.Debugf("validating maskedPaths")
for _, maskedPath := range spec.Linux.MaskedPaths {
Expand Down Expand Up @@ -276,6 +307,7 @@ func mountMatch(specMount rspec.Mount, sysMount rspec.Mount) error {

func validateMountsExist(spec *rspec.Spec) error {
logrus.Debugf("validating mounts exist")

mountInfos, err := mount.GetMounts()
if err != nil {
return err
Expand Down Expand Up @@ -320,24 +352,36 @@ func validate(context *cli.Context) error {
return err
}

validations := []validation{
defaultValidations := []validation{
validateRootFS,
validateProcess,
validateCapabilities,
validateHostname,
validateRlimits,
validateMountsExist,
}

linuxValidations := []validation{
validateDefaultFS,
validateSysctls,
validateMaskedPaths,
validateROPaths,
validateMountsExist,
}

for _, v := range validations {
for _, v := range defaultValidations {
if err := v(spec); err != nil {
return err
}
}

if spec.Platform.OS == "linux" {
for _, v := range linuxValidations {
if err := v(spec); err != nil {
return err
}
}
}

return nil
}

Expand Down