Add SystemDrive env var to osqueryd if present in orbit (#25208)

dantecatalfamo · web-flow · commit 721b732a9041 · 2025-01-07T16:12:17.000-05:00
diff --git a/orbit/changes/8986-systemdrive-env-passthrough b/orbit/changes/8986-systemdrive-env-passthrough
@@ -0,0 +1 @@
+- Pass `SystemDrive` Environemt variable to osqueryd when present in Orbit
diff --git a/orbit/cmd/orbit/orbit.go b/orbit/cmd/orbit/orbit.go
@@ -771,6 +771,12 @@ func main() {
 			)
 		}
 
+		if runtime.GOOS == "windows" {
+			if systemDrive, ok := os.LookupEnv("SystemDrive"); ok {
+				options = append(options, osquery.WithEnv([]string{fmt.Sprintf("SystemDrive=%s", systemDrive)}))
+			}
+		}
+
 		var certPath string
 		if fleetURL != "https://" && c.Bool("insecure") {
 			proxy, err := insecure.NewTLSProxy(fleetURL)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+- Pass `SystemDrive` Environemt variable to osqueryd when present in Orbit
Original file line number	Diff line number	Diff line change
`@@ -771,6 +771,12 @@ func main() {`
`771`	`771`	`)`
`772`	`772`	`}`
`773`	`773`
	`774`	`+ if runtime.GOOS == "windows" {`
	`775`	`+ if systemDrive, ok := os.LookupEnv("SystemDrive"); ok {`
	`776`	`+ options = append(options, osquery.WithEnv([]string{fmt.Sprintf("SystemDrive=%s", systemDrive)}))`
	`777`	`+ }`
	`778`	`+ }`
	`779`	`+`
`774`	`780`	`var certPath string`
`775`	`781`	`if fleetURL != "https://" && c.Bool("insecure") {`
`776`	`782`	`proxy, err := insecure.NewTLSProxy(fleetURL)`