Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a confirmation mechanism to notify users when the Fleet agent successfully installed on Windows. #24987

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −4
Draft

Added a confirmation mechanism to notify users when the Fleet agent successfully installed on Windows. #24987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aec043a
Added a confirmation mechanism to notify users when the Fleet agent i…
parsimeikoikai Dec 23, 2024
aa537a1
Merge branch 'main' into feat/add-install-confirmation-21980
parsimeikoikai Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions orbit/cmd/desktop/desktop_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import (
_ "embed"
"errors"
"fmt"
"syscall"
"time"
"unsafe"

"github.com/rs/zerolog/log"
"golang.org/x/sys/windows"
Expand All @@ -16,16 +18,34 @@ import (
// For Windows we must use ico format for the icon,
// see https://github.com/getlantern/systray/blob/6065fda28be8c8d91aeb5e20de25e1600b8664a3/systray_windows.go#L850-L856.

// In the past we implemented some logic to detect the Windows theme but it was buggy,
// so as a temporary fix we are using the same colored icon for both themes.
// Such theme detection logic was removed in this PR: https://github.com/fleetdm/fleet/pull/16402.

//go:embed windows_app.ico
var iconLight []byte

//go:embed windows_app.ico
var iconDark []byte

// MessageBox displays a Windows message box with the specified title and text.
func MessageBox(title, text string) {
// Load user32.dll
user32 := syscall.MustLoadDLL("user32.dll")
defer user32.Release()

// Load MessageBoxW function
messageBox := user32.MustFindProc("MessageBoxW")

// Convert strings to UTF16
textUTF16, _ := syscall.UTF16PtrFromString(text)
titleUTF16, _ := syscall.UTF16PtrFromString(title)

// Call MessageBoxW
messageBox.Call(
0, // Handle to owner window (0 for no owner)
uintptr(unsafe.Pointer(textUTF16)), // Text message
uintptr(unsafe.Pointer(titleUTF16)), // Title
0, // Style (0 for OK button)
)
}

// blockWaitForStopEvent waits for the named event kernel object to be signalled
func blockWaitForStopEvent(channelId string) error {
if channelId == "" {
Expand Down Expand Up @@ -73,5 +93,8 @@ func blockWaitForStopEvent(channelId string) error {
return fmt.Errorf("event wait was interrupted for unknown reasons: %d", s)
}

// Display a confirmation message after successful installation
MessageBox("Installation Successful", "The Fleet agent has been installed and enrolled successfully!")

return nil
}
Loading