August 2020 - tor-commits - lists.torproject.org

[tor/master] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d0d55dd4..e8d6c5f418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: debian:stable + before_script: - apt-get update -qq - apt-get upgrade -qy @@ -13,33 +15,3 @@ build: - make check || (e=$?; cat test-suite.log; exit $e) - make install -update: - only: - - schedules - script: - - "apt-get install -y --fix-missing git openssh-client" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are susceptible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - - echo "merging from torgit" - - git config --global user.email "labadmin(a)oniongit.eu" - - git config --global user.name "gitadmin" - - "mkdir tor" - - "cd tor" - - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 352991c843e2c0404fd44178cbf3df32cc365bc1 Merge: 4e684c8695 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 39d5e7c76464f4e6dae9762210363de3da7230df Merge: e78a7450a2 352991c843 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 67fc69c8c1546d1f02f66848997192023f7d1141 Merge: afd88ee87f c1b440f760 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit c1b440f7606303225b20e7a7a893afe6ecbc504e Merge: 18d2c7c5d7 39d5e7c764 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser-build/master] Bug 33932: Improve steps for collecting gradle dependencies
by sysrqb＠torproject.org 06 Aug '20

06 Aug '20

commit 061b9e7bf60d4c442346a404f23a80c01f2b6b9f Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 15 13:54:58 2020 +0000 Bug 33932: Improve steps for collecting gradle dependencies --- .../how-to-create-gradle-dependencies-list.txt | 43 ++++--------- tools/gen_gradle_deps_file.sh | 74 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 32 deletions(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index e85c56a..3ecdbf6 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -3,48 +3,27 @@ If additional Android dependencies are required by the project's build, then the Gradle build will fail due to missing dependencies. To find out what the missing dependencies are take the following steps. -For tor-onion-proxy-library and tor-android-service, replace the following line -in the respective project build file: - $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint -with - $GRADLE_HOME/gradle-4.10.2/bin/gradle --debug --no-daemon -P androidplugin=3.1.0 assembleRelease -x lint +When calling gradle in the project's build script replace the `--offline` flag +with `--debug` and remove any `-Dmaven.repo.local` arguments. For the firefox project, comment out the following line in the project's build file: - export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" Also modify the gradle flags to include the debug option so the download logs will show up: export GRADLE_FLAGS="--no-daemon --debug" -then allow network access during the build by setting -var/container/disable_network/build to 0 in rbm.conf, 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 -"firefox-android-armv7.log" with the build log file name of the actual project): +these dependencies into a list by passing the log file to the gradle dependency +list script in the tools directory: -`cat logs/firefox-android-armv7.log | grep "Performing HTTP" | grep -o "https://.*" | sort | uniq > download-attempts.txt` +`./gen_gradle_deps_file.sh /path/to/log/file` -The download-attempts.txt file contains all the attempted downloads, so we need to find out which ones failed - -`cat logs/firefox-android-armv7.log | grep "Resource missing" | grep -o "https:.*[^]]" | sort | uniq > download-fails.txt` - -Now take the intersection. This removes failures from attempts, leaving just successful downloads - -`sort download-attempts.txt download-fails.txt | uniq -u | rev | sort -t/ -u -k1,4 | rev | sort > download-urls.txt` - -You will then need to add the new dependency URLs and SHA-256 values into the -projects/$project/gradle-dependencies-list.txt file. The format of this file is -pipe delimited - sha256sum | url - -Finally, in the project's config file increment the -var/gradle_dependencies_version and make sure to restore the project's build +Copy the resulting `gradle-dependencies-list.txt` over the one in the respective +project. Then, in the project's config file, increment the +`var/gradle_dependencies_version` and make sure to restore the project's build file back to original. - -It may also be the case that you wish to clean up old versions of the artifacts. -For this you will need to run the build with a -gradle-dependencies-list.txt file containing only the headers. Make sure to also -comment the GRADLE_MAVEN_REPOSITORIES line from the project's build file. You -can now proceed to reconstruct the list as given above. diff --git a/tools/gen_gradle_deps_file.sh b/tools/gen_gradle_deps_file.sh new file mode 100755 index 0000000..377676f --- /dev/null +++ b/tools/gen_gradle_deps_file.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +# Copyright (c) 2020, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Point to a log file with all the dependency download attempts (for its +# generation see: projects/common/how-to-create-gradle-dependencies-list.txt) +# 2) Double-check that you get the same SHA-256 sums when downloaded from a +# different network location. E.g. by using `torsocks` with this script after +# having made a copy of `gradle-dependencies-list.txt` from 1) and comparing +# the two .txt files. + +log="$1" + +# Step 1: Extract all the download attempts out of the log file, ignore the ones +# for maven-metadata.xml files. We don't need those. +cat $log | grep "Performing HTTP" | grep -o "https://.*" | \ + grep -v "maven-metadata.xml" | sort | uniq > dl-attempts + +# Step 2: Fetch all the dependencies and calculate the SHA-256 sum +while read line +do + wget -U "" $line + fn=$(basename "$line") + sha256=`sha256sum $fn | cut -d ' ' -f 1` + echo "$sha256 | $line" >> deps + rm $fn +done < dl-attempts + +# Step 3: Add the header at the beginning of the final dependency file. +echo "# On how to update dependencies see projects/common/how-to-create-gradle\ +-dependencies-list.txt" > gradle-dependencies-list.txt +echo "# Don't forget to update var/gradle_dependencies_version when modifying \ +this file" >> gradle-dependencies-list.txt +echo "sha256sum | url" >> gradle-dependencies-list.txt + +# Step 4: Keep only successfully downloaded artifacts, remove duplicates, and +# sort based on download URL. +grep ^[a-f0-9] deps | rev | sort -t/ -u -k1,4 | rev | \ + sort -k 3 >> gradle-dependencies-list.txt + +# Step 5: Clean up +rm dl-attempts +rm deps + +exit 0

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_33932_v6'
by sysrqb＠torproject.org 06 Aug '20

06 Aug '20

commit 219a86f0d60592414aa460fc761e4dd50243f7b7 Merge: e370ae7 061b9e7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 6 16:42:18 2020 +0000 Merge remote-tracking branch 'gkgl/bug_33932_v6' .../how-to-create-gradle-dependencies-list.txt | 43 ++++--------- tools/gen_gradle_deps_file.sh | 74 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 32 deletions(-)

1 0

[tor-browser-build/master] Fold in 10.0a4 Changelog
by gk＠torproject.org 06 Aug '20

06 Aug '20

commit e370ae7adc6b2b15ad0d54912c7293b31a4c3a1a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 14:20:11 2020 +0000 Fold in 10.0a4 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bbe2389..45ecdf8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 10.0a4 -- July 28 2020 + * All Platforms + * Update Firefox to 68.11.0esr + * Update NoScript to 11.0.34 + * Update Tor to 0.4.4.2-alpha + * Windows + OS X + Linux + * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser] + Tor Browser 9.5.3 -- July 28 2020 * All Platforms * Update Firefox to 68.11.0esr

1 0

[tor-browser-build/master] Fold in 9.5.3 Changelog
by gk＠torproject.org 06 Aug '20

06 Aug '20

commit 2c24b79ca9bfd2ed9204b0d7b775c5d1edd56dce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 14:18:58 2020 +0000 Fold in 9.5.3 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 719a603..bbe2389 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 9.5.3 -- July 28 2020 + * All Platforms + * Update Firefox to 68.11.0esr + * Update NoScript to 11.0.34 + * Update Tor to 0.4.3.6 + Tor Browser 10.0a3 -- July 7 2020 * Android * Update Firefox to 68.10.1esr

1 0

[torbutton/master] Bug 40005: Initialize the identity UI before setting up the circuit display
by gk＠torproject.org 06 Aug '20

06 Aug '20

commit c36ccb5874a318b82310631306f73acfe4ca0eaf Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 31 13:39:09 2020 +0200 Bug 40005: Initialize the identity UI before setting up the circuit display Caused by https://bugzilla.mozilla.org/show_bug.cgi?id=1646780. --- chrome/content/tor-circuit-display.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 8a51bbfd..1be4571d 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -445,6 +445,10 @@ let ensureCorrectPopupDimensions = function () { // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (enablePrefName) { + // From 79 on the identity popup is initialized lazily + if (gIdentityHandler._initializePopup) { + gIdentityHandler._initializePopup(); + } setupGuardNote(); let myController = null, stopCollectingIsolationData = null,

1 0