Generate the enrollment details on launcher startup

cmd/launcher/launcher.go

@@ -195,6 +195,13 @@ func runLauncher(ctx context.Context, cancel func(), multiSlogger, systemMultiSl
 	flagController := flags.NewFlagController(slogger, stores[storage.AgentFlagsStore], fcOpts...)
 	k := knapsack.New(stores, flagController, db, multiSlogger, systemMultiSlogger)
 
+	if err := osquery.CollectAndSetEnrollmentDetails(ctx, k, 5*time.Second, 5*time.Second); err != nil {
+		slogger.Log(ctx, slog.LevelError,
+			"setting enrollment details",
+			"err", err,
+		)
+	}
+
 	// Generate a new run ID
 	newRunID := k.GetRunID()
 

ee/agent/knapsack/knapsack.go

@@ -14,12 +14,16 @@ import (
 	"github.com/kolide/launcher/ee/agent/types"
 	"github.com/kolide/launcher/ee/tuf"
 	"github.com/kolide/launcher/pkg/log/multislogger"
+
 	"go.etcd.io/bbolt"
 )
 
 // Package-level runID variable
 var runID string
 
+// Package-level enrollmentDetails variable
+var enrollmentDetails *types.EnrollmentDetails
+
 // type alias Flags, so that we can embed it inside knapsack, as `flags` and not `Flags`
 type flags types.Flags
 
@@ -239,3 +243,33 @@ func (k *knapsack) CurrentEnrollmentStatus() (types.EnrollmentStatus, error) {
 
 	return types.Enrolled, nil
 }
+
+func (k *knapsack) SetEnrollmentDetails(details types.EnrollmentDetails) error {
+	if enrollmentDetails == nil {
+		newDetails := details
+		enrollmentDetails = &newDetails
+		k.Slogger().Log(context.Background(), slog.LevelDebug,
+			"initializing enrollment details",
+			"details", fmt.Sprintf("%+v", enrollmentDetails),
+		)
+		return nil
+	}
+
+	current := *enrollmentDetails
+
+	k.Slogger().Log(context.Background(), slog.LevelDebug,
+		"updating enrollment details",
+		"old_details", fmt.Sprintf("%+v", enrollmentDetails),
+		"new_details", fmt.Sprintf("%+v", current),
+	)
+	enrollmentDetails = &current
+
+	return nil
+}
+
+func (k *knapsack) GetEnrollmentDetails() (types.EnrollmentDetails, error) {
+	if enrollmentDetails == nil {
+		return types.EnrollmentDetails{}, nil
+	}
+	return *enrollmentDetails, nil
+}

ee/agent/types/enrollment.go

@@ -0,0 +1,32 @@
+package types
+
+type EnrollmentStatus string
+
+const (
+	NoEnrollmentKey EnrollmentStatus = "no_enrollment_key"
+	Unenrolled      EnrollmentStatus = "unenrolled"
+	Enrolled        EnrollmentStatus = "enrolled"
+	Unknown         EnrollmentStatus = "unknown"
+)
+
+// EnrollmentDetails is the set of details that are collected from osqueryd
+// that are sent to the Kolide server during enrollment.
+type EnrollmentDetails struct {
+	OSVersion                 string `json:"os_version"`
+	OSBuildID                 string `json:"os_build_id"`
+	OSPlatform                string `json:"os_platform"`
+	Hostname                  string `json:"hostname"`
+	HardwareVendor            string `json:"hardware_vendor"`
+	HardwareModel             string `json:"hardware_model"`
+	HardwareSerial            string `json:"hardware_serial"`
+	OsqueryVersion            string `json:"osquery_version"`
+	LauncherHardwareKey       string `json:"launcher_hardware_key"`
+	LauncherHardwareKeySource string `json:"launcher_hardware_key_source"`
+	LauncherLocalKey          string `json:"launcher_local_key"`
+	LauncherVersion           string `json:"launcher_version"`
+	OSName                    string `json:"os_name"`
+	OSPlatformLike            string `json:"os_platform_like"`
+	GOOS                      string `json:"goos"`
+	GOARCH                    string `json:"goarch"`
+	HardwareUUID              string `json:"hardware_uuid"`
+}

ee/agent/types/knapsack.go

@@ -20,4 +20,8 @@ type Knapsack interface {
 	CurrentEnrollmentStatus() (EnrollmentStatus, error)
 	// GetRunID returns the current launcher run ID
 	GetRunID() string
+	// GetEnrollmentDetails returns the enrollment details for the launcher installation
+	GetEnrollmentDetails() (EnrollmentDetails, error)
+	// SetEnrollmentDetails sets the enrollment details for the launcher installation
+	SetEnrollmentDetails(details EnrollmentDetails) error
 }