- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new branch foo
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed new branch foo at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/foo You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/41503-dis… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.0-1-build2
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed new tag tor-browser-102.6.0esr-12.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 2 commits: Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 8825bcad by hackademix at 2022-12-14T13:34:31+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 8b01895e by hackademix at 2022-12-14T13:34:31+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - 5 changed files: - browser/components/places/PlacesUIUtils.jsm - browser/components/places/content/controller.js - dom/base/ContentAreaDropListener.jsm - toolkit/components/places/PlacesUtils.jsm - toolkit/torproject/torbutton Changes: ===================================== browser/components/places/PlacesUIUtils.jsm ===================================== @@ -1903,7 +1903,11 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "URI_FLAVORS", () => { return [PlacesUtils.TYPE_X_MOZ_URL, TAB_DROP_TYPE, PlacesUtils.TYPE_UNICODE]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "SUPPORTED_FLAVORS", () => { - return [...PlacesUIUtils.PLACES_FLAVORS, ...PlacesUIUtils.URI_FLAVORS]; + return [ + ...PlacesUIUtils.PLACES_FLAVORS, + ...PlacesUIUtils.URI_FLAVORS, + "application/x-torbrowser-opaque", + ]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() { ===================================== browser/components/places/content/controller.js ===================================== @@ -1251,6 +1251,7 @@ PlacesController.prototype = { [ PlacesUtils.TYPE_X_MOZ_PLACE, PlacesUtils.TYPE_X_MOZ_URL, + "application/x-torbrowser-opaque", PlacesUtils.TYPE_UNICODE, ].forEach(type => xferable.addDataFlavor(type)); ===================================== dom/base/ContentAreaDropListener.jsm ===================================== @@ -5,6 +5,16 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); + +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // This component is used for handling dragover and drop of urls. // // It checks to see whether a drop of a url is allowed. For instance, a url @@ -43,10 +53,15 @@ ContentAreaDropListener.prototype = { } } - type = "text/x-moz-url"; - if (types.contains(type)) { + for (let type of ["text/x-moz-url", "application/x-torbrowser-opaque"]) { + if (!types.contains(type)) { + continue; + } data = dt.mozGetDataAt(type, i); if (data) { + if (type === "application/x-torbrowser-opaque") { + ({ type, value: data = "" } = gOpaqueDrag.get(data)); + } let lines = data.split("\n"); for (let i = 0, length = lines.length; i < length; i += 2) { this._addLink(links, lines[i], lines[i + 1], type); @@ -250,6 +265,7 @@ ContentAreaDropListener.prototype = { if ( !types.includes("application/x-moz-file") && !types.includes("text/x-moz-url") && + !types.includes("application/x-torbrowser-opaque") && !types.includes("text/uri-list") && !types.includes("text/x-moz-text-internal") && !types.includes("text/plain") ===================================== toolkit/components/places/PlacesUtils.jsm ===================================== @@ -32,6 +32,12 @@ XPCOMUtils.defineLazyGetter(this, "gCryptoHash", () => { return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash); }); +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where // we really just want "\n". On other platforms, the transferable system // converts "\r\n" to "\n". @@ -1132,6 +1138,9 @@ var PlacesUtils = { unwrapNodes: function PU_unwrapNodes(blob, type) { // We split on "\n" because the transferable system converts "\r\n" to "\n" var nodes = []; + if (type === "application/x-torbrowser-opaque") { + ({ value: blob, type } = gOpaqueDrag.get(blob)); + } switch (type) { case this.TYPE_X_MOZ_PLACE: case this.TYPE_X_MOZ_PLACE_SEPARATOR: ===================================== toolkit/torproject/torbutton ===================================== @@ -1 +1 @@ -Subproject commit b0a2e740d6c7440cc9722358eb775c6a04f49e72 +Subproject commit a5767f29c0d509c6cb34527c091ae0c4bfc2f386 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2657bbcf by Richard Pospesel at 2022-12-14T13:20:10+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core migrate from gitolite repo to our gitlab repo for the torbutton submodule - - - - - 1 changed file: - .gitmodules Changes: ===================================== .gitmodules ===================================== @@ -1,3 +1,3 @@ [submodule "toolkit/torproject/torbutton"] path = toolkit/torproject/torbutton - url = https://git.torproject.org/torbutton.git + url = https://gitlab.torproject.org/tpo/applications/torbutton.git View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbutton][maint-12.0] Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / torbutton Commits: a5767f29 by hackademix at 2022-12-14T12:43:47+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 1 changed file: - components/dragDropFilter.js Changes: ===================================== components/dragDropFilter.js ===================================== @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["crypto"]); // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; @@ -28,50 +29,55 @@ const URLISH_TYPES = Object.freeze([ "application/x-moz-file-promise-url", ]); -/* - Returns true if the text resembles a URL or even just a hostname - in a way that may prompt the O.S. or other applications to send out a - validation DNS query, if not a full request (e.g. " torproject.org", - even with the leading whitespace). -*/ -function isURLish(text) { - // Ignore leading whitespace. - text = text.trim(); - - // Without any protocol or dot in the first chunk, this is unlikely - // to be considered URLish (exception: localhost, but we don't care). - if (!/^[a-z][a-z0-9+-]*:\/\//i.test(text)) { - // no protocol - if (!/^[^.\s\/]+\.[^.\s\/]/.test(text)) { - // no dot - return false; +const MAIN_PROCESS = + Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT; + +const EMPTY_PAYLOAD = {}; +const OpaqueDrag = { + listening: false, + payload: EMPTY_PAYLOAD, + store(value, type) { + let opaqueKey = crypto.randomUUID(); + this.payload = { opaqueKey, value, type }; + if (!this.listening && MAIN_PROCESS) { + Services.ppmm.addMessageListener( + "DragDropFilter:GetOpaqueDrag", + () => this.payload + ); + this.listening = true; } - // Prepare for hostname validation via relative URL building. - text = `//${text}`; - } - // Validate URL or hostname. - try { - new URL(text, "https://localhost"); - return true; - } catch (e) { - // invalid URL, bail out - } - return false; -} - -// Returns true if any chunk of text is URLish -const hasURLish = text => text.split(/[^\p{L}_.-:\/%~@$-]+/u).some(isURLish); + return opaqueKey; + }, + retrieve(key) { + let { opaqueKey, value, type } = this.payload; + if (opaqueKey === key) { + return { value, type }; + } + if (!MAIN_PROCESS) { + this.payload = Services.cpmm.sendSyncMessage( + "DragDropFilter:GetOpaqueDrag" + )[0]; + if (key === this.payload.opaqueKey) { + return this.retrieve(key); + } + } + return EMPTY_PAYLOAD; + }, +}; function DragDropFilter() { this.logger = Cc["@torproject.org/torbutton-logger;1"].getService( Ci.nsISupports ).wrappedJSObject; this.logger.log(3, "Component Load 0: New DragDropFilter."); - - try { - Services.obs.addObserver(this, "on-datatransfer-available"); - } catch (e) { - this.logger.log(5, "Failed to register drag observer"); + if (MAIN_PROCESS) { + // We want to update our status in the main process only, in order to + // serve the same opaque drag payload in every process. + try { + Services.obs.addObserver(this, "on-datatransfer-available"); + } catch (e) { + this.logger.log(5, "Failed to register drag observer"); + } } } @@ -109,23 +115,38 @@ DragDropFilter.prototype = { const types = aDataTransfer.mozTypesAt(i); for (const type of types) { this.logger.log(3, `Type is: ${type}.`); - if ( - URLISH_TYPES.includes(type) || - ((type === "text/plain" || type === "text/html") && - hasURLish(aDataTransfer.getData(type))) - ) { + if (URLISH_TYPES.includes(type)) { this.logger.log( 3, - `Removing transfer data ${aDataTransfer.getData(type)}` + `Removing transfer data ${aDataTransfer.mozGetDataAt(type, i)}` ); + const urlType = "text/x-moz-url"; + // Fallback url type, to be parsed by this browser but not externally + const INTERNAL_FALLBACK = "application/x-torbrowser-opaque"; + if (types.contains(urlType)) { + const link = aDataTransfer.mozGetDataAt(urlType, i); + const opaqueKey = OpaqueDrag.store(link, urlType); + aDataTransfer.mozSetDataAt(INTERNAL_FALLBACK, opaqueKey, i); + } for (const type of types) { - aDataTransfer.clearData(type); + if ( + type !== INTERNAL_FALLBACK && + type !== "text/x-moz-place" // don't touch bookmarks + ) { + aDataTransfer.mozClearDataAt(type, i); + } } break; } } } }, + + opaqueDrag: { + get(opaqueKey) { + return OpaqueDrag.retrieve(opaqueKey); + }, + }, }; // Assign factory to global object. View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0
by boklm (＠boklm) 13 Dec '22

13 Dec '22

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c74e0320 by Nicolas Vigier at 2022-12-13T19:54:42+01:00 Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,3 +64,6 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] + # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-bundle-testsuite] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/main by this push: new 0342091 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 0342091 is described below commit 03420915806b22536cfb2f35315f169e3db50346 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:15:52 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-bundle-testsuite.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new 789b727 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 789b727 is described below commit 789b727494c2e5435e77ed64a426aa15fbff8a53 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:12:45 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-spec.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-spec -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0