[tbb-bugs] #30429 [Applications/Tor Browser]: Rebase Tor Browser patches for Firefox ESR 68

[Tor Bug Tracker & Wiki]

#30429: Rebase Tor Browser patches for Firefox ESR 68
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  ff68-esr, tbb-9.0-must-nightly,      |  Actual Points:
  TorBrowserTeam201908                           |
Parent ID:                                       |         Points:
 Reviewer:                                       |        Sponsor:
                                                 |  Sponsor44-can
-------------------------------------------------+-------------------------
Changes (by gk):

 * keywords:  ff68-esr, tbb-9.0-must-nightly, TorBrowserTeam201908R =>
     ff68-esr, tbb-9.0-must-nightly, TorBrowserTeam201908
 * status:  needs_review => needs_revision


Comment:

 Replying to [comment:44 acat]:
 > New branch: https://github.com/acatarineu/tor-browser/commits/30429+8
 >
 > It has latest missing desktop patches from tor-browser-60.8.0esr-9.0-1,
 the latest updater patches, backported #27601
 (https://bugzilla.mozilla.org/show_bug.cgi?id=1330467) and #28711
 (https://bugzilla.mozilla.org/show_bug.cgi?id=1474659) and I also added
 the missing changes to the patch for #25702, which was to copy the release
 `pref/firefox-branding.js` over the nightly and alpha ones, now that the
 updater patches are there.

 I'll comment separately on the onboarding patches in #28822. Here come the
 relevant comment for commits besides them:

 0c19ff1358931bfa1be03dca261ec4d84a9826ee -- okay

 The backported patches for bug 1330467 look mostly good. Part 7 as tiny
 mistake. You end up with:
 {{{
 -  // make sure principals with userContextId or firstPartyDomain use the
 same permissions
 +  // make sure principals with a firstPartyDomain use different
 permissions
    Assert.equal(
      Ci.nsIPermissionManager.ALLOW_ACTION,
      pm.testPermissionFromPrincipal(principal6, TEST_PERMISSION)
    );
    Assert.equal(
 -    Ci.nsIPermissionManager.ALLOW_ACTION,
 +    Ci.nsIPermissionManager.UNKNOWN_ACTION,
      pm.testPermissionFromPrincipal(principal7, TEST_PERMISSION)
    );
 }}}
 but the original is
 {{{
 -  // make sure principals with userContextId or firstPartyDomain use the
 same permissions
 +  // make sure principals with userContextId use the same permissions
    Assert.equal(Ci.nsIPermissionManager.ALLOW_ACTION,
                 pm.testPermissionFromPrincipal(principal6,
 TEST_PERMISSION));
 -  Assert.equal(Ci.nsIPermissionManager.ALLOW_ACTION,
 +  // make sure principals with a firstPartyDomain use different
 permissions
 +  Assert.equal(Ci.nsIPermissionManager.UNKNOWN_ACTION,
                 pm.testPermissionFromPrincipal(principal7,
 TEST_PERMISSION));
 }}}

 cbe8a7e484d4217be86edb0e5cf81709bfe9df68 - okay (mabye squash with
 #25658?)
 1d4f025ccbefad61498044a1e7e1040e935fc736 - okay (mabye squash with
 #25658?)
 fb50127d4f55e8ec102be1a3f7316f96ae2fb578 - okay
 a96dc99a94a687cf4ed6f39ecb4bd09f60e63734 - okay
 849d7121914c595e78e35f068b099c46ba1c6e9a - okay

 I am still debating taking the permission API patches out of the final
 alpha branch. But for now (one or two nightlies) I let them in. So, fixing
 up the tiny mistake above should be a fixup then as I am about to push a
 68.1.0esr branch for further testing.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30429#comment:47>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online