implement recheck cmd

cmd/launcher/main.go

@@ -196,6 +196,8 @@ func runSubcommands(systemMultiSlogger *multislogger.MultiSlogger) error {
 		run = runSecureEnclave
 	case "watchdog": // note: this is currently only implemented for windows
 		run = watchdog.RunWatchdogService
+	case "recheck":
+		run = runRecheck
 	default:
 		return fmt.Errorf("unknown subcommand %s", os.Args[1])
 	}

cmd/launcher/recheck.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/kolide/launcher/ee/agent/flags/keys"
+	"github.com/kolide/launcher/ee/agent/startupsettings"
+	"github.com/kolide/launcher/pkg/launcher"
+	"github.com/kolide/launcher/pkg/log/multislogger"
+)
+
+func runRecheck(_ *multislogger.MultiSlogger, _ []string) error {
+	attachConsole()
+	defer detachConsole()
+
+	settingReader, err := startupsettings.OpenReader(context.TODO(), launcher.DefaultPath(launcher.RootDirectory))
+	if err != nil {
+		return fmt.Errorf("opening startup settings reader to fetch desktop runner server url, is launcher daemon running?: %w", err)
+	}
+	defer settingReader.Close()
+
+	desktopRunnerServerURL, err := settingReader.Get(keys.DesktopRunnerServerUrl.String())
+	if err != nil {
+		return fmt.Errorf("getting desktop runner server url, is launcher daemon running?: %w", err)
+	}
+
+	response, err := http.Get(fmt.Sprintf("%s/recheck", desktopRunnerServerURL))
+	if err != nil {
+		return fmt.Errorf("sending recheck request to desktop runner server, is launcher daemon running?: %w", err)
+	}
+
+	if response.Body != nil {
+		defer response.Body.Close()
+	}
+
+	if response.StatusCode != http.StatusOK {
+		return fmt.Errorf("recheck request failed with status code %d", response.StatusCode)
+	}
+
+	fmt.Print("recheck request sent successfully")
+
+	return nil
+}

ee/agent/flags/flag_controller.go

@@ -647,3 +647,10 @@ func (fc *FlagController) LocalDevelopmentPath() string {
 		WithDefaultString(fc.cmdLineOpts.LocalDevelopmentPath),
 	).get(nil)
 }
+
+func (fc *FlagController) SetDesktopRunnerServerURL(url string) error {
+	return fc.setControlServerValue(keys.DesktopRunnerServerUrl, []byte(url))
+}
+func (fc *FlagController) DesktopRunnerServerURL() string {
+	return NewStringFlagValue().get(fc.getControlServerValue(keys.DesktopRunnerServerUrl))
+}

ee/agent/flags/keys/keys.go

@@ -56,6 +56,7 @@ const (
 	InModernStandby                 FlagKey = "in_modern_standby"
 	LocalDevelopmentPath            FlagKey = "localdev_path"
 	LauncherWatchdogEnabled         FlagKey = "launcher_watchdog_enabled" // note that this will only impact windows deployments for now
+	DesktopRunnerServerUrl          FlagKey = "desktop_runner_server_url"
 )
 
 func (key FlagKey) String() string {

ee/agent/startupsettings/writer.go

@@ -38,9 +38,10 @@ func OpenWriter(ctx context.Context, knapsack types.Knapsack) (*startupSettingsW
 		kvStore:  store,
 		knapsack: knapsack,
 		storedFlags: map[keys.FlagKey]func() string{
-			keys.UpdateChannel:         func() string { return knapsack.UpdateChannel() },
-			keys.PinnedLauncherVersion: func() string { return knapsack.PinnedLauncherVersion() },
-			keys.PinnedOsquerydVersion: func() string { return knapsack.PinnedOsquerydVersion() },
+			keys.UpdateChannel:          func() string { return knapsack.UpdateChannel() },
+			keys.PinnedLauncherVersion:  func() string { return knapsack.PinnedLauncherVersion() },
+			keys.PinnedOsquerydVersion:  func() string { return knapsack.PinnedOsquerydVersion() },
+			keys.DesktopRunnerServerUrl: func() string { return knapsack.DesktopRunnerServerURL() },
 		},
 	}
 

ee/agent/startupsettings/writer_test.go

@@ -28,6 +28,7 @@ func TestOpenWriter_NewDatabase(t *testing.T) {
 	k.On("RegisterChangeObserver", mock.Anything, keys.UpdateChannel)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedLauncherVersion)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedOsquerydVersion)
+	k.On("RegisterChangeObserver", mock.Anything, keys.DesktopRunnerServerUrl)
 	updateChannelVal := "stable"
 	k.On("UpdateChannel").Return(updateChannelVal)
 	k.On("PinnedLauncherVersion").Return("")
@@ -36,6 +37,8 @@ func TestOpenWriter_NewDatabase(t *testing.T) {
 	k.On("Slogger").Return(multislogger.NewNopLogger())
 	k.On("KatcConfigStore").Return(inmemory.NewStore())
 
+	k.On("DesktopRunnerServerURL").Return(ulid.New())
+
 	// Set up storage db, which should create the database and set all flags
 	s, err := OpenWriter(context.TODO(), k)
 	require.NoError(t, err, "expected no error setting up storage db")
@@ -87,6 +90,7 @@ func TestOpenWriter_DatabaseAlreadyExists(t *testing.T) {
 	k.On("RegisterChangeObserver", mock.Anything, keys.UpdateChannel)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedLauncherVersion)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedOsquerydVersion)
+	k.On("RegisterChangeObserver", mock.Anything, keys.DesktopRunnerServerUrl)
 
 	// Set up flag
 	updateChannelVal := "alpha"
@@ -99,6 +103,8 @@ func TestOpenWriter_DatabaseAlreadyExists(t *testing.T) {
 	k.On("ConfigStore").Return(inmemory.NewStore())
 	k.On("Slogger").Return(multislogger.NewNopLogger())
 
+	k.On("DesktopRunnerServerURL").Return(ulid.New())
+
 	// Set up storage db, which should create the database and set all flags
 	s, err := OpenWriter(context.TODO(), k)
 	require.NoError(t, err, "expected no error setting up storage db")
@@ -132,13 +138,16 @@ func TestFlagsChanged(t *testing.T) {
 	k.On("RegisterChangeObserver", mock.Anything, keys.UpdateChannel)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedLauncherVersion)
 	k.On("RegisterChangeObserver", mock.Anything, keys.PinnedOsquerydVersion)
+	k.On("RegisterChangeObserver", mock.Anything, keys.DesktopRunnerServerUrl)
 	updateChannelVal := "beta"
 	k.On("UpdateChannel").Return(updateChannelVal).Once()
 	pinnedLauncherVersion := "1.2.3"
 	k.On("PinnedLauncherVersion").Return(pinnedLauncherVersion).Once()
 	pinnedOsquerydVersion := "5.3.2"
 	k.On("PinnedOsquerydVersion").Return(pinnedOsquerydVersion).Once()
 
+	k.On("DesktopRunnerServerURL").Return(ulid.New())
+
 	autoTableConstructionValue := ulid.New()
 
 	configStore := inmemory.NewStore()

ee/agent/types/flags.go

@@ -226,4 +226,8 @@ type Flags interface {
 	// LauncherWatchdogEnabled controls whether launcher installs/runs, or stops/removes the launcher watchdog service
 	SetLauncherWatchdogEnabled(enabled bool) error
 	LauncherWatchdogEnabled() bool
+
+	// DesktopRunnerServerURL is the URL of the desktop runner server
+	SetDesktopRunnerServerURL(url string) error
+	DesktopRunnerServerURL() string
 }