- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 2825e7f974d50a6394b5a5196c2133c068d85286 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 08:37:20 2019 +0000 fixup! Bug 25658: Replace security slider with security level UI --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 02757a06af72..08d00866ef04 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/… [View More]

1 0

[torbutton/master] Bug 29825: Intelligently add the new Security Level button to the taskbar
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit d7595079a561fb36220a83e1d60ba9e6bab289e5 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Mar 29 13:00:00 2019 -0700 Bug 29825: Intelligently add the new Security Level button to the taskbar Added logic to torbutton to add the Security Level button after the url bar, and subsequently move Tor Button between. This new method keeps any UI customizations the user has made. In the event of error, the UI configuration reverts back to the default … [View More]as specified in the browser.uiCustomization.state pref. --- src/chrome/content/torbutton.js | 47 ++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 15e8d174..bd966485 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -363,34 +363,57 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - //setting up context menu - //var contextMenu = document.getElementById("contentAreaContextMenu"); - //if (contextMenu) - // contextMenu.addEventListener("popupshowing", torbutton_check_contextmenu, false); - - // Add torbutton and security level button to the bar. + // Add torbutton and security level buttons to the bar. // This should maybe be in the startup function, but we want to add // the button to the panel before it's state (color) is set.. - if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button") || - !m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level")) { - torbutton_log(3, 'Adding button'); + let insertedButton = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button"); + let insertedSecurityLevel = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level"); + if (!insertedButton || !insertedSecurityLevel) { try { // ESR31-style toolbar is handled by the existing compiled-in pref. // We also need to prevent first-run toolbar reorg (#13378), so we // reset this toolbar state on first-run. try { + // get serialized toolbar state + let uiCustomizationStateJSON = m_tb_prefs.getStringPref("browser.uiCustomization.state"); + let uiCustomizationState = JSON.parse(uiCustomizationStateJSON); + + let placeButtonAfterUrlbar = function(navBar, buttonId) { + torbutton_log(3, 'placing ' + buttonId); + // try and remove button if it's present + let buttonIndex = navBar.indexOf(buttonId); + if (buttonIndex != -1) { + navBar.splice(buttonIndex, 1); + } + // if urlbar isn't present (which *shouldn't* be possible), + // inserts button at the beginning of the toolbar (since urlbarIndex will be -1) + let urlbarIndex = navBar.indexOf("urlbar-container"); + buttonIndex = urlbarIndex + 1; + navBar.splice(buttonIndex, 0, buttonId); + }; + + // array of navbar elements + let navBar = uiCustomizationState["placements"]["nav-bar"]; + placeButtonAfterUrlbar(navBar, "security-level-button"); + placeButtonAfterUrlbar(navBar, "torbutton-button"); + + // serialize back into pref + uiCustomizationStateJSON = JSON.stringify(uiCustomizationState, null, 0); + m_tb_prefs.setStringPref("browser.uiCustomization.state", uiCustomizationStateJSON); + } catch(e) { + torbutton_log(4, 'error updating toolbar, reverting to default : ' + e); // reverts the serialized toolbar state to default set in Tor Browser m_tb_prefs.clearUserPref("browser.uiCustomization.state"); - } catch(e) {} + } // reverts toolbar state to firefox defaults CustomizableUI.reset(); // 'restores' toolbar state from serialized state in "browser.uiCustomization.state" CustomizableUI.undoReset(); - torbutton_log(3, 'Button added'); + torbutton_log(3, 'toolbar updated'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_security_level", true); } catch(e) { - torbutton_log(4, 'Failed to add Torbutton to toolbar: '+e); + torbutton_log(4, 'failed to update the toolbar : ' + e); } } [View Less]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25623_v4'
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit d869dcdece30316dedbb14045d49ec3f9a71b648 Merge: 893a482 56ba67b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 06:48:43 2019 +0000 Merge remote-tracking branch 'boklm/bug_25623_v4' projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25623: Disable network during build
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 56ba67b3b6345fc70d42567d03b0ff841fe38d3e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 13:20:33 2019 +0100 Bug 25623: Disable network during build --- projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/projects/common/how-to-create-… [View More]gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index ef816d0..d980ba2 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -6,7 +6,8 @@ file: export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" -and rerun the build. +then allow network access during the build by setting +var/container/disable_network/build to 0 in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list with the following command (replacing diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index e75c13d..60dfa6c 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -238,6 +238,12 @@ { "type": "uts" }, +[% IF c("var/container/disable_network/" _ c("exec_name")) -%] + { + "type": "network", + "path": "/var/run/netns/rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]" + }, +[% END -%] { "type": "mount" } diff --git a/rbm.conf b/rbm.conf index 32b1f37..f31e5db 100644 --- a/rbm.conf +++ b/rbm.conf @@ -51,6 +51,9 @@ var: container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm + disable_network: + # disable network in the build scripts + build: 1 input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%] [% c("input_files_by_name/" _ file) %] @@ -408,7 +411,13 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns add 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns delete 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] remote_put: | #!/bin/sh [View Less]

1 0

[tor-browser-build/master] Bug 29971: Bump goutls
by gk＠torproject.org 31 Mar '19

31 Mar '19

commit 893a4825b1a430ef955812248ebba8017a5c05d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 31 15:46:58 2019 +0200 Bug 29971: Bump goutls Add bsaes as a new dependency of utls. --- projects/gobsaes/config | 17 +++++++++++++++++ projects/goutls/config | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/projects/gobsaes/config b/projects/gobsaes/config new file mode 100644 index 0000000..4da5828 --- /dev/null +++ b/projects/gobsaes/… [View More]

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] squash! Bug 26961: New user onboarding.
by gk＠torproject.org 29 Mar '19

29 Mar '19

commit d6319109718b5e2bbd82244bce9baeaaea46f356 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 26 11:12:35 2019 -0400 squash! Bug 26961: New user onboarding. Also fix bug 27484: Improve navigation within onboarding. --- .../extensions/onboarding/content/onboarding.css | 25 +++++++++++ .../extensions/onboarding/content/onboarding.js | 51 ++++++++++++++++------ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/browser/extensions/… [View More]onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index fa5f58975c3a..e70cf3fa671a 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -401,6 +401,31 @@ opacity: 0.5; } +/* Tor action buttons appear in the description column rather than the content one. */ +.onboarding-tour-tor-action-button-container { + /* Get higher z-index in order to ensure buttons within container are selectable */ + z-index: 2; + grid-row: tour-button-start / tour-page-end; + grid-column: tour-page-start / tour-content-start; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button { + margin-inline-start: 40px; /* match .onboarding-tour-description */ + float: inline-start; + background: #e6e6e6; + color: #303030; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button:hover:not([disabled]) { + background: #d6d6d6; + cursor: pointer; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button:active:not([disabled]) { + background: #c6c6c6; +} + + /* Tour Icons */ #onboarding-tour-singlesearch.onboarding-tour-item::after, #onboarding-notification-bar[data-target-tour-id=onboarding-tour-singlesearch] #onboarding-notification-tour-title::before { diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 8f62e4f3b9d8..ac5569d4b57b 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -119,7 +119,7 @@ var onboardingTourset = { "onboarding.tour-tor-welcome.title", "onboarding.tour-tor-welcome.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-welcome.png"); createOnboardingTourButton(div, - "onboarding-tour-tor-welcome-button", "onboarding.tour-tor-welcome.button"); + "onboarding-tour-tor-welcome-button", "onboarding.tour-tor-welcome.next-button"); return div; }, @@ -165,8 +165,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-circuit-display.title", "onboarding.tour-tor-circuit-display.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-circuit-display.png"); - createOnboardingTourButton(div, + let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-circuit-display-button", "onboarding.tour-tor-circuit-display.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + createOnboardingTourButton(div, + "onboarding-tour-tor-circuit-display-next-button", "onboarding.tour-tor-circuit-display.next-button"); return div; }, @@ -180,8 +183,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); - createOnboardingTourButton(div, + let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + createOnboardingTourButton(div, + "onboarding-tour-tor-security-next-button", "onboarding.tour-tor-security-level.next-button"); return div; }, @@ -195,9 +201,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-expect-differences.title", "onboarding.tour-tor-expect-differences.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-expect-differences.png"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-expect-differences-button", "onboarding.tour-tor-expect-differences.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; createOnboardingTourButton(div, - "onboarding-tour-tor-expect-differences-button", - "onboarding.tour-tor-expect-differences.button"); + "onboarding-tour-tor-expect-differences-next-button", "onboarding.tour-tor-expect-differences.next-button"); return div; }, @@ -211,9 +219,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-onion-services.title", "onboarding.tour-tor-onion-services.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-onion-services.png"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-onion-services-button", "onboarding.tour-tor-onion-services.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; createOnboardingTourButton(div, - "onboarding-tour-tor-onion-services-button", - "onboarding.tour-tor-onion-services.button"); + "onboarding-tour-tor-onion-services-next-button", "onboarding.tour-tor-onion-services.next-button"); return div; }, @@ -901,15 +911,13 @@ class Onboarding { this._removeTourFromNotificationQueue(tourId); break; case "onboarding-tour-tor-welcome-button": - this.gotoPage("onboarding-tour-tor-privacy"); - handledTourActionClick = true; - break; case "onboarding-tour-tor-privacy-button": - this.gotoPage("onboarding-tour-tor-network"); - handledTourActionClick = true; - break; case "onboarding-tour-tor-network-button": - this.gotoPage("onboarding-tour-tor-circuit-display"); + case "onboarding-tour-tor-circuit-display-next-button": + case "onboarding-tour-tor-security-next-button": + case "onboarding-tour-tor-expect-differences-next-button": + case "onboarding-tour-tor-onion-services-next-button": + this.gotoNextTourItem(); handledTourActionClick = true; break; case "onboarding-tour-tor-circuit-display-button": @@ -951,6 +959,21 @@ class Onboarding { } } + gotoNextTourItem() { + let activeTourID = this._activeTourId; + if (activeTourID) { + let idx = this._tourItems.findIndex(item => (item.id === activeTourID)); + if (idx >= 0) { + // If at the end of the list, close onboarding; otherwise, go to next. + if (++idx >= this._tourItems.length) { + this.hideOverlay(); + } else { + this.gotoPage(this._tourItems[idx].id); + } + } + } + } + /** * Wrap keyboard focus within the dialog. * When moving forward, focus on the first element when the current focused [View Less]

1 0

[torbutton/master] Bug 27484: Improve navigation within onboarding
by gk＠torproject.org 27 Mar '19

27 Mar '19

commit 743c1432c0112d74da5c18e9b238ede00ceb550e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 26 11:04:53 2019 -0400 Bug 27484: Improve navigation within onboarding Add strings for new button labels. --- src/chrome/locale/en-US/browserOnboarding.properties | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index 82c9bcca..… [View More]b97d77a0 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Welcome onboarding.tour-tor-welcome.title=You’re ready. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Privacy onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Circuit Display onboarding.tour-tor-circuit-display.title=See your path. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Be extra protected. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.next-button=Done # Circuit Display onboarding. onboarding.tor-circuit-display.next=Next [View Less]

1 0

[tor-browser-build/maint-8.0] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit abf8e5043de3b69bf29b641751b5d73852c08b4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/… [View More]

1 0

[tor-browser-build/master] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit f2e272082fc484f211e0539dc177b1948c4b5d68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/… [View More]

1 0

[tor-browser-build/maint-8.0] Bump NoScript version to 10.2.5
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit a9c6707fcf44fa22e7e9cd806b3d3b11677e87ae Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:44:50 2019 +0000 Bump NoScript version to 10.2.5 Fixes bug 29872 (XSS popup with DuckDuckGo search on about:tor) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4375835..c0f5123 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/… [View More]

1 0