Use dbus => OpenURI to open URL when possible

Author: RebeccaMahany

ee/desktop/user/menu/action_open_url_linux.go

@@ -6,12 +6,22 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/godbus/dbus/v5"
 	"github.com/kolide/launcher/v2/ee/allowedcmd"
+	"github.com/kolide/launcher/v2/ee/desktop/user/notify"
 )
 
 // open opens the specified URL in the default browser of the user
 // See https://stackoverflow.com/a/39324149/1705598
 func open(url string) error {
+	// Try via dbus before falling back to xdg-open --
+	// we see improved behavior when using dbus.
+	if conn, err := dbus.SessionBus(); err == nil {
+		if err := notify.OpenViaDbus(conn, url); err == nil {
+			return nil
+		}
+	}
+
 	cmd, err := allowedcmd.XdgOpen.Cmd(context.TODO(), url)
 	if err != nil {
 		return fmt.Errorf("creating command: %w", err)

ee/desktop/user/notify/notify_linux.go

@@ -30,6 +30,9 @@ const (
 	notificationServiceObj       = "/org/freedesktop/Notifications"
 	notificationServiceInterface = "org.freedesktop.Notifications"
 	signalActionInvoked          = "org.freedesktop.Notifications.ActionInvoked"
+	desktopPortalPath            = "/org/freedesktop/portal/desktop"
+	desktopPortalName            = "org.freedesktop.portal.Desktop"
+	methodOpenUri                = "org.freedesktop.portal.OpenURI.OpenURI"
 )
 
 // We default to xdg-open first because, if available, it appears to be better at picking
@@ -57,6 +60,33 @@ func NewDesktopNotifier(slogger *slog.Logger, iconFilepath string, localizationP
 	}
 }
 
+// OpenViaDbus opens the given URI via call to XDG Desktop Portal's OpenURI method.
+// We treat it as successful if the portal accepts; we do not wait for the response.
+// See: https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.OpenURI.html
+func OpenViaDbus(conn *dbus.Conn, uri string) error {
+	if conn == nil {
+		return errors.New("no connection available")
+	}
+
+	desktopPortal := conn.Object(
+		desktopPortalName,
+		desktopPortalPath,
+	)
+
+	var requestHandle dbus.ObjectPath
+	if err := desktopPortal.Call(
+		methodOpenUri,
+		0,
+		"",                        // parent_window
+		uri,                       // uri
+		map[string]dbus.Variant{}, // options
+	).Store(&requestHandle); err != nil {
+		return fmt.Errorf("calling OpenURI: %w", err)
+	}
+
+	return nil
+}
+
 func (d *dbusNotifier) Execute() error {
 	if d.conn != nil {
 		if err := d.conn.AddMatchSignal(
@@ -100,6 +130,17 @@ func (d *dbusNotifier) Execute() error {
 			// Attempt to open a browser to the given URL
 			actionUri := signal.Body[1].(string)
 
+			// Try via dbus before falling back to xdg-open and www-browser --
+			// we see improved behavior when using dbus.
+			err := OpenViaDbus(d.conn, actionUri)
+			if err == nil {
+				continue
+			}
+			d.slogger.Log(context.TODO(), slog.LevelWarn,
+				"couldn't open URI via dbus, falling back to exec",
+				"err", err,
+			)
+
 			for _, browserLauncher := range browserLaunchers {
 				cmd, err := browserLauncher.Cmd(context.TODO(), actionUri)
 				if err != nil {
@@ -137,10 +178,21 @@ func (d *dbusNotifier) Interrupt(err error) {
 
 	if d.conn != nil {
 		d.conn.RemoveSignal(d.signal)
-		d.conn.RemoveMatchSignal(
+		if err := d.conn.RemoveMatchSignal(
 			dbus.WithMatchObjectPath(notificationServiceObj),
 			dbus.WithMatchInterface(notificationServiceInterface),
-		)
+		); err != nil {
+			d.slogger.Log(context.TODO(), slog.LevelWarn,
+				"could not remove match signal during shutdown",
+				"err", err,
+			)
+		}
+		if err := d.conn.Close(); err != nil {
+			d.slogger.Log(context.TODO(), slog.LevelWarn,
+				"could not close session bus connection during shutdown",
+				"err", err,
+			)
+		}
 	}
 }