[tor-bugs] #31562 [Applications/Tor Browser]: The circuit display is not visible on error pages in Tor Browser based on ESR68

[Tor Bug Tracker & Wiki]

#31562: The circuit display is not visible on error pages in Tor Browser based on
ESR68
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  defect                               |         Status:
                                                 |  needs_review
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  ff68-esr, TorBrowserTeam201909R,     |  Actual Points:
  tbb-9.0-must-alpha                             |
Parent ID:                                       |         Points:  1
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by acat):

 * keywords:  ff68-esr, TorBrowserTeam201909, tbb-9.0-must-alpha =>
     ff68-esr, TorBrowserTeam201909R, tbb-9.0-must-alpha
 * status:  needs_revision => needs_review


Comment:

 Thanks for the review.

 >It seems the Firefox folks think otherwise (see: ​https://searchfox.org
 /mozilla-esr68/source/browser/base/content/browser.js#1092 and the comment
 at
 ​https://searchfox.org/mozilla-
 esr60/source/browser/base/content/browser.js#800).

 I'm not sure if the first check
 {{{
 if (firstPartyDomain === k_tb_about_uri_first_party_domain) {
 }}}
 would have ruled out the possibility of null URIs, but you're right, we
 should check that in general.

 That code in the first link pointed me to a way to get the original URI
 that caused the error in (I think) a slightly less-hacky way:
 https://searchfox.org/mozilla-esr68/source/browser/base/content/browser-
 safebrowsing.js#10. It seems that when there is an error
 `gBrowser.currentURI` keeps the original URL, and
 `gBrowser.selectedBrowser.documentURI` (or the contentPrincipal) has the
 `about:*` one (`gBrowser.currentURI` is an alias of
 `gBrowser.selectedBrowser.currentURI`). This would have worked in esr60
 too.

 So here is a patch with this different approach:
 https://github.com/acatarineu/torbutton/commit/31562+1. I also removed the
 check with the hardcoded `k_tb_about_uri_first_party_domain`.

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