Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-22 16:39:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 121

Fleetctl preview to clean up osquery socket before starting orbit (#4729)

Browse source 
* Fleetctl preview to clean up osquery socket before starting orbit

* Use os.Remove
This commit is contained in:
Lucas Manuel Rodriguez 2022-03-22 18:00:00 -03:00 committed by GitHub
parent dc8921fed1
commit eeb73a42db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/4711-fleetctl-preview-cleanup-osquery-socket Normal file
View file

@ -0,0 +1 @@
* Fleetctl preview to clean up osquery socket files before running fleet-osquery.

23
cmd/fleetctl/preview.go
View file

@ -629,6 +629,9 @@ func downloadOrbitAndStart(destDir, enrollSecret, address, orbitChannel, osquery
if err := os.RemoveAll(path.Join(destDir, "orbit.db")); err != nil {
fmt.Println("Warning: clearing orbit db dir:", err)
}
if err := cleanUpSocketFiles(destDir); err != nil {
fmt.Println("Warning: cleaning up socket files:", err)
}
updateOpt := update.DefaultOptions
@ -673,6 +676,26 @@ func downloadOrbitAndStart(destDir, enrollSecret, address, orbitChannel, osquery
return nil
}
// cleanUpSocketFiles cleans up fleet-osqueryd's socket file
// ("orbit-osquery.em") and osquery extension socket files
// ("orbit-osquery.em.*").
func cleanUpSocketFiles(path string) error {
entries, err := os.ReadDir(path)
if err != nil {
return fmt.Errorf("read dir: %w", err)
}
for _, entry := range entries {
if !strings.HasPrefix(entry.Name(), "orbit-osquery.em") {
continue
}
entryPath := filepath.Join(path, entry.Name())
if err := os.Remove(entryPath); err != nil {
return fmt.Errorf("remove %q: %w", entryPath, err)
}
}
return nil
}
func stopOrbit(destDir string) error {
err := killFromPIDFile(destDir, "osquery.pid", "osqueryd")
if err != nil {