Add DBus interaction

action/clipboard_others.go

@@ -10,7 +10,6 @@ import (
 	"os/exec"
 	"strconv"
 	"syscall"
-	"time"
 )
 
 // clearClipboard will spwan a copy of gopass that waits in a detached background
@@ -20,10 +19,7 @@ import (
 func clearClipboard(ctx context.Context, content []byte, timeout int) error {
 	hash := fmt.Sprintf("%x", sha256.Sum256(content))
 
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, os.Args[0], "unclip", "--timeout", strconv.Itoa(timeout))
+	cmd := exec.Command(os.Args[0], "unclip", "--timeout", strconv.Itoa(timeout))
 	// https://groups.google.com/d/msg/golang-nuts/shST-SDqIp4/za4oxEiVtI0J
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Setpgid: true,

action/unclip.go

@@ -13,6 +13,7 @@ import (
 
 // Unclip tries to erase the content of the clipboard
 func (s *Action) Unclip(ctx context.Context, c *cli.Context) error {
+	force := c.Bool("force")
 	timeout := c.Int("timeout")
 	checksum := os.Getenv("GOPASS_UNCLIP_CHECKSUM")
 
@@ -25,12 +26,23 @@ func (s *Action) Unclip(ctx context.Context, c *cli.Context) error {
 
 	hash := fmt.Sprintf("%x", sha256.Sum256([]byte(cur)))
 
-	if hash != checksum {
+	if hash != checksum && !force {
 		return nil
 	}
+
 	if err := clipboard.WriteAll(""); err != nil {
+		_ = s.unclipNotify(ctx, "Failed to clear clipboard")
 		return s.exitError(ctx, ExitIO, err, "failed to write clipboard: %s", err)
 	}
 
+	if err := s.clearClipboardHistory(ctx); err != nil {
+		_ = s.unclipNotify(ctx, "Failed to clear clipboard history")
+		return s.exitError(ctx, ExitIO, err, "failed to clear clipboard history: %s", err)
+	}
+
+	if err := s.unclipNotify(ctx, "Clipboard has been cleared"); err != nil {
+		return s.exitError(ctx, ExitIO, err, "failed to send unclip notification: %s", err)
+	}
+
 	return nil
 }

action/unclip_linux.go

@@ -0,0 +1,43 @@
+// +build linux
+
+package action
+
+import (
+	"context"
+	"strings"
+
+	"github.com/godbus/dbus"
+)
+
+func (s *Action) clearClipboardHistory(ctx context.Context) error {
+	conn, err := dbus.SessionBus()
+	if err != nil {
+		return err
+	}
+
+	obj := conn.Object("org.kde.klipper", "/klipper")
+	call := obj.Call("org.kde.klipper.klipper.clearClipboardHistory", 0)
+	if call.Err != nil {
+		if strings.HasPrefix(call.Err.Error(), "The name org.kde.klipper was not provided") {
+			return nil
+		}
+		return call.Err
+	}
+
+	return nil
+}
+
+func (s *Action) unclipNotify(ctx context.Context, msg string) error {
+	conn, err := dbus.SessionBus()
+	if err != nil {
+		return err
+	}
+
+	obj := conn.Object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
+	call := obj.Call("org.freedesktop.Notifications.Notify", 0, "gopass", uint32(0), "", "gopass - clipboard", msg, []string{}, map[string]dbus.Variant{}, int32(5000))
+	if call.Err != nil {
+		return err
+	}
+
+	return nil
+}

action/unclip_others.go

@@ -0,0 +1,13 @@
+// +build !linux
+
+package action
+
+import "context"
+
+func (s *Action) clearClipboardHistory(ctx context.Context) error {
+	return nil
+}
+
+func (s *Action) unclipNotify(ctx context.Context, msg string) error {
+	return nil
+}

main.go

@@ -987,6 +987,10 @@ func main() {
 					Name:  "timeout",
 					Usage: "Time to wait",
 				},
+				cli.BoolFlag{
+					Name:  "force",
+					Usage: "Clear clipboard even if checksum mismatches",
+				},
 			},
 		},
 		{