[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.5.0esr-13.5-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown

[ma1 (@ma1)]

ma1 pushed to branch base-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
2a4e21db by hackademix at 2023-12-04T12:18:52+01:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown

Bug 42306: Prevent crashes and actually clear the clipboard on Wayland

- - - - -


1 changed file:

- browser/components/BrowserGlue.sys.mjs


Changes:

=====================================
browser/components/BrowserGlue.sys.mjs
=====================================
@@ -155,12 +155,17 @@ const ClipboardPrivacy = {
   _globalActivation: false,
   _isPrivateClipboard: false,
   _hasher: null,
+  _shuttingDown: false,
 
-  _computeClipboardHash(win = Services.ww.activeWindow) {
+  _createTransferable() {
     const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance(
       Ci.nsITransferable
     );
-    trans.init(win?.docShell?.QueryInterface(Ci.nsILoadContext) || null);
+    trans.init(null);
+    return trans;
+  },
+  _computeClipboardHash() {
+    const trans = this._createTransferable();
     ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor);
     try {
       Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard);
@@ -199,16 +204,26 @@ const ClipboardPrivacy = {
           this._globalActivation = !Services.focus.activeWindow;
         }, 100);
       }
-      const clipboardHash = this._computeClipboardHash(win);
-      if (clipboardHash !== this._lastClipboardHash) {
-        this._isPrivateClipboard =
-          !activation &&
-          (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing ||
-            lazy.PrivateBrowsingUtils.isWindowPrivate(win));
-        this._lastClipboardHash = clipboardHash;
-        console.log(
-          `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.`
-        );
+
+      const checkClipboardContent = () => {
+        const clipboardHash = this._computeClipboardHash();
+        if (clipboardHash !== this._lastClipboardHash) {
+          this._isPrivateClipboard =
+            !activation &&
+            (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing ||
+              lazy.PrivateBrowsingUtils.isWindowPrivate(win));
+          this._lastClipboardHash = clipboardHash;
+          console.log(
+            `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.`
+          );
+        }
+      };
+
+      if (win.closed) {
+        checkClipboardContent();
+      } else {
+        // defer clipboard access on DOM events to work-around tor-browser#42306
+        lazy.setTimeout(checkClipboardContent, 0);
       }
     };
     const focusListener = e =>
@@ -231,18 +246,28 @@ const ClipboardPrivacy = {
           if (
             this._isPrivateClipboard &&
             lazy.PrivateBrowsingUtils.isWindowPrivate(win) &&
-            !(
-              lazy.PrivateBrowsingUtils.permanentPrivateBrowsing ||
-              Array.from(Services.ww.getWindowEnumerator()).find(w =>
-                lazy.PrivateBrowsingUtils.isWindowPrivate(w)
-              )
-            )
+            (this._shuttingDown ||
+              !Array.from(Services.ww.getWindowEnumerator()).find(
+                w =>
+                  lazy.PrivateBrowsingUtils.isWindowPrivate(w) &&
+                  // We need to filter out the HIDDEN WebExtensions window,
+                  // which might be private as well but is not UI-relevant.
+                  !w.location.href.startsWith("chrome://extensions/")
+              ))
           ) {
             // no more private windows, empty private content if needed
             this.emptyPrivate();
           }
       }
     });
+
+    lazy.AsyncShutdown.quitApplicationGranted.addBlocker(
+      "ClipboardPrivacy: removing private data",
+      () => {
+        this._shuttingDown = true;
+        this.emptyPrivate();
+      }
+    );
   },
   emptyPrivate() {
     if (
@@ -253,7 +278,20 @@ const ClipboardPrivacy = {
       ) &&
       this._lastClipboardHash === this._computeClipboardHash()
     ) {
-      Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard);
+      // nsIClipboard.emptyClipboard() does nothing in Wayland:
+      // we'll set an empty string as a work-around.
+      const trans = this._createTransferable();
+      const flavor = "text/plain";
+      trans.addDataFlavor(flavor);
+      const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance(
+        Ci.nsISupportsString
+      );
+      emptyString.data = "";
+      trans.setTransferData(flavor, emptyString);
+      const { clipboard } = Services,
+        { kGlobalClipboard } = clipboard;
+      clipboard.setData(trans, null, kGlobalClipboard);
+      clipboard.emptyClipboard(kGlobalClipboard);
       this._lastClipboardHash = null;
       this._isPrivateClipboard = false;
       console.log("Private clipboard emptied.");
@@ -2027,7 +2065,6 @@ BrowserGlue.prototype = {
           lazy.UpdateListener.reset();
         }
       },
-      () => ClipboardPrivacy.emptyPrivate(), // tor-browser#42019
     ];
 
     for (let task of tasks) {



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2a4e21db1380767281ab4798219b1c55664746fe

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2a4e21db1380767281ab4798219b1c55664746fe
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20231204/775a2046/attachment-0001.htm>