- tbb-commits - lists.torproject.org

[tor-android-service/master] Bug 33931 - Indicate bridge type in stream
by gk＠torproject.org 02 May '20

02 May '20

commit ed2e1479eeddede01b1d510ef79dc5ec798b39c0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 30 15:47:07 2020 +0000 Bug 33931 - Indicate bridge type in stream Use the first-byte to indicate if the following data stream contains default bridges or custom bridges. In addition, if the stream contains default bridges, then indicate if only one type of bridge should be used after parsing the stream. --- .../org/torproject/android/service/CustomTorInstaller.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java index e962137..198c981 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -48,6 +48,18 @@ public class CustomTorInstaller extends TorInstaller { */ String userDefinedBridgeList = Prefs.getBridgesList(); byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + // Terrible hack. Must keep in sync with topl::addBridgesFromResources. + if (bridgeType == 0) { + switch (userDefinedBridgeList) { + case "obfs4": + bridgeType = 2; + break; + case "meek": + bridgeType = 3; + break; + } + } + ByteArrayInputStream bridgeTypeStream = new ByteArrayInputStream(new byte[]{bridgeType}); InputStream bridgeStream = (bridgeType == 1) ? new ByteArrayInputStream((userDefinedBridgeList + "\r\n").getBytes()) : context.getResources().getAssets().open("common/bridges.txt");

1 0

[tor-browser-build/maint-9.0] Picking up 68.8.0esr rc2
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 545e9783a2faf9d577036ddc4f102c5a52dcb467 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 30 06:08:46 2020 +0000 Picking up 68.8.0esr rc2 --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index 75efe0d..9d7c3c2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index e23a15b..88a6565 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.9 project_name: tor-browser

1 0

[tor-browser-spec/master] Bug 33950: Add instructions for rolling back an update
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit c1a8d19ec385b815f54d26638f886588e1854294 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 28 14:56:36 2020 +0200 Bug 33950: Add instructions for rolling back an update --- processes/ReleaseProcess | 3 +- processes/RollingBackUpdate | 71 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 7d731d9..842325c 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -201,7 +201,8 @@ chmod 664 ${TORBROWSER_UPDATE_CHANNEL}/.htaccess chmod 775 ${TORBROWSER_UPDATE_CHANNEL}/ # Rename the update responses directory to .old to make it easier to - # revert in case of problem + # revert in case of problem (see the file RollingBackUpdate for more + # details about this) torsocks ssh staticiforme.torproject.org "rm -rf /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks ssh staticiforme.torproject.org "mv -v /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL} /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks rsync -avP $TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/aus1-master.torproject.org/htdocs/torbrows… diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate new file mode 100644 index 0000000..bfe7471 --- /dev/null +++ b/processes/RollingBackUpdate @@ -0,0 +1,71 @@ +Rolling Back Tor Browser Updates +================================ + +In some cases a critical issue is found shortly after releasing an update. +In those cases rolling back an update to avoid having more users hitting +the issue can be useful. + +There are two separate cases: + - rolling back an update for users of all platforms + - rolling back an update only for users of a specific platform + +Note: this is about rolling back updates for stable/alpha releases. +Rolling back updates on nightly is more difficult. + +In the following instructions we are assuming that we are rolling back +an alpha update. But the same instructions should work for a stable +release too by replacing all instances of "alpha" by "release". +We also assume that we released version 9.5a11 and want to roll back to +version 9.5a10. You will need to replace those versions numbers in the +instructions. + +If you followed the instructions from ReleaseProcess, in the directory +/srv/aus1-master.torproject.org/htdocs/torbrowser/update_3 on staticiforme +you should have renamed the directory alpha to alpha.old. +If you didn't do it, you should get a new copy of the update_responses +directory for the previous release, for instance by running +"make update_responses-alpha" in tor-browser-build, after +checking out the tag from the previous release. + +You should also check that the previous release is still present in +the directory /srv/cdn-master.torproject.org/htdocs/aus1/torbrowser. + + +Rolling back an update for users of all platforms +------------------------------------------------- + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, remove + the directory "alpha" and rename "alpha.old" to "alpha". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^[^/]+/9.5a11/ no-update.xml [last] + With this line we can avoid proposing an update to the previous + version to the users who already updated to the new version. + + - run "static-update-component aus1.torproject.org" + + +Rolling back an update only for users of a specific platform +------------------------------------------------------------ + +In the following instructions, we assume that we want to roll back the +update for users of Windows x86_64 only. In the following instructions, +you should replace WINNT_x86_64-gcc3-x64 with the platform for which +you want to roll back the update (see build_targets in the file +projects/release/update_responses_config.yml in tor-browser-build for +the list of platforms). + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, rename + or copy the directory "alpha.old" to "alpha.9.5a10". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^WINNT_x86_64-gcc3-x64/.* https://aus1.torproject.org/torbrowser/update_3/alpha.95a10/$0 [last] + + - run "static-update-component aus1.torproject.org" +

1 0

[tor-browser-spec/master] Small typo fix
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 99878a95e913e3286f6d756429129cd15ce94791 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:55:34 2020 +0000 Small typo fix --- processes/RollingBackUpdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate index bfe7471..a1e518b 100644 --- a/processes/RollingBackUpdate +++ b/processes/RollingBackUpdate @@ -16,7 +16,7 @@ In the following instructions we are assuming that we are rolling back an alpha update. But the same instructions should work for a stable release too by replacing all instances of "alpha" by "release". We also assume that we released version 9.5a11 and want to roll back to -version 9.5a10. You will need to replace those versions numbers in the +version 9.5a10. You will need to replace those version numbers in the instructions. If you followed the instructions from ReleaseProcess, in the directory

1 0

[tor-browser-build/master] Bug 33952: Add instructions related to build-sunet-a.torproject.net
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 513da8008078851501da2e4e9c2d91c4fbfdb5bf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 27 22:59:20 2020 +0200 Bug 33952: Add instructions related to build-sunet-a.torproject.net Add instructions for adding/removing/updating users on build-sunet-a.torproject.net as well as installing new packages. We also update the tbb-team role to make it possible to remove users. While updating the README file we also add a link for more details about setting up a new nightly build machine. --- tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/tools/ansible/README b/tools/ansible/README index dc69ad7..6056372 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -1,4 +1,4 @@ -This directory contains some ansible script that we use to setup some +This directory contains some ansible script that we use to set up some machines that we use for Tor Browser development. To deploy some changes you need the ansible package to be installed on @@ -9,7 +9,8 @@ You can then use one of the following makefile targets: ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do - some Tor Browser builds. + some Tor Browser builds. See below for more details about adding, + removing and updating users on this machine. fpcentral: Deploy fpcentral to forrestii.torproject.org. To be able to run this @@ -21,4 +22,37 @@ boklm-tbb-nightly-build: anybody else wants to set up their own nightly builds, it is possible to do it by adding a new host to the inventory file and making copies of group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + For more details, see also this ticket: + https://trac.torproject.org/projects/tor/ticket/33948 + + +Adding, removing, updating users on the Tor Browser team build machine +====================================================================== + +The tbb-build.yml playbook is used to set up the Tor Browser team build +machine (build-sunet-a.torproject.net) + +To add a new user: + + - add the new username to roles/tbb-team/defaults/main.yml + - add the ssh key file to roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To update the ssh key for an existing user: + - update roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To remove a user and their home directory from the build machine: + - in roles/tbb-team/defaults/main.yml, move the user from + tbb_team_members to tbb_team_alums + - remove roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To install additional packages you can add them to +roles/tbb-builder/tasks/main.yml if they are necessary to build +Tor Browser, or to roles/useful-packages/tasks/main.yml otherwise. + +If you don't want to apply the changes directly, but first want to check +what would be the changes done by ansible, you can edit the ansible-playbook +command in the Makefile to add the --check argument. diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 4ce9c03..75a1db5 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -8,3 +8,4 @@ tbb_team_members: - mikeperry - pospeselr - sukhbir +tbb_team_alums: [] diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml index 5cc5755..8e63416 100644 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -13,3 +13,10 @@ state: present key: "{{ lookup('file', item + '.pub') }}" with_items: "{{ tbb_team_members }}" + +- name: Remove tbb-team alums users + user: + name: "{{ item }}" + state: absent + remove: yes + with_items: "{{ tbb_team_alums }}"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33952_v2'
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 6768a86581b63bfa37279d3144e105faaa35e366 Merge: 7464798 513da80 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:17:45 2020 +0000 Merge remote-tracking branch 'boklm/bug_33952_v2' tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Move mcs and brade to alumns build machine-wise
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 895efbcd312083c6da2fc9f9e1c023441e5e97c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:20:54 2020 +0000 Move mcs and brade to alumns build machine-wise --- tools/ansible/roles/tbb-team/defaults/main.yml | 6 +++--- tools/ansible/roles/tbb-team/files/brade.pub | 1 - tools/ansible/roles/tbb-team/files/mcs.pub | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 75a1db5..879c435 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,11 +1,11 @@ --- tbb_team_members: - boklm - - brade - cohosh - gk - - mcs - mikeperry - pospeselr - sukhbir -tbb_team_alums: [] +tbb_team_alums: + - brade + - mcs diff --git a/tools/ansible/roles/tbb-team/files/brade.pub b/tools/ansible/roles/tbb-team/files/brade.pub deleted file mode 100644 index 0a83b4d..0000000 --- a/tools/ansible/roles/tbb-team/files/brade.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3 diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub deleted file mode 100644 index af8dd08..0000000 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshtpo/ticket/33576'
by sysrqb＠torproject.org 30 Apr '20

30 Apr '20

commit 7464798ed3a34a2d492c55e34673dbe3d4a134d2 Merge: 4d855e7 be5efcc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 29 14:06:53 2020 +0000 Merge remote-tracking branch 'cohoshtpo/ticket/33576' projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Fix git url for goxxerrors project
by sysrqb＠torproject.org 30 Apr '20

30 Apr '20

commit be5efccdf6aeb316a2b8c9888a942e647c544bc9 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 13:47:37 2020 +0000 Fix git url for goxxerrors project --- projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 08d6777..6733498 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://golang.org/x/xerrors +git_url: https://go.googlesource.com/xerrors git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser-build/master] Add GeKo to nightly build emails
by boklm＠torproject.org 29 Apr '20

29 Apr '20

commit 4d855e74585ac099e4c5526c83c04302093305d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 29 15:02:28 2020 +0200 Add GeKo to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 8e4bc05..6addb1d 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,5 +2,5 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ]," nightly_build_sign_build: 1

1 0