Skip to content

[1.0.0.rc1] check if Root.Path IsAbs; using filepath instead of path #244

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 1 commit into from
Oct 17, 2016
Merged

[1.0.0.rc1] check if Root.Path IsAbs; using filepath instead of path #244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions cmd/oci-runtime-tool/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"reflect"
"strings"
Expand Down Expand Up @@ -78,7 +77,7 @@ var bundleValidateCommand = cli.Command{
return err
}

configPath := path.Join(inputPath, "config.json")
configPath := filepath.Join(inputPath, "config.json")
content, err := ioutil.ReadFile(configPath)
if err != nil {
return err
Expand All @@ -91,7 +90,12 @@ var bundleValidateCommand = cli.Command{
return err
}

rootfsPath := path.Join(inputPath, spec.Root.Path)
var rootfsPath string
if filepath.IsAbs(spec.Root.Path) {
rootfsPath = spec.Root.Path
} else {
rootfsPath = filepath.Join(inputPath, spec.Root.Path)
}
if fi, err := os.Stat(rootfsPath); err != nil {
return fmt.Errorf("Cannot find the root path %q", rootfsPath)
} else if !fi.IsDir() {
Expand Down Expand Up @@ -213,7 +217,7 @@ func checkProcess(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string
logrus.Debugf("check process")

process := spec.Process
if !path.IsAbs(process.Cwd) {
if !filepath.IsAbs(process.Cwd) {
msgs = append(msgs, fmt.Sprintf("cwd %q is not an absolute path", process.Cwd))
}

Expand All @@ -237,7 +241,7 @@ func checkProcess(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string
}

if len(process.ApparmorProfile) > 0 {
profilePath := path.Join(rootfs, "/etc/apparmor.d", process.ApparmorProfile)
profilePath := filepath.Join(rootfs, "/etc/apparmor.d", process.ApparmorProfile)
_, err := os.Stat(profilePath)
if err != nil {
msgs = append(msgs, err.Error())
Expand Down