DACL and Owner for Scheduled Task executables

lkarlslund · Mar 28, 2022 · 2ee1f2c · 2ee1f2c
1 parent 6f7022a
commit 2ee1f2c
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 105 deletions.
diff --git a/modules/integrations/localmachine/collect/main.go b/modules/integrations/localmachine/collect/main.go
@@ -254,8 +254,8 @@ func Collect(outputpath string) error {
 						ownersid, dacl, err := windowssecurity.GetOwnerAndDACL(shareinfo.Path, windows.SE_FILE_OBJECT)
 						if err == nil {
 							shareinfo.PathOwner = ownersid.String()
+							shareinfo.PathDACL = dacl
 						}
-						shareinfo.PathDACL = dacl
 					}
 
 					// if stype >= 16 {

diff --git a/modules/integrations/localmachine/collect/taskmaster.go b/modules/integrations/localmachine/collect/taskmaster.go
@@ -3,6 +3,8 @@ package collect
 import (
 	"github.com/amidaware/taskmaster"
 	"github.com/lkarlslund/adalanche/modules/integrations/localmachine"
+	"github.com/lkarlslund/adalanche/modules/windowssecurity"
+	"golang.org/x/sys/windows"
 )
 
 func ConvertRegisteredTask(rt taskmaster.RegisteredTask) localmachine.RegisteredTask {
@@ -18,6 +20,15 @@ func ConvertRegisteredTask(rt taskmaster.RegisteredTask) localmachine.Registered
 						a[i].Path = e.Path
 						a[i].Args = e.Args
 						a[i].WorkingDir = e.WorkingDir
+
+						if e.Path != "" {
+							executable := resolvepath(e.Path)
+							ownersid, dacl, err := windowssecurity.GetOwnerAndDACL(executable, windows.SE_FILE_OBJECT)
+							if err == nil {
+								a[i].PathOwner = ownersid.String()
+								a[i].PathDACL = dacl
+							}
+						}
 					}
 				}
 				return a

diff --git a/modules/integrations/localmachine/structs.go b/modules/integrations/localmachine/structs.go
@@ -189,6 +189,8 @@ type TaskDefinition struct {
 
 type TaskAction struct {
 	Type       string `json:",omitempty"`
+	PathDACL   []byte `json:",omitempty"`
+	PathOwner  string `json:",omitempty"`
 	Path       string `json:",omitempty"`
 	Args       string `json:",omitempty"`
 	WorkingDir string `json:",omitempty"`