July 2022 - tbb-commits - lists.torproject.org

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 20 Jul '22

20 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new a460fcd3fa858 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection a460fcd3fa858 is described below commit a460fcd3fa858179ba0b990f5773ea47b687abca Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Tue Jul 19 20:11:38 2022 +0300 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection fix: don't invert bridges' QRs' colors in dark theme Fixes https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41049 + a pinch of refactoring --- .../torpreferences/content/bridgeQrDialog.xhtml | 10 ++-- .../torpreferences/content/connectionPane.xhtml | 5 +- .../torpreferences/content/torPreferences.css | 64 +++++++++++++--------- 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/browser/components/torpreferences/content/bridgeQrDialog.xhtml b/browser/components/torpreferences/content/bridgeQrDialog.xhtml index 2a49e4c0e7d9e..5411c963ba490 100644 --- a/browser/components/torpreferences/content/bridgeQrDialog.xhtml +++ b/browser/components/torpreferences/content/bridgeQrDialog.xhtml @@ -7,10 +7,12 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"> <dialog id="bridgeQr-dialog" buttons="accept"> - <html:div id="bridgeQr-container"> - <html:div id="bridgeQr-target"/> - <html:div id="bridgeQr-onionBox"/> - <html:div id="bridgeQr-onion"/> + <html:div> + <html:div id="bridgeQr"> + <html:div id="bridgeQr-target"/> + <html:div id="bridgeQr-onionBox"/> + <html:div id="bridgeQr-onion"/> + </html:div> </html:div> <script type="application/javascript"><![CDATA[ "use strict"; diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index 860f3c233cb6c..3479ac0fcdbf9 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -112,12 +112,11 @@ </hbox> <box class="torPreferences-bridgeCard-grid"> <box class="torPreferences-bridgeCard-qrWrapper"> - <box class="torPreferences-bridgeCard-qr stop-click"> + <html:div class="torPreferences-bridgeCard-qr stop-click"> <html:div class="torPreferences-bridgeCard-qrCode"/> <html:div class="torPreferences-bridgeCard-qrOnionBox"/> <html:div class="torPreferences-bridgeCard-qrOnion"/> - </box> - <html:div class="torPreferences-bridgeCard-filler"/> + </html:div> </box> <description class="torPreferences-bridgeCard-share"></description> <hbox class="torPreferences-bridgeCard-addrBox"> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 964fca1590afc..6638db1293b2a 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -308,56 +308,56 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-bridgeCard-qrWrapper { grid-area: bridge-qr; - display: flex; - flex-direction: column; + display: block; /* So it doesn't stretch the child vertically. */ + margin-inline-end: 14px; } .torPreferences-bridgeCard-qr { - width: 126px; + --qr-one: black; + --qr-zero: white; + background: var(--qr-zero); position: relative; + padding: 4px; + border-radius: 2px; } .torPreferences-bridgeCard-qrCode { width: 112px; height: 112px; /* Define these colors, as they will be passed to the QR code library */ - background: var(--in-content-box-background); - color: var(--in-content-text-color); + background: var(--qr-zero); + color: var(--qr-one); } .torPreferences-bridgeCard-qrOnionBox { width: 28px; height: 28px; position: absolute; - top: 42px; - inset-inline-start: 42px; - background: var(--in-content-box-background); + top: calc(50% - 14px); + inset-inline-start: calc(50% - 14px); + background: var(--qr-zero); } .torPreferences-bridgeCard-qrOnion { width: 16px; height: 16px; position: absolute; - top: 48px; - inset-inline-start: 48px; + top: calc(50% - 8px); + inset-inline-start: calc(50% - 8px); mask: url("chrome://browser/skin/onion.svg"); mask-repeat: no-repeat; mask-size: 16px; - background: var(--in-content-text-color); + background: var(--qr-one); } .torPreferences-bridgeCard-qr:hover .torPreferences-bridgeCard-qrOnionBox { - background: var(--in-content-text-color); + background: var(--qr-one); } .torPreferences-bridgeCard-qr:hover .torPreferences-bridgeCard-qrOnion { mask: url("chrome://global/skin/icons/search-glass.svg"); - background: var(--in-content-box-background); -} - -.torPreferences-bridgeCard-filler { - flex: 1; + background: var(--qr-zero); } .torPreferences-bridgeCard-grid { @@ -458,39 +458,49 @@ dialog#torPreferences-requestBridge-dialog > hbox { } /* Show bridge QR dialog */ -#bridgeQr-container { +#bridgeQr { + /* Some readers don't recognize QRs with inverted colors, so let's make + the ones are darker than zeroes. See + https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41049 */ + --qr-one: black; + --qr-zero: white; + background: var(--qr-zero); position: relative; - height: 300px; + /* Padding is needed in case the dark theme is used so the bits don't blend + with whatever the default background color is. */ + padding: 10px; + margin: auto; + margin-bottom: 20px; + max-width: max-content; + border-radius: 5px; } #bridgeQr-target { - position: absolute; width: 300px; height: 300px; - left: calc(50% - 150px); - background: var(--in-content-box-background); - color: var(--in-content-text-color); + background: var(--qr-zero); + color: var(--qr-one); } #bridgeQr-onionBox { position: absolute; width: 70px; height: 70px; - top: 115px; + top: calc(50% - 35px); left: calc(50% - 35px); - background-color: var(--in-content-box-background); + background-color: var(--qr-zero); } #bridgeQr-onion { position: absolute; width: 38px; height: 38px; - top: 131px; + top: calc(50% - 19px); left: calc(50% - 19px); mask: url("chrome://browser/skin/onion.svg"); mask-repeat: no-repeat; mask-size: 38px; - background: var(--in-content-text-color); + background: var(--qr-one); } /* Builtin bridge dialog */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new c1066fbb756be Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses c1066fbb756be is described below commit c1066fbb756be8096dfed2cc902b97e6a40fc65d Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 18:56:13 2022 +0200 Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses This bug has already been fixed upstream, so we should drop this patch when we update to 102. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1697866. --- toolkit/actors/AboutHttpsOnlyErrorParent.jsm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm index 407e014ff6574..5b6bc94ab88ff 100644 --- a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm +++ b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm @@ -87,6 +87,19 @@ class AboutHttpsOnlyErrorParent extends JSWindowActorParent { const oldOriginAttributes = aBrowser.contentPrincipal.originAttributes; const hasFpiAttribute = !!oldOriginAttributes.firstPartyDomain.length; + let firstPartyDomain = ""; + if (hasFpiAttribute) { + // This try-catch to check whether a host is an IP address is used also in + // other parts of Firefox + try { + firstPartyDomain = Services.eTLD.getBaseDomain(newURI); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS) { + firstPartyDomain = newURI.host; + } + } + } + // Create new content principal for the permission. If first-party isolation // is enabled, we have to replace the about-page first-party domain with the // one from the exempt website. @@ -94,9 +107,7 @@ class AboutHttpsOnlyErrorParent extends JSWindowActorParent { newURI, { ...oldOriginAttributes, - firstPartyDomain: hasFpiAttribute - ? Services.eTLD.getBaseDomain(newURI) - : "", + firstPartyDomain, } ); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new b8951156a17d6 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection b8951156a17d6 is described below commit b8951156a17d61e6eb3ce85810c091d29884ebf9 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 17:51:44 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41055: Icon fix from #40834 is missing in 11.5 stable --- browser/components/torpreferences/content/check.svg | 3 +++ browser/components/torpreferences/content/torPreferences.css | 4 ++-- browser/components/torpreferences/jar.mn | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/check.svg b/browser/components/torpreferences/content/check.svg new file mode 100644 index 0000000000000..34b90800c71b9 --- /dev/null +++ b/browser/components/torpreferences/content/check.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M6.02301 13L1.18301 8.16099C1.07063 8.04262 1.00892 7.88505 1.01104 7.72185C1.01316 7.55865 1.07893 7.40273 1.19434 7.28732C1.30975 7.17191 1.46567 7.10613 1.62887 7.10402C1.79207 7.1019 1.94964 7.16361 2.06801 7.27599L6.37501 11.584L13.934 4.02299C14.0517 3.90617 14.2107 3.84061 14.3765 3.84061C14.5423 3.84061 14.7014 3.90617 14.819 4.02299C14.9358 4.14063 15.0014 4.29969 15.0014 4.46549C15.0014 4.63128 14.9358 4.79034 14.819 4.90799L6.72901 12.998L6.02301 13Z" fill="context-fill"/> +</svg> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index a39bd4b4767cb..964fca1590afc 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -133,7 +133,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { } #torPreferences-status-internet-icon { - list-style-image: url("chrome://devtools/skin/images/globe.svg"); + list-style-image: url("chrome://browser/content/torpreferences/network.svg"); } #torPreferences-status-internet-statusIcon.online, @@ -144,7 +144,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { } #torPreferences-status-internet-statusIcon.online, #torPreferences-status-tor-statusIcon.connected { - list-style-image: url("chrome://devtools/skin/images/check.svg"); + list-style-image: url("chrome://browser/content/torpreferences/check.svg"); -moz-context-properties: fill; fill: var(--purple-60); } diff --git a/browser/components/torpreferences/jar.mn b/browser/components/torpreferences/jar.mn index 4d82268f3c8d6..b54373ae7bc23 100644 --- a/browser/components/torpreferences/jar.mn +++ b/browser/components/torpreferences/jar.mn @@ -3,6 +3,7 @@ browser.jar: content/browser/torpreferences/bridgeQrDialog.jsm (content/bridgeQrDialog.jsm) content/browser/torpreferences/builtinBridgeDialog.xhtml (content/builtinBridgeDialog.xhtml) content/browser/torpreferences/builtinBridgeDialog.jsm (content/builtinBridgeDialog.jsm) + content/browser/torpreferences/check.svg (content/check.svg) content/browser/torpreferences/connectionSettingsDialog.xhtml (content/connectionSettingsDialog.xhtml) content/browser/torpreferences/connectionSettingsDialog.jsm (content/connectionSettingsDialog.jsm) content/browser/torpreferences/network.svg (content/network.svg) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40583: Fix build of goansicolor
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 8cf2973 Bug 40583: Fix build of goansicolor 8cf2973 is described below commit 8cf297318dce9e2c71a2aca162036c00fa70d49a Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 18 09:24:11 2022 +0200 Bug 40583: Fix build of goansicolor Fixup for #40547. --- projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 68b1032..b3188d6 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -4,7 +4,7 @@ git_url: https://github.com/shiena/ansicolor.git git_hash: a422bbe96644373c5753384a59d678f7d261ff10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: -use_container: 1 + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new 1ea93eaa5400c fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 1ea93eaa5400c is described below commit 1ea93eaa5400cc4af793235539b2c863a4194aca Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 16:29:49 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41059: Bridges are not shown in locales that have only the language code --- browser/components/torpreferences/content/connectionPane.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 644b13dc9cb8e..6162ca37e8faf 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -731,7 +731,7 @@ const gConnectionPane = (function() { const annotations = await res.json(); const bcp47 = Services.locale.appLocaleAsBCP47; const dash = bcp47.indexOf("-"); - const lang = dash !== -1 ? bcp47.substr(dash) : lang; + const lang = dash !== -1 ? bcp47.substr(dash) : bcp47; if (bcp47 in annotations) { emojiAnnotations = annotations[bcp47]; } else if (lang in annotations) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated (af27913 -> 0ce5e1d)
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch master in repository builders/tor-browser-build. from af27913 Bug 41052: Updated the manual to pipeline 44679 add 0ce5e1d Bug 40583: Fix build of goansicolor No new revisions were added by this update. Summary of changes: projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40583: Fix build of goansicolor
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 0ce5e1d Bug 40583: Fix build of goansicolor 0ce5e1d is described below commit 0ce5e1d0f06bc879f714760ecee8d9d0b9bbe434 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 18 09:24:11 2022 +0200 Bug 40583: Fix build of goansicolor Fixup for #40547. --- projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 68b1032..b3188d6 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -4,7 +4,7 @@ git_url: https://github.com/shiena/ansicolor.git git_hash: a422bbe96644373c5753384a59d678f7d261ff10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: -use_container: 1 + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated (54ec362 -> 0563692)
by gitolite role 18 Jul '22

18 Jul '22

1 2

[builders/tor-browser-build] branch master updated (2a6dd31 -> af27913)
by gitolite role 18 Jul '22

18 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 2a6dd31 Bug 40581: Some master branches are renamed to main add af27913 Bug 41052: Updated the manual to pipeline 44679 No new revisions were added by this update. Summary of changes: doc/how-to-update-the-manual.txt | 3 ++- projects/manual/config | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 41052: Updated the manual to pipeline 44679
by gitolite role 18 Jul '22

18 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new af27913 Bug 41052: Updated the manual to pipeline 44679 af27913 is described below commit af27913bbe55404e2136aca7f756c10433624bc9 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 12:04:11 2022 +0200 Bug 41052: Updated the manual to pipeline 44679 --- doc/how-to-update-the-manual.txt | 3 ++- projects/manual/config | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/how-to-update-the-manual.txt b/doc/how-to-update-the-manual.txt index 334701c..0afd0db 100644 --- a/doc/how-to-update-the-manual.txt +++ b/doc/how-to-update-the-manual.txt @@ -5,4 +5,5 @@ 5. Upload it to people.tpo 6. Update projects/manual/config 6.1 Change the version to $PIPELINEID - 6.2 Update the URL if it was different from the previous uploader + 6.2 Update the hash in the input_files section + 6.3 Update the URL if it was different from the previous uploader diff --git a/projects/manual/config b/projects/manual/config index 890bfab..909e565 100644 --- a/projects/manual/config +++ b/projects/manual/config @@ -1,6 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt -version: 40628 +# Remember to update also the package's hash, with the version! +version: 44679 filename: 'manual-[% c("version") %].tar.gz' container: use_container: 1 @@ -18,6 +19,6 @@ input_files: - project: container-image - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 64bab7e8b26014277b55cf2afc4f676f3a164f466fc33e72aa62004318994c3a + sha256sum: d9061ca5afdf4d04fb735bc645318d5eedc69f10fa200faaca82731ad4b105f7 - filename: packagemanual.py name: package_script -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0