- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 29980: Add android-x86 target to README files
by boklm＠torproject.org 02 Apr '19

02 Apr '19

commit 9dda80f41584d93b9e30fc534c6de46337fecb30 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 2 07:18:23 2019 +0000 Bug 29980: Add android-x86 target to README files --- README | 1 + README.HACKING | 18 ++++++++++-------- README.MAKEFILE | 12 ++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README b/README index e1e93c6..2b09ab1 100644 --- a/README +++ b/README @@ -81,6 +81,7 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-x86 When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 7634093..081a3d5 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,17 +45,17 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7 + torbrowser-android-armv7, torbrowser-android-x86 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and -torbrowser-android-armv7 are special cases. They do not contain options -directly, instead they contain a list of other targets. For instance, the -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux -targets. You should define an option under the linux target if it applies to -Linux on both architectures, or under the linux-x86_64 if it only applies to the -x86_64 architecture. +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, +torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do +not contain options directly, instead they contain a list of other targets. For +instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and +linux targets. You should define an option under the linux target if it applies +to Linux on both architectures, or under the linux-x86_64 if it only applies to +the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -156,6 +156,8 @@ $platform should be one of the following: - torbrowser-android-armv7 + - torbrowser-android-x86 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: diff --git a/README.MAKEFILE b/README.MAKEFILE index 7351c5f..addff64 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -7,7 +7,8 @@ release Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. -release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as release, for the selected platform only. @@ -16,7 +17,8 @@ alpha Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. -alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -29,7 +31,8 @@ components. The resulting build can be found in directory nightly/$date -nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as nightly, for the selected platform only. @@ -39,7 +42,8 @@ Build Tor Browser for the alpha channel, for all supported platforms. This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date -alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only.

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 29445: Enable support for enterprise policies"
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit e95c515352094f6c3d943a3313628c370feb18f2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:51:43 2019 +0000 Revert "Bug 29445: Enable support for enterprise policies" This reverts commit 00a7fc743aebc68f59df743236c2165274cbc608. --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 1380c0c228a4..7c864f5fbc43 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { } if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Enterprise policy ${policyName} is not allowed`); + log.error(`Policy ${policyName} is only allowed on ESR`); continue; } @@ -314,6 +314,10 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * + * This is meant to only allow policies to run on ESR, but in practice + * we allow it to run on channels different than release, to allow + * these policies to be tested on pre-release channels. + * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -324,7 +328,12 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; } - return true; + if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || + Cu.isInAutomation) { + return true; + } + + return false; } /*

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 6e730d5184f8d74860488f8fa998bd1e0023281f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:56:22 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 29916: Make sure enterprise policies are disabled --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 08d00866ef04..cca469725d28 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -225,6 +225,9 @@ pref("network.file.disable_unc_paths", true); // Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug // 1412081) pref("network.file.path_blacklist", "/net"); +// Make sure no enterprise policy can interfere with our proxy settings, see +// #29916. +pref("browser.policies.testing.disallowEnterprise", true); // Security slider pref("svg.in-content.enabled", true);

1 0

[torbutton/master] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 409f01d42ffb9efc85c9245f9baa6ea1831003c2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:06:47 2019 +0000 fixup! Bug 25658: Replace security slider with security level UI Fixes #29973. --- src/chrome/content/torbutton.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bd966485..f1b1dc0c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,7 @@ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.j let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -1898,8 +1898,6 @@ function torbutton_is_windowed(wind) { return true; } -let stopOpenSecuritySettingsObserver; - function showSecurityPreferencesPanel(chromeWindow) { const tabBrowser = chromeWindow.BrowserApp; let settingsTab = null; @@ -1987,7 +1985,6 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); - stopOpenSecuritySettingsObserver(); window.removeEventListener("sizemodechange", m_tb_resize_handler, false);

1 0

[tor-browser-build/master] Bug 29950: Fix error when using a dev version of runc
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 32a4f009d706b9e651071b1b3d361891408eb3aa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 29 13:37:54 2019 +0100 Bug 29950: Fix error when using a dev version of runc --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index f31e5db..e7b5ea4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -477,7 +477,7 @@ ENV: # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m; + return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+(?:-dev)?$/m; }, }, )

1 0

[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/profile/000-tor-browser.js @@ -271,7 +271,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"torbutton-button\",\"security-level-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

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 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); } }

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-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

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/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +git_url: https://git.schwanenlied.me/yawning/bsaes.git +version: '[% c("abbrev") %]' +git_hash: 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: git.schwanenlied.me/yawning/bsaes.git + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goutls/config b/projects/goutls/config index b21dea9..0a1e416 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 git_url: https://gitlab.com/yawning/utls.git -version: 0.0.9-2 +version: 0.0.10-1 git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: yawning.gpg @@ -15,6 +15,7 @@ var: go_lib_deps: - goxcrypto - gocompress + - gobsaes input_files: - project: container-image @@ -24,3 +25,5 @@ input_files: project: goxcrypto - name: gocompress project: gocompress + - name: gobsaes + project: gobsaes

1 0