Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions plugins/inputs/bklite_script/bklite_script.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,20 @@ func (b *BkliteScript) Init() error {
if b.RunDir == "" {
b.RunDir = filepath.Join(os.TempDir(), "bklite_script")
}

// Resolve run_as uid/gid before creating or chowning run_dir so a
// root-owned 0700 directory from a previous start is given to the
// dropped-privilege user (CreateTemp and the child both need access).
if err := b.initUser(); err != nil {
return err
}
if err := os.MkdirAll(b.RunDir, 0700); err != nil {
return fmt.Errorf("creating run_dir %q: %w", b.RunDir, err)
}
b.lockPath = filepath.Join(b.RunDir, b.instanceID()+".lock")

if err := b.initUser(); err != nil {
if err := b.chownRunDir(); err != nil {
return err
}
b.lockPath = filepath.Join(b.RunDir, b.instanceID()+".lock")

header := make(http.Header)
header.Set("Content-Type", "text/plain; version=0.0.4; charset=utf-8")
Expand Down
79 changes: 78 additions & 1 deletion plugins/inputs/bklite_script/bklite_script_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,13 @@ func TestLockPreventsOverlap(t *testing.T) {

func TestRootRefuseLinux(t *testing.T) {
orig := osGeteuid
origChown := osChown
osGeteuid = func() int { return 0 }
t.Cleanup(func() { osGeteuid = orig })
osChown = func(string, int, int) error { return nil }
t.Cleanup(func() {
osGeteuid = orig
osChown = origChown
})

p := New()
p.Log = testutil.Logger{}
Expand All @@ -120,6 +125,78 @@ func TestRootRefuseLinux(t *testing.T) {
require.NoError(t, p2.Init())
}

func TestInitChownsExistingRunDirForRunAsUser(t *testing.T) {
origGeteuid := osGeteuid
origLookup := lookupUser
origChown := osChown
t.Cleanup(func() {
osGeteuid = origGeteuid
lookupUser = origLookup
osChown = origChown
})

osGeteuid = func() int { return 0 }
lookupUser = func(name string) (*user.User, error) {
require.Equal(t, "nobody", name)
return &user.User{Uid: "1234", Gid: "5678", Username: "nobody"}, nil
}

var chownPath string
var chownUID, chownGID int
osChown = func(name string, uid, gid int) error {
chownPath = name
chownUID = uid
chownGID = gid
return nil
}

// Simulate a leftover root:root 0700 run_dir from a previous start.
dir := t.TempDir()
require.NoError(t, os.Chmod(dir, 0700))

p := New()
p.Log = testutil.Logger{}
p.RunDir = dir
p.Script = "true"
p.runTimeout = time.Second
p.RunAs = "nobody"
require.NoError(t, p.Init())
require.True(t, p.hasCredential)
require.Equal(t, uint32(1234), p.uid)
require.Equal(t, uint32(5678), p.gid)
require.Equal(t, dir, chownPath)
require.Equal(t, 1234, chownUID)
require.Equal(t, 5678, chownGID)

info, err := os.Stat(dir)
require.NoError(t, err)
require.Equal(t, os.FileMode(0700), info.Mode().Perm())
}

func TestInitSkipsRunDirChownWithoutCredential(t *testing.T) {
if os.Geteuid() == 0 {
t.Skip("euid 0 with empty run_as is refused at Init")
}

origChown := osChown
t.Cleanup(func() { osChown = origChown })

called := false
osChown = func(string, int, int) error {
called = true
return nil
}

p := New()
p.Log = testutil.Logger{}
p.RunDir = t.TempDir()
p.Script = "true"
p.runTimeout = time.Second
require.NoError(t, p.Init())
require.False(t, p.hasCredential)
require.False(t, called)
}

func TestRootRefuseUIDZeroAliasAtInit(t *testing.T) {
origLookup := lookupUser
lookupUser = func(string) (*user.User, error) {
Expand Down
14 changes: 14 additions & 0 deletions plugins/inputs/bklite_script/run_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

var osGeteuid = os.Geteuid
var lookupUser = user.Lookup
var osChown = os.Chown

func defaultInterpreter() (string, error) {
return "/bin/sh", nil
Expand Down Expand Up @@ -70,6 +71,19 @@ func (b *BkliteScript) chownScript(path string) error {
return nil
}

func (b *BkliteScript) chownRunDir() error {
if !b.hasCredential {
return nil
}
if err := osChown(b.RunDir, int(b.uid), int(b.gid)); err != nil {
return fmt.Errorf("chown run_dir %q: %w", b.RunDir, err)
}
if err := os.Chmod(b.RunDir, 0700); err != nil {
return fmt.Errorf("chmod run_dir %q: %w", b.RunDir, err)
}
return nil
}

func (b *BkliteScript) runCommand(argv []string, env []string) runResult {
if len(argv) == 0 {
return startErrorResult(errors.New("empty command"))
Expand Down
4 changes: 4 additions & 0 deletions plugins/inputs/bklite_script/run_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ func (b *BkliteScript) chownScript(string) error {
return nil
}

func (b *BkliteScript) chownRunDir() error {
return nil
}

func (b *BkliteScript) runCommand(argv []string, env []string) runResult {
if len(argv) == 0 {
return startErrorResult(errors.New("empty command"))
Expand Down
Loading