- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.6.0esr-9.5-1] Merge commit 'da5513527e50e7f13e3b1c3206ed75ff8fbd76db' into tor-browser-68.6.0esr-9.5-1
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 2d2c850302274bdf1a506949856c91c5b138983c Merge: 31200493ae90 da5513527e50 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 02:13:56 2020 +0000 Merge commit 'da5513527e50e7f13e3b1c3206ed75ff8fbd76db' into tor-browser-68.6.0esr-9.5-1 browser/base/content/browser.js | 12 ++ browser/base/content/browser.xul | 3 + browser/components/BrowserGlue.jsm | 10 ++ .../onionservices/OnionLocationChild.jsm | 43 ++++++ .../onionservices/OnionLocationParent.jsm | 161 +++++++++++++++++++++ .../content/onionlocation-notification-icons.css | 5 + .../onionservices/content/onionlocation-urlbar.css | 27 ++++ .../content/onionlocation-urlbar.inc.xul | 10 ++ .../onionservices/content/onionlocation.svg | 3 + .../content/onionlocationPreferences.inc.xul | 11 ++ .../content/onionlocationPreferences.js | 31 ++++ browser/components/onionservices/jar.mn | 2 + browser/components/onionservices/moz.build | 2 + .../components/preferences/in-content/privacy.js | 17 +++ .../components/preferences/in-content/privacy.xul | 2 + browser/modules/TorStrings.jsm | 39 +++++ browser/themes/shared/notification-icons.inc.css | 2 + browser/themes/shared/urlbar-searchbar.inc.css | 2 + dom/base/Document.cpp | 32 +++- dom/base/Document.h | 2 + dom/webidl/Document.webidl | 9 ++ modules/libpref/init/StaticPrefList.h | 7 + xpcom/ds/StaticAtoms.py | 1 + 23 files changed, 432 insertions(+), 1 deletion(-) diff --cc browser/components/onionservices/moz.build index e4b6d73f8f40,bf276c4a3c4c..dfd664df434e --- a/browser/components/onionservices/moz.build +++ b/browser/components/onionservices/moz.build @@@ -1,7 -1,6 +1,9 @@@ JAR_MANIFESTS += ['jar.mn'] EXTRA_JS_MODULES += [ + 'ExtensionMessaging.jsm', + 'HttpsEverywhereControl.jsm', + 'OnionAliasStore.jsm', + 'OnionLocationChild.jsm', + 'OnionLocationParent.jsm', ]

1 0

[tor-browser/tor-browser-68.6.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 51cf695dd401dc0ce322c32145b207e13904ce65 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 02:21:53 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ce150c56c02a..dd027529aecd 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ce150c56c02a3bd48b345d104132b9d4868bd174 +Subproject commit dd027529aecd4f6632c41b2f07bd6519b0e4cbf5

1 0

[torbutton/master] Bug 21952: Add strings for Onion-Location
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 8026b5ea1bff17c30a95df2192b475e569501a2d Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Mar 10 19:13:37 2020 +0100 Bug 21952: Add strings for Onion-Location --- chrome/locale/en-US/torbutton.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 375067b3..49c72194 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -80,3 +80,17 @@ onionServices.authPreferences.remove=Remove onionServices.authPreferences.removeAll=Remove All onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion-Location strings. +onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritizeAccessKey=a +onionLocation.notNow=Not Now +onionLocation.notNowAccessKey=n +onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.tryThis=Try Onion Services +onionLocation.onionAvailable=.onion available +onionLocation.learnMore=Learn more… +onionLocation.always=Always +onionLocation.askEverytime=Ask every time +onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.onionServicesTitle=Onion Services

1 0

[torbutton/master] Merge remote-tracking branch 'bradetpo/bug19251-03'
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 751a8d02b6ca5e7c8e2a05972c83f2776996f3d8 Merge: d2ca013e 7ce7e376 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 01:57:57 2020 +0000 Merge remote-tracking branch 'bradetpo/bug19251-03' chrome/locale/en-US/torbutton.properties | 49 ++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 28005: Crop long .onion domains in circuit display and implement click to copy
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit e6fb19bf14512707f1141a1306f9ee11dadcd2f6 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Feb 10 16:04:44 2020 +0100 Bug 28005: Crop long .onion domains in circuit display and implement click to copy We also show a tooltip with the full domain on hover, so that it's not necessary to copy it for users to see it. --- chrome/content/tor-circuit-display.js | 34 ++++++++++++++++++++++++++++++-- chrome/locale/en-US/torbutton.properties | 2 ++ chrome/skin/tor-circuit-display.css | 26 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 19b55d18..119f6fca 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -236,7 +236,9 @@ let showCircuitDisplay = function (show) { // and returns nested xml element objects. let xmlTree = function xmlTree (ns, data) { let [type, attrs, ...children] = data; - let element = document.createElementNS(ns, type); + let element = type.startsWith("html:") + ? document.createXULElement(type) + : document.createElementNS(ns, type); for (let [key, val] of Object.entries(attrs)) { element.setAttribute(key, val); } @@ -308,12 +310,40 @@ let updateCircuitDisplay = function () { (i === 0 && nodeData[0].type !== "bridge") ? ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); } + + let domainParts = []; if (domain.endsWith(".onion")) { for (let i = 0; i < 3; ++i) { li(uiString("relay")); } + if (domain.length > 22) { + domainParts.push(domain.slice(0, 7), "…", domain.slice(-12)); + } else { + domainParts.push(domain); + } + } else { + domainParts.push(domain); } - li(domain); + + // We use a XUL html:span element so that the tooltiptext is displayed. + li([ + "html:span", + { + class: "circuit-onion", + onclick: ` + this.classList.add("circuit-onion-copied"); + Cc[ + "@mozilla.org/widget/clipboardhelper;1" + ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) + `, + "data-onion": domain, + "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), + "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), + tooltiptext: domain, + }, + ...domainParts, + ]); + // Hide the note about guards if we are using a bridge. document.getElementById("circuit-guard-note-container").style.display = (nodeData[0].type === "bridge") ? "none" : "block"; diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 375067b3..14330f6f 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country torbutton.circuit_display.guard = Guard torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Learn more +torbutton.circuit_display.click_to_copy = Click to Copy +torbutton.circuit_display.copied = Copied! torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 485ae7a5..3c349e0c 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -155,3 +155,29 @@ ul#circuit-display-nodes li:last-child { .circuit-link:hover { text-decoration: underline; } + +.circuit-onion { + cursor: pointer; +} + +.circuit-onion:hover::after { + opacity: 1; +} + +.circuit-onion::after { + background-color: #e3e3e3; + border-radius: 2px; + color: black; + content: attr(data-text-clicktocopy); + font-size: 80%; + opacity: 0; + padding: 5px; + margin: 10px; + text-align: center; + transition: opacity 0.3s cubic-bezier(0.07, 0.95, 0, 1); +} + +.circuit-onion-copied::after { + content: attr(data-text-copied); + opacity: 1; +}

1 0

[torbutton/master] Merge remote-tracking branch 'acat/28005+2'
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit b2d4c6348cb7cc604ef705b04837baf5db59041f Merge: 751a8d02 e6fb19bf Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 02:16:11 2020 +0000 Merge remote-tracking branch 'acat/28005+2' chrome/content/tor-circuit-display.js | 34 ++++++++++++++++++++++++++++++-- chrome/locale/en-US/torbutton.properties | 2 ++ chrome/skin/tor-circuit-display.css | 26 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 19251: Show improved error pages for onion service errors.
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 7ce7e376fc8f3e51cf5de04f1a254c9190e3364b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 4 16:49:14 2020 -0500 Bug 19251: Show improved error pages for onion service errors. Add strings for onion service error pages. --- chrome/locale/en-US/torbutton.properties | 49 ++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 375067b3..536c3ade 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -60,9 +60,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, pageInfo_OnionEncryption=Connection Encrypted (Onion Service) # Onion services strings. Strings are kept here for ease of translation. -# LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.learnMore=Learn more -onionServices.clientAuthMissing=Tor onion service missing client authorization +onionServices.errorPage.browser=Browser +onionServices.errorPage.network=Network +onionServices.errorPage.onionSite=Onionsite +# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with +# an error code, e.g., 0xF3. +# Tor SOCKS error 0xF0: +onionServices.descNotFound.pageTitle=Problem Loading Onionsite +onionServices.descNotFound.header=Onionsite Not Found +onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +# Tor SOCKS error 0xF1: +onionServices.descInvalid.pageTitle=Problem Loading Onionsite +onionServices.descInvalid.header=Onionsite Cannot Be Reached +onionServices.descInvalid=The onionsite is unreachable due an internal error. +onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +# Tor SOCKS error 0xF2: +onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.header=Onionsite Has Disconnected +onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +# Tor SOCKS error 0xF3: +onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.header=Unable to Connect to Onionsite +onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +# Tor SOCKS error 0xF4: +onionServices.clientAuthMissing.pageTitle=Authorization Required +onionServices.clientAuthMissing.header=Onionsite Requires Authentication +onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +# Tor SOCKS error 0xF5: +onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +# Tor SOCKS error 0xF6: +onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.header=Invalid Onionsite Address +onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +# Tor SOCKS error 0xF7: +onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out +onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +# +# LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Done

1 0

[torbutton/master] Merge remote-tracking branch 'acat/21952+2'
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit dd027529aecd4f6632c41b2f07bd6519b0e4cbf5 Merge: b2d4c634 8026b5ea Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 02:17:20 2020 +0000 Merge remote-tracking branch 'acat/21952+2' chrome/locale/en-US/torbutton.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+)

1 0

[torbutton/master] Merge remote-tracking branch 'richardtpo/bug_33707'
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit d2ca013e59444c04c9e0589a80bf6f611b3aebec Merge: b036ffac c5737a6c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 01:41:53 2020 +0000 Merge remote-tracking branch 'richardtpo/bug_33707' chrome/skin/torbutton.svg | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)

1 0

[torbutton/master] Bug 33707: Swap out onion icon in circuit display with new one
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit c5737a6c0957bf3a03953fa9b83ca03799442a16 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Mar 24 14:34:02 2020 -0500 Bug 33707: Swap out onion icon in circuit display with new one Replaced torbutton's torbutton.svg with tor-browser's torPreferencesIcon.svg to match new style --- chrome/skin/torbutton.svg | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/chrome/skin/torbutton.svg b/chrome/skin/torbutton.svg index f39e67b1..30cd52ba 100644 --- a/chrome/skin/torbutton.svg +++ b/chrome/skin/torbutton.svg @@ -1,7 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g fill="context-fill" fill-opacity="context-fill-opacity"> - <path d="M7.06561268 5.02241519C6.77772045 5.2116121 5.67952408 5.90554501 5.6853992 5.90178938C5.35790364 6.11113858 5.09635335 6.28354515 4.86413018 6.44457064C4.45268439 6.72987059 4.15887546 6.96359333 3.97499388 7.15193679C2.95731966 8.16499644 2.66333288 8.97771922 2.77290903 10.3548433C2.86347409 11.8242645 4.01769529 13.1628244 5.73360996 13.7141752C6.42393225 13.9308094 7.08993386 14.0 8.24418607 14.0C9.69409954 14.0 11.010192 13.6175745 11.8475477 12.9475461C12.7611494 12.2214478 13.2954545 11.1244618 13.2954545 10.0058997C13.2954545 8.86286776 12.7876949 7.76058164 11.8769727 6.9600938C11.3838667 6.53505399 10.722397 6.11798563 9.75901067 5.60447735C9.08955454 5.26286683 8.4719792 4.75203246 8.02479915 4.11379651C7.77978416 4.4739196 7.45874047 4.78154253 7.06561268 5.02241519C7.06561268 5.02241519 7.06561268 5.02241519 7.06561268 5.02241519M13.1898674 5.45132743C14.5364638 6.63126844 15.2954545 8.28318584 15.2954545 10.0058997C15.2954545 11.7286136 14.4874967 13.4041 298 13.0919331 14.5132743C11.7943039 15.5516224 9.98251962 16.0 8.24418607 16.0C7.16690894 16.0 6.1875661 15.9528024 5.13477254 15.6224189C2.71089901 14.8436578 0.923598318 12.8613569 0.776696891 10.4778761C0.629795465 8.63716814 1.07049974 7.22123894 2.56399758 5.73451327C3.32298828 4.95575221 4.88993683 4.05899705 5.96721396 3.35103245C6.50585253 3.02064897 7.06897466 2.02949853 5.99169753 0.16519174C5.99169753 0.16519174 6.21204967 0.0 6.21204967 0.0C6.21204967 0.0 9.41939748 1.27433628 9.41939748 1.27433628C8.97869321 2.64306785 10.2518389 3.61061947 10.6680596 3.82300885C11.5984353 4.31858407 12.4798439 4.83775811 13.1898674 5.45132743C13.1898674 5.45132743 13.1898674 5.45132743 13.1898674 5.45132743" fill="context-fill" fill-opacity="context-fill-opacity"/> - <path d="M8.27272727 5.0C8.49625435 5.67889606 9.03172133 6.21869701 9.63636041 6.5268042C10.3279607 6.89485621 10.8036714 7.19446079 11.1684763 7.5087455C11.8759239 8.12902347 12.2727273 8.98864463 12.2727273 9.88278877C12.2727273 10.7655864 11.852758 11.6266312 11.1353943 12.1959748C10.4876507 12.713565 9.5005326 13.0 8.42423809 13.0C8.37244863 13.0 8.32197458 12.9998006 8.27272727 12.9993871C8.27272727 12.9993871 8.27272727 5.0 8.27272727 5.0C8.27272727 5.0 8.27272727 5.0 8.27272727 5.0" fill="context-fill" fill-opacity="context-fill-opacity"/> - </g> -</svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="M12.0246161,21.8174863 L12.0246161,20.3628098 C16.6324777,20.3495038 20.3634751,16.6108555 20.3634751,11.9996673 C20.3634751,7.38881189 16.6324777,3.65016355 12.0246161,3.63685757 L12.0246161,2.18218107 C17.4358264,2.1958197 21.8178189,6.58546322 21.8178189,11.9996673 C21.8178189,17.4142042 17.4358264,21.8041803 12.0246161,21.8174863 L12.0246161,21.8174863 Z M12.0246161,16.7259522 C14.623607,16.7123136 16.7272828,14.6023175 16.7272828,11.9996673 C16.7272828,9.39734991 14.623607,7.28735377 12.0246161,7.27371516 L12.0246161,5.81937131 C15.4272884,5.8326773 18.1819593,8.59400123 18.1819593,11.9996673 C18.1819593,15.4056661 15.4272884,18.1669901 12.0246161,18.1802961 L12.0246161,16.7259522 Z M12.0246161,9.45556355 C13.4187503,9.46886953 14.5454344,10.6022066 14.5454344,11.9996673 C14.5454344,13.3974608 13.4187503,14.5307978 12.0246161,14.5441038 L12.0246161,9.45556355 Z M0,11.9996673 C0,18.6273771 5.37229031,24 12,24 C18 .6273771,24 24,18.6273771 24,11.9996673 C24,5.37229031 18.6273771,0 12,0 C5.37229031,0 0,5.37229031 0,11.9996673 Z"/> +</svg> \ No newline at end of file

1 0