luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

move lookupTaskBin to executor_linux, for os dependency clarity

This commit is contained in:
Lang Martin 2019-05-07 16:58:27 -04:00
parent de807a410a
commit 87585e950d
4 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/shared/executor/executor.go
View File

@ -579,47 +579,6 @@ func lookupBin(taskDir string, bin string) (string, error) {
return "", fmt.Errorf("binary %q could not be found", bin)
}
// lookupTaskBin finds the file in:
// taskDir/local, taskDir, PATH search inside taskDir
// and returns an absolute path
func lookupTaskBin(taskDir string, bin string) (string, error) {
// Check in the local directory
localDir := filepath.Join(taskDir, allocdir.TaskLocal)
local := filepath.Join(localDir, bin)
if _, err := os.Stat(local); err == nil {
return local, nil
}
// Check at the root of the task's directory
root := filepath.Join(taskDir, bin)
if _, err := os.Stat(root); err == nil {
return root, nil
}
// Check the host PATH anchored inside the taskDir
if !strings.Contains(bin, "/") {
envPath := os.Getenv("PATH")
for _, dir := range filepath.SplitList(envPath) {
if dir == "" {
// match unix shell behavior, empty path element == .
dir = "."
}
for _, root := range []string{localDir, taskDir} {
path := filepath.Join(root, dir, bin)
f, err := os.Stat(path)
if err != nil {
continue
}
if m := f.Mode(); !m.IsDir() {
return path, nil
}
}
}
}
return "", fmt.Errorf("file %s not found under path %s", bin, taskDir)
}
// makeExecutable makes the given file executable for root,group,others.
func makeExecutable(binPath string) error {
if runtime.GOOS == "windows" {

41
drivers/shared/executor/executor_linux.go
View File

@ -17,6 +17,7 @@ import (
"github.com/hashicorp/consul-template/signals"
hclog "github.com/hashicorp/go-hclog"
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/stats"
cstructs "github.com/hashicorp/nomad/client/structs"
shelpers "github.com/hashicorp/nomad/helper/stats"
@ -770,3 +771,43 @@ func cmdMounts(mounts []*drivers.MountConfig) []*lconfigs.Mount {
return r
}
// lookupTaskBin finds the file `bin` in taskDir/local, taskDir in that order, then performs
// a PATH search inside taskDir. It returns an absolute path. See also executor.lookupBin
func lookupTaskBin(taskDir string, bin string) (string, error) {
// Check in the local directory
localDir := filepath.Join(taskDir, allocdir.TaskLocal)
local := filepath.Join(localDir, bin)
if _, err := os.Stat(local); err == nil {
return local, nil
}
// Check at the root of the task's directory
root := filepath.Join(taskDir, bin)
if _, err := os.Stat(root); err == nil {
return root, nil
}
// Check the host PATH anchored inside the taskDir
if !strings.Contains(bin, "/") {
envPath := os.Getenv("PATH")
for _, dir := range filepath.SplitList(envPath) {
if dir == "" {
// match unix shell behavior, empty path element == .
dir = "."
}
for _, root := range []string{localDir, taskDir} {
path := filepath.Join(root, dir, bin)
f, err := os.Stat(path)
if err != nil {
continue
}
if m := f.Mode(); !m.IsDir() {
return path, nil
}
}
}
}
return "", fmt.Errorf("file %s not found under path %s", bin, taskDir)
}

35
drivers/shared/executor/executor_linux_test.go
View File

@ -161,6 +161,41 @@ ld.so.conf.d/`
}, func(err error) { t.Error(err) })
}
func TestUniversalExecutor_LookupTaskBin(t *testing.T) {
t.Parallel()
require := require.New(t)
// Create a temp dir
tmpDir, err := ioutil.TempDir("", "")
require.Nil(err)
defer os.Remove(tmpDir)
// Make a foo subdir
os.MkdirAll(filepath.Join(tmpDir, "foo"), 0700)
// Write a file under foo
filePath := filepath.Join(tmpDir, "foo", "tmp.txt")
err = ioutil.WriteFile(filePath, []byte{1, 2}, os.ModeAppend)
require.NoError(err)
// Lookout with an absolute path to the binary
_, err = lookupTaskBin(tmpDir, "/foo/tmp.txt")
require.NoError(err)
// Write a file under local subdir
os.MkdirAll(filepath.Join(tmpDir, "local"), 0700)
filePath2 := filepath.Join(tmpDir, "local", "tmp.txt")
ioutil.WriteFile(filePath2, []byte{1, 2}, os.ModeAppend)
// Lookup with file name, should find the one we wrote above
_, err = lookupTaskBin(tmpDir, "tmp.txt")
require.NoError(err)
// Lookup a host absolute path
_, err = lookupTaskBin(tmpDir, "/bin/sh")
require.Error(err)
}
// Exec Launch looks for the binary only inside the chroot
func TestExecutor_EscapeContainer(t *testing.T) {
t.Parallel()

35
drivers/shared/executor/executor_test.go
View File

@ -452,41 +452,6 @@ func TestUniversalExecutor_LookupPath(t *testing.T) {
require.NoError(err)
}
func TestUniversalExecutor_LookupTaskBin(t *testing.T) {
t.Parallel()
require := require.New(t)
// Create a temp dir
tmpDir, err := ioutil.TempDir("", "")
require.Nil(err)
defer os.Remove(tmpDir)
// Make a foo subdir
os.MkdirAll(filepath.Join(tmpDir, "foo"), 0700)
// Write a file under foo
filePath := filepath.Join(tmpDir, "foo", "tmp.txt")
err = ioutil.WriteFile(filePath, []byte{1, 2}, os.ModeAppend)
require.NoError(err)
// Lookout with an absolute path to the binary
_, err = lookupTaskBin(tmpDir, "/foo/tmp.txt")
require.NoError(err)
// Write a file under local subdir
os.MkdirAll(filepath.Join(tmpDir, "local"), 0700)
filePath2 := filepath.Join(tmpDir, "local", "tmp.txt")
ioutil.WriteFile(filePath2, []byte{1, 2}, os.ModeAppend)
// Lookup with file name, should find the one we wrote above
_, err = lookupTaskBin(tmpDir, "tmp.txt")
require.NoError(err)
// Lookup a host absolute path
_, err = lookupTaskBin(tmpDir, "/bin/sh")
require.Error(err)
}
// setupRoootfs setups the rootfs for libcontainer executor
// It uses busybox to make some binaries available - somewhat cheaper
// than mounting the underlying host filesystem