add kdialog for kubuntu key escrow (#24405)

Author: mostlikelee

orbit/changes/23697-kubuntu-luks

@@ -0,0 +1 @@
+* added support for kdialog linux key escrow prompts for compatibility with kubuntu systems

orbit/cmd/orbit/orbit.go

@@ -39,7 +39,6 @@ import (
 	"github.com/fleetdm/fleet/v4/orbit/pkg/update"
 	"github.com/fleetdm/fleet/v4/orbit/pkg/update/filestore"
 	"github.com/fleetdm/fleet/v4/orbit/pkg/user"
-	"github.com/fleetdm/fleet/v4/orbit/pkg/zenity"
 	"github.com/fleetdm/fleet/v4/pkg/certificate"
 	"github.com/fleetdm/fleet/v4/pkg/file"
 	retrypkg "github.com/fleetdm/fleet/v4/pkg/retry"
@@ -938,7 +937,7 @@ func main() {
 			orbitClient.RegisterConfigReceiver(update.ApplyWindowsMDMEnrollmentFetcherMiddleware(windowsMDMEnrollmentCommandFrequency, orbitHostInfo.HardwareUUID, orbitClient))
 			orbitClient.RegisterConfigReceiver(update.ApplyWindowsMDMBitlockerFetcherMiddleware(windowsMDMBitlockerCommandFrequency, orbitClient))
 		case "linux":
-			orbitClient.RegisterConfigReceiver(luks.New(orbitClient, zenity.New()))
+			orbitClient.RegisterConfigReceiver(luks.New(orbitClient))
 		}
 
 		flagUpdateReceiver := update.NewFlagReceiver(orbitClient.TriggerOrbitRestart, update.FlagUpdateOptions{

orbit/pkg/dialog/dialog.go

@@ -1,7 +1,6 @@
 package dialog
 
 import (
-	"context"
 	"errors"
 	"time"
 )
@@ -20,10 +19,10 @@ var (
 type Dialog interface {
 	// ShowEntry displays a dialog that accepts end user input. It returns the entered
 	// text or errors ErrCanceled, ErrTimeout, or ErrUnknown.
-	ShowEntry(ctx context.Context, opts EntryOptions) ([]byte, error)
+	ShowEntry(opts EntryOptions) ([]byte, error)
 	// ShowInfo displays a dialog that displays information. It returns an error if the dialog
 	// could not be displayed.
-	ShowInfo(ctx context.Context, opts InfoOptions) error
+	ShowInfo(opts InfoOptions) error
 	// Progress displays a dialog that shows progress. It waits until the
 	// context is cancelled.
 	ShowProgress(opts ProgressOptions) (cancelFunc func() error, err error)

orbit/pkg/execuser/execuser.go

@@ -2,12 +2,16 @@
 // SYSTEM service on Windows) as the current login user.
 package execuser
 
-import "io"
+import (
+	"io"
+	"time"
+)
 
 type eopts struct {
 	env        [][2]string
 	args       [][2]string
 	stderrPath string //nolint:structcheck,unused
+	timeout    time.Duration
 }
 
 // Option allows configuring the application.
@@ -27,6 +31,13 @@ func WithArg(name, value string) Option {
 	}
 }
 
+// WithTimeout sets the timeout for the application. Currently only supported on Linux.
+func WithTimeout(duration time.Duration) Option {
+	return func(a *eopts) {
+		a.timeout = duration
+	}
+}
+
 // Run runs an application as the current login user.
 // It assumes the caller is running with high privileges (root on Unix, SYSTEM on Windows).
 //

orbit/pkg/execuser/execuser_linux.go

@@ -64,7 +64,16 @@ func runWithOutput(path string, opts eopts) (output []byte, exitCode int, err er
 		}
 	}
 
-	cmd := exec.Command("sudo", args...)
+	// Prefix with "timeout" and "sudo" if applicable
+	var cmdArgs []string
+	if opts.timeout > 0 {
+		cmdArgs = append(cmdArgs, "timeout", fmt.Sprintf("%ds", int(opts.timeout.Seconds())))
+	}
+	cmdArgs = append(cmdArgs, "sudo")
+	cmdArgs = append(cmdArgs, args...)
+
+	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) // #nosec G204
+
 	log.Printf("cmd=%s", cmd.String())
 
 	output, err = cmd.Output()

orbit/pkg/kdialog/kdialog.go

@@ -0,0 +1,129 @@
+package kdialog
+
+import (
+	"errors"
+	"strings"
+	"time"
+
+	"github.com/fleetdm/fleet/v4/orbit/pkg/dialog"
+	"github.com/fleetdm/fleet/v4/orbit/pkg/execuser"
+	"github.com/fleetdm/fleet/v4/orbit/pkg/platform"
+)
+
+const kdialogProcessName = "kdialog"
+
+type KDialog struct {
+	cmdWithOutput func(timeout time.Duration, args ...string) ([]byte, int, error)
+	cmdWithCancel func(args ...string) (cancelFunc func() error, err error)
+}
+
+func New() *KDialog {
+	return &KDialog{
+		cmdWithOutput: execCmdWithOutput,
+		cmdWithCancel: execCmdWithCancel,
+	}
+}
+
+func (k *KDialog) ShowEntry(opts dialog.EntryOptions) ([]byte, error) {
+	args := []string{"--password"}
+	if opts.Text != "" {
+		args = append(args, opts.Text)
+	}
+	if opts.Title != "" {
+		args = append(args, "--title", opts.Title)
+	}
+
+	output, statusCode, err := k.cmdWithOutput(opts.TimeOut, args...)
+	if err != nil {
+		switch statusCode {
+		case 1:
+			return nil, dialog.ErrCanceled
+		case 124:
+			return nil, dialog.ErrTimeout
+		default:
+			return nil, errors.Join(dialog.ErrUnknown, err)
+		}
+	}
+
+	output = []byte(strings.TrimSuffix(string(output), "\n"))
+
+	return output, nil
+}
+
+func (k *KDialog) ShowProgress(opts dialog.ProgressOptions) (func() error, error) {
+	args := []string{"--msgbox"}
+	if opts.Text != "" {
+		args = append(args, opts.Text)
+	}
+	if opts.Title != "" {
+		args = append(args, "--title", opts.Title)
+	}
+
+	cancel, err := k.cmdWithCancel(args...)
+	if err != nil {
+		return nil, err
+	}
+
+	return cancel, nil
+}
+
+func (k *KDialog) ShowInfo(opts dialog.InfoOptions) error {
+	args := []string{"--msgbox"}
+	if opts.Text != "" {
+		args = append(args, opts.Text)
+	}
+	if opts.Title != "" {
+		args = append(args, "--title", opts.Title)
+	}
+
+	_, statusCode, err := k.cmdWithOutput(opts.TimeOut, args...)
+	if err != nil {
+		switch statusCode {
+		case 124:
+			return dialog.ErrTimeout
+		default:
+			return errors.Join(dialog.ErrUnknown, err)
+		}
+	}
+
+	return nil
+}
+
+func execCmdWithOutput(timeout time.Duration, args ...string) ([]byte, int, error) {
+	var opts []execuser.Option
+	for _, arg := range args {
+		opts = append(opts, execuser.WithArg(arg, "")) // using empty value for positional args
+	}
+
+	if timeout > 0 {
+		opts = append(opts, execuser.WithTimeout(timeout))
+	}
+
+	output, exitCode, err := execuser.RunWithOutput(kdialogProcessName, opts...)
+	if err != nil {
+		return nil, exitCode, err
+	}
+
+	return output, exitCode, nil
+}
+
+func execCmdWithCancel(args ...string) (func() error, error) {
+	var opts []execuser.Option
+	for _, arg := range args {
+		opts = append(opts, execuser.WithArg(arg, "")) // using empty value for positional args
+	}
+
+	_, err := execuser.Run(kdialogProcessName, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	killFunc := func() error {
+		if _, err := platform.KillAllProcessByName(kdialogProcessName); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	return killFunc, nil
+}