- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit bf363a746eeb3a5e7243f573a5ffeda93a31aa9f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit 8df1fb275aa6427f4af9c683e06d4ad4c0c07727 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit f256d6c751a7c51dfa511dcf18babe1b3f792577 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6f9d97b..a8c9475 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e17b071..b970b51 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit e8b710e8688b29e2850e38e72583713adf65c92a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index b6ec79f..d2d6e17 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4e6cead..2e1efeb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Updating the README.build.
by gk＠torproject.org 19 Dec '14

19 Dec '14

commit fa3ac404e97e5dcb25e31e9ec7dfddf229714d22 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 19 10:38:33 2014 +0000 Updating the README.build. This update takes account of the changes landed in #13379 and earlier updater related bugs. It removes the section with spurious hangs during builds as the underlying libfaketime problems should be fixed with the switch to a newer libfaketime providing a more fine-grained control via FAKETIME_SKIP_CMDS and friends. --- gitian/README.build | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..670e84c 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -46,15 +46,19 @@ Detailed Explanation of Scripts: several helper scripts to make things easier. 0. Makefile: The main Makefile. It has the following commands: + - all: The default. It calls the 'clean', 'prep' and 'build' rules - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - clean: Remove prior partial build stages (see 'Partial Rebuilds' below for the usage of clean-* commands) - vmclean: Remove VM base images - - distclean: Remove source dependency inputs, and run clean and vmclean - - all: The default. It calls clean, prep, and then build. - - sign: Signs your build output and uploads it to people.torproject.org - - match: Checks your build output against public signed hashes + - distclean: Remove source dependency inputs, and run 'clean' and 'vmclean' + - sign: Sign your build output and uploads it to people.torproject.org + - match: Check your build output against public signed hashes + - hash: Create the SHA256 sums + - incrementals: Create the incremental update (.mar) files + - update_responses: Create .xml and .htaccess files for the updater + - signmars: Create the signatures for the update (.mar) files To build beta/alpha/nightly bundles, alternate targets are provided: - nightly: The equivalent to the 'all' rule for nightly packages - alpha: The equivalent to the 'all' rule for alpha packages @@ -71,6 +75,12 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages + - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages + - signmars-beta: The equivalent to the 'signmars' rule for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -119,7 +129,13 @@ Detailed Explanation of Scripts: 12. upload-signature.sh: This script signs and uploads your 'sha256sums.txt' file (for use if you are an official builder). - + 13. signmars.sh: This script generates the signatures on the update (.mar) + files. It expects an nssdb directory, containing the key, in the same + directory (i.e. tor-browser-bundle/gitian where it is located, too) and + a certificate with "marsigner" as nickname. Both the default nssdb + directory and the default certificate nickname can get overwritten by + exporting 'NSS_DB_DIR' and 'NSS_CERTNAME' pointing to the directory and + the nickname to be used instead. Partial Rebuilds: @@ -174,22 +190,14 @@ Known Issues and Quirks: creation hangs in the future (or help us write a wrapper script that tests VMs and re-runs the VM creation step if they don't boot). - 2. One out of every 50 builds or so, 'make' locks up at some point during a - build, probably due to timestamp issues inside the Gitian VM. The - symptoms of this are a hung build where the VM or LXC container processes - are consuming no CPU. - - Simply re-running 'make build' will resume the appropriate bundle - component for you. - - 3. If you use git branches for any repos instead of tags (for example, for + 2. If you use git branches for any repos instead of tags (for example, for a development or nightly build), fresh commits will need to be merged manually (or better git-fu is needed in ./fetch-inputs.sh, as it is currently meant to deal with tags only). - 4. Running more than one instance of Gitian at a time is not supported. + 3. Running more than one instance of Gitian at a time is not supported. - 5. Related: If you perform a fresh Gitian checkout for purposes of + 4. Related: If you perform a fresh Gitian checkout for purposes of verification, be sure to kill any stray qemu VM processes before starting the new build (because the new Gitian checkout will not have the PID or SSH keys of the previous instances' VM, and VM startup will either hang

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Adding our MAR signing keys.
by gk＠torproject.org 18 Dec '14

18 Dec '14

commit e1fdf99b8cf2d98e13ef5fa112935f96614d6af5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 18 13:25:44 2014 +0000 Bug 13379: Adding our MAR signing keys. --- toolkit/mozapps/update/updater/release_primary.der | Bin 709 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 713 -> 1233 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 11417c3..542fb24 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 16a7ef6..334fad8 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-bundle/master] Bug 13379: Sign our MAR files.
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 17 16:57:28 2014 -0500 Bug 13379: Sign our MAR files. In the Linux mar-tools package, include certutil, signmar, and the required NSS and NSPR libraries. Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. Add a series of 'signmar' make targets which run a new signmars.sh script, which does the following: 1. Prompts for an NSS password (the script assumes that an nssdb directory exists that contains the signing key/cert). 2. Moves original (unsigned) MAR files to a TORBROWSER_VERSION-unsigned/ directory. 3. Signs each of the MAR files, placing the signed files in the TORBROWSER_VERSION/ directory. You may set NSS_DB_DIR and/or NSS_CERTNAME before running signmars.sh; the defaults are ./nssdb and marsigner --- gitian/Makefile | 15 +++ gitian/descriptors/linux/gitian-firefox.yml | 11 +++ gitian/signmars.sh | 135 +++++++++++++++++++++++++++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 +++++-- 5 files changed, 189 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..9613db6 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,21 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +signmars: + ./signmars.sh versions + +signmars-alpha: + ./signmars.sh versions.alpha + +signmars-beta: + ./signmars.sh versions.beta + +signmars-nightly: + ./signmars.sh versions.nightly + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 5f96b6e..a1abf2e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -136,12 +136,23 @@ script: | rm -f $INSTDIR/Browser/*.chk # # Make MAR-based update tools available for use during the bundle phase. + # Note that mar and mbsdiff are standalone tools, compiled for the build + # host's architecture. We also include signmar, certutil, and the libraries + # they require; these utilities and libraries are built for the target + # architecture. MARTOOLS=~/build/mar-tools mkdir -p $MARTOOLS cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done cd ~/build zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ diff --git a/gitian/signmars.sh b/gitian/signmars.sh new file mode 100755 index 0000000..fdb531e --- /dev/null +++ b/gitian/signmars.sh @@ -0,0 +1,135 @@ +#!/bin/bash +# +# +# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script. + +set -e +set -u + +WRAPPER_DIR=$(dirname "$0") +WRAPPER_DIR=$(readlink -e "$WRAPPER_DIR") + +if [ -z "${NSS_DB_DIR+x}" ]; then + NSS_DB_DIR=$WRAPPER_DIR/nssdb +fi + +if [ -z "${NSS_CERTNAME+x}" ]; then + NSS_CERTNAME=marsigner +fi + +# Incorporate definitions from the versions file. +if [ -z "$1" ]; then + VERSIONS_FILE=$WRAPPER_DIR/versions +else + VERSIONS_FILE=$1 +fi + +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + +export LC_ALL=C + +# Check some prerequisites. +if [ ! -r "$NSS_DB_DIR/cert8.db" ]; then + >&2 echo "Please create and populate the $NSS_DB_DIR directory" + exit 2 +fi + +OSNAME="" +ARCH="$(uname -s)-$(uname -m)" +case $ARCH in + Linux-x86_64) + OSNAME="linux64" + ;; + Linux-i*86) + OSNAME="linux32" + ;; + *) + >&2 echo "Unsupported architecture $ARCH" + exit 2 +esac + +# Extract the MAR tools so we can use the signmar program. +MARTOOLS_TMP_DIR=$(mktemp -d) +trap "rm -rf $MARTOOLS_TMP_DIR" EXIT +MARTOOLS_ZIP="$WRAPPER_DIR/../../gitian-builder/inputs/mar-tools-${OSNAME}.zip" +cd $MARTOOLS_TMP_DIR +unzip -q "$MARTOOLS_ZIP" +cd $WRAPPER_DIR +export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" +if [ -z "${LD_LIBRARY_PATH+x}" ]; then + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" +else + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +fi + +# Prompt for the NSS password. +# TODO: Test that the entered NSS password is correct. But how? Unfortunately, +# both certutil and signmar keep trying to read a new password when they are +# given an incorrect one. +read -s -p "NSS password:" NSSPASS +echo "" + +# Sign each MAR file. +# +# Our strategy is to first move all .mar files out of the TORBROWSER_VERSION +# directory into a TORBROWSER_VERSION-unsigned/ directory. Details: +# If a file has not been signed, we move it to the -unsigned/ directory. +# If a file has already been signed and a file with the same name exists in +# the -unsigned/ directory, we just delete the signed file. +# If a file has already been signed but no corresponding file exists in +# the -unsigned/ directory, we report an error and exit. +# +# Once the above is done, the -unsigned/ directory contains a set of .mar +# files that need to be signed, so we go ahead and sign them one-by-one. +SIGNED_DIR="$WRAPPER_DIR/$TORBROWSER_VERSION" +UNSIGNED_DIR="$WRAPPER_DIR/${TORBROWSER_VERSION}-unsigned" +mkdir -p "$UNSIGNED_DIR" +cd "$SIGNED_DIR" +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + + # First, we check for an existing signature. The signmar -T output will + # include a line like "Signature block found with N signatures". + SIGINFO_PREFIX="Signature block found with " + SIGINFO=$(signmar -T "$marfile" | grep "^${SIGINFO_PREFIX}") + SIGCOUNT=0 + if [ ! -z "$SIGINFO" ]; then + SIGCOUNT=$(echo $SIGINFO | sed -e "s/${SIGINFO_PREFIX}//" -e 's/$[0-9]*$.*$/\1/') + fi + if [ $SIGCOUNT -eq 0 ]; then + # No signature; move this .mar file to the -unsigned/ directory. + mv "$marfile" "$UNSIGNED_DIR/" + elif [ -e "$UNSIGNED_DIR/$marfile" ]; then + # We have an -unsigned/ copy; discard this file. + rm "$marfile" + else + >&2 echo "Error: $SIGNED_DIR/$marfile is already signed but $UNSIGNED_DIR/$marfile is missing" + # TODO: Try to remove the existing signature(s) from marfile? + exit 1 + fi +done + +# Use signmar to sign each .mar file that is now in the -unsigned directory. +TMPMAR="$SIGNED_DIR/tmp.mar" +trap "rm -f $TMPMAR" EXIT +cd "$UNSIGNED_DIR" +COUNT=0 +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ + "$marfile" "$TMPMAR" + mv "$TMPMAR" "$SIGNED_DIR/$marfile" + COUNT=$((COUNT + 1)) +done + +echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed." +echo "The unsigned (original) MAR files are in $UNSIGNED_DIR/" diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Sign our MAR files (backport Mozilla patches).
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 40b509e6d7408a73c5a81a3d971dfc6daf5f7510 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Nov 14 11:24:14 2014 -0500 Bug 13379: Sign our MAR files (backport Mozilla patches). Backport reviewed patches from these two Mozilla bugs: 903135 - Link updater to NSS and enable MAR verification on Linux and OSX 903126 - Implement a platform independent way to determine which cert to use for verifying mars Configure browser build with --enable-signmar and --enable-verify-mar. --- browser/confvars.sh | 5 + configure.in | 6 +- modules/libmar/moz.build | 6 +- modules/libmar/src/mar.h | 30 ++++- modules/libmar/src/mar_cmdline.h | 32 ----- modules/libmar/tool/mar.c | 109 +++++++++-------- modules/libmar/verify/cryptox.c | 32 ++--- modules/libmar/verify/cryptox.h | 29 ++--- modules/libmar/verify/mar_verify.c | 143 +++++++--------------- toolkit/mozapps/update/updater/Makefile.in | 12 +- toolkit/mozapps/update/updater/archivereader.cpp | 29 +---- toolkit/mozapps/update/updater/updater.cpp | 19 +++ 12 files changed, 197 insertions(+), 255 deletions(-) diff --git a/browser/confvars.sh b/browser/confvars.sh index 8914379..8e7cf7e 100644 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -8,6 +8,11 @@ MOZ_APP_VENDOR=Mozilla MOZ_UPDATER=1 MOZ_PHOENIX=1 +MOZ_VERIFY_MAR_SIGNATURE=1 + +# Enable building ./signmar and running libmar signature tests +MOZ_ENABLE_SIGNMAR=1 + MOZ_CHROME_FILE_FORMAT=omni MOZ_DISABLE_EXPORT_JS=1 MOZ_SAFE_BROWSING=1 diff --git a/configure.in b/configure.in index b97a1e6..3093a3f 100644 --- a/configure.in +++ b/configure.in @@ -6351,11 +6351,7 @@ MOZ_ARG_ENABLE_BOOL(verify-mar, MOZ_VERIFY_MAR_SIGNATURE= ) if test -n "$MOZ_VERIFY_MAR_SIGNATURE"; then - if test "$OS_ARCH" = "WINNT"; then - AC_DEFINE(MOZ_VERIFY_MAR_SIGNATURE) - else - AC_MSG_ERROR([Can only build with --enable-verify-mar with a Windows target]) - fi + AC_DEFINE(MOZ_VERIFY_MAR_SIGNATURE) fi dnl ======================================================== diff --git a/modules/libmar/moz.build b/modules/libmar/moz.build index 44191c3..d9a8b34 100644 --- a/modules/libmar/moz.build +++ b/modules/libmar/moz.build @@ -9,11 +9,7 @@ DIRS += ['src'] if CONFIG['MOZ_ENABLE_SIGNMAR']: DIRS += ['sign', 'verify'] TEST_DIRS += ['tests'] -elif CONFIG['OS_ARCH'] == 'WINNT': - # On Windows we don't verify with NSS and updater needs to link to it - DIRS += ['verify'] -elif CONFIG['OS_ARCH'] == 'Darwin': - # On OSX we don't verify with NSS and updater needs to link to it. +elif CONFIG['MOZ_VERIFY_MAR_SIGNATURE']: DIRS += ['verify'] # If we are building ./sign and ./verify then ./tool must come after it diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h index 4e53d2c..98b454d 100644 --- a/modules/libmar/src/mar.h +++ b/modules/libmar/src/mar.h @@ -134,6 +134,26 @@ int mar_create(const char *dest, */ int mar_extract(const char *path); +#define MAR_MAX_CERT_SIZE (16*1024) // Way larger than necessary + +/* Read the entire file (not a MAR file) into a newly-allocated buffer. + * This function does not write to stderr. Instead, the caller should + * write whatever error messages it sees fit. The caller must free the returned + * buffer using free(). + * + * @param filePath The path to the file that should be read. + * @param maxSize The maximum valid file size. + * @param data On success, *data will point to a newly-allocated buffer + * with the file's contents in it. + * @param size On success, *size will be the size of the created buffer. + * + * @return 0 on success, -1 on error + */ +int mar_read_entire_file(const char * filePath, + uint32_t maxSize, + /*out*/ const uint8_t * *data, + /*out*/ uint32_t *size); + /** * Verifies a MAR file by verifying each signature with the corresponding * certificate. That is, the first signature will be verified using the first @@ -154,12 +174,10 @@ int mar_extract(const char *path); * a negative number if there was an error * a positive number if the signature does not verify */ -#ifdef XP_WIN -int mar_verify_signaturesW(MarFile *mar, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - uint32_t certCount); -#endif +int mar_verify_signatures(MarFile *mar, + const uint8_t * const *certData, + const uint32_t *certDataSizes, + uint32_t certCount); /** * Reads the product info block from the MAR file's additional block section. diff --git a/modules/libmar/src/mar_cmdline.h b/modules/libmar/src/mar_cmdline.h index e8645ec..e2c9ed5 100644 --- a/modules/libmar/src/mar_cmdline.h +++ b/modules/libmar/src/mar_cmdline.h @@ -38,38 +38,6 @@ int get_mar_file_info(const char *path, uint32_t *offsetAdditionalBlocks, uint32_t *numAdditionalBlocks); -/** - * Verifies a MAR file by verifying each signature with the corresponding - * certificate. That is, the first signature will be verified using the first - * certificate given, the second signature will be verified using the second - * certificate given, etc. The signature count must exactly match the number of - * certificates given, and all signature verifications must succeed. - * This is only used by the signmar program when used with arguments to verify - * a MAR. This should not be used to verify a MAR that will be extracted in the - * same operation by updater code. This function prints the error message if - * verification fails. - * - * @param pathToMAR The path of the MAR file whose signature should be - * checked - * @param certData Pointer to the first element in an array of certificate - * file data. - * @param certDataSizes Pointer to the first element in an array for size of - * the cert data. - * @param certNames Pointer to the first element in an array of certificate - * names. - * Used only if compiled with NSS support - * @param certCount The number of elements in certData, certDataSizes, - * and certNames - * @return 0 on success - * a negative number if there was an error - * a positive number if the signature does not verify - */ -int mar_verify_signatures(const char *pathToMAR, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - const char * const *certNames, - uint32_t certCount); - /** * Reads the product info block from the MAR file's additional block section. * The caller is responsible for freeing the fields in infoBlock diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 8abbac7..821813c 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -19,6 +19,8 @@ #endif #if !defined(NO_SIGN_VERIFY) && (!defined(XP_WIN) || defined(MAR_NSS)) +#include "cert.h" +#include "pk11pub.h" int NSSInitCryptoContext(const char *NSSConfigDir); #endif @@ -120,15 +122,13 @@ int main(int argc, char **argv) { uint32_t certCount = 0; int32_t sigIndex = -1; -#if defined(XP_WIN) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY) - HANDLE certFile; - uint8_t *certBuffers[MAX_SIGNATURES]; -#endif -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) - char* DERFilePaths[MAX_SIGNATURES]; +#if !defined(NO_SIGN_VERIFY) uint32_t fileSizes[MAX_SIGNATURES]; - uint32_t read; + uint8_t* certBuffers[MAX_SIGNATURES]; + char* DERFilePaths[MAX_SIGNATURES]; +#if (!defined(XP_WIN) && !defined(XP_MACOSX)) || defined(MAR_NSS) + CERTCertificate* certs[MAX_SIGNATURES]; +#endif #endif memset(certNames, 0, sizeof(certNames)); @@ -319,43 +319,68 @@ int main(int argc, char **argv) { return import_signature(argv[2], sigIndex, argv[3], argv[4]); case 'v': - -#if defined(XP_WIN) && !defined(MAR_NSS) if (certCount == 0) { print_usage(); return -1; } +#if (!defined(XP_WIN) && !defined(XP_MACOSX)) || defined(MAR_NSS) + if (!NSSConfigDir || certCount == 0) { + print_usage(); + return -1; + } + + if (NSSInitCryptoContext(NSSConfigDir)) { + fprintf(stderr, "ERROR: Could not initialize crypto library.\n"); + return -1; + } +#endif + + rv = 0; for (k = 0; k < certCount; ++k) { - /* If the mar program was built using CryptoAPI, then read in the buffer - containing the cert from disk. */ - certFile = CreateFileA(DERFilePaths[k], GENERIC_READ, - FILE_SHARE_READ | - FILE_SHARE_WRITE | - FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - 0, NULL); - if (INVALID_HANDLE_VALUE == certFile) { - return -1; +#if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) + rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE, + &certBuffers[k], &fileSizes[k]); +#else + /* It is somewhat circuitous to look up a CERTCertificate and then pass + * in its DER encoding just so we can later re-create that + * CERTCertificate to extract the public key out of it. However, by doing + * things this way, we maximize the reuse of the mar_verify_signatures + * function and also we keep the control flow as similar as possible + * between programs and operating systems, at least for the functions + * that are critically important to security. + */ + certs[k] = PK11_FindCertFromNickname(certNames[k], NULL); + if (certs[k]) { + certBuffers[k] = certs[k]->derCert.data; + fileSizes[k] = certs[k]->derCert.len; + } else { + rv = -1; } - fileSizes[k] = GetFileSize(certFile, NULL); - certBuffers[k] = malloc(fileSizes[k]); - if (!ReadFile(certFile, certBuffers[k], fileSizes[k], &read, NULL) || - fileSizes[k] != read) { - CloseHandle(certFile); - for (i = 0; i <= k; i++) { - free(certBuffers[i]); - } - return -1; +#endif + if (rv) { + fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + break; } - CloseHandle(certFile); } - rv = mar_verify_signatures(argv[2], certBuffers, fileSizes, - NULL, certCount); + if (!rv) { + MarFile *mar = mar_open(argv[2]); + if (mar) { + rv = mar_verify_signatures(mar, certBuffers, fileSizes, certCount); + mar_close(mar); + } else { + fprintf(stderr, "ERROR: Could not open MAR file.\n"); + rv = -1; + } + } for (k = 0; k < certCount; ++k) { +#if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) free(certBuffers[k]); +#else + /* certBuffers[k] is owned by certs[k] so don't free it */ + CERT_DestroyCertificate(certs[k]); +#endif } if (rv) { /* Determine if the source MAR file has the new fields for signing */ @@ -369,26 +394,8 @@ int main(int argc, char **argv) { } return -1; } - return 0; -#elif defined(XP_MACOSX) - return mar_verify_signatures(argv[2], (const uint8_t* const*)DERFilePaths, - 0, NULL, certCount); -#else - if (!NSSConfigDir || certCount == 0) { - print_usage(); - return -1; - } - - if (NSSInitCryptoContext(NSSConfigDir)) { - fprintf(stderr, "ERROR: Could not initialize crypto library.\n"); - return -1; - } - - return mar_verify_signatures(argv[2], NULL, 0, certNames, certCount); - -#endif /* defined(XP_WIN) && !defined(MAR_NSS) */ case 's': if (!NSSConfigDir || certCount == 0 || argc < 4) { print_usage(); diff --git a/modules/libmar/verify/cryptox.c b/modules/libmar/verify/cryptox.c index 48fbecd..af34210 100644 --- a/modules/libmar/verify/cryptox.c +++ b/modules/libmar/verify/cryptox.c @@ -16,29 +16,32 @@ /** * Loads the public key for the specified cert name from the NSS store. * - * @param certName The cert name to find. + * @param certData The DER-encoded X509 certificate to extract the key from. + * @param certDataSize The size of certData. * @param publicKey Out parameter for the public key to use. - * @param cert Out parameter for the certificate to use. * @return CryptoX_Success on success, CryptoX_Error on error. */ CryptoX_Result -NSS_LoadPublicKey(const char *certNickname, - SECKEYPublicKey **publicKey, - CERTCertificate **cert) +NSS_LoadPublicKey(const unsigned char *certData, unsigned int certDataSize, + SECKEYPublicKey **publicKey) { - secuPWData pwdata = { PW_NONE, 0 }; - if (!cert || !publicKey || !cert) { + CERTCertificate * cert; + SECItem certDataItem = { siBuffer, (unsigned char*) certData, certDataSize }; + + if (!certData || !publicKey) { return CryptoX_Error; } + cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(), &certDataItem, NULL, + PR_FALSE, PR_TRUE); /* Get the cert and embedded public key out of the database */ - *cert = PK11_FindCertFromNickname(certNickname, &pwdata); - if (!*cert) { + if (!cert) { return CryptoX_Error; } - *publicKey = CERT_ExtractPublicKey(*cert); + *publicKey = CERT_ExtractPublicKey(cert); + CERT_DestroyCertificate(cert); + if (!*publicKey) { - CERT_DestroyCertificate(*cert); return CryptoX_Error; } return CryptoX_Success; @@ -150,12 +153,11 @@ CryptoX_Result CryptoAPI_LoadPublicKey(HCRYPTPROV provider, BYTE *certData, DWORD sizeOfCertData, - HCRYPTKEY *publicKey, - HCERTSTORE *certStore) + HCRYPTKEY *publicKey) { CRYPT_DATA_BLOB blob; CERT_CONTEXT *context; - if (!provider || !certData || !publicKey || !certStore) { + if (!provider || !certData || !publicKey) { return CryptoX_Error; } @@ -165,7 +167,7 @@ CryptoAPI_LoadPublicKey(HCRYPTPROV provider, CERT_QUERY_CONTENT_FLAG_CERT, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, - certStore, NULL, (const void **)&context)) { + NULL, NULL, (const void **)&context)) { return CryptoX_Error; } diff --git a/modules/libmar/verify/cryptox.h b/modules/libmar/verify/cryptox.h index 2dd93ef..ec8f5ac 100644 --- a/modules/libmar/verify/cryptox.h +++ b/modules/libmar/verify/cryptox.h @@ -15,7 +15,9 @@ #if defined(MAR_NSS) -#include "nss_secutil.h" +#include "cert.h" +#include "keyhi.h" +#include "cryptohi.h" #define CryptoX_InvalidHandleValue NULL #define CryptoX_ProviderHandle void* @@ -26,9 +28,9 @@ #ifdef __cplusplus extern "C" { #endif -CryptoX_Result NSS_LoadPublicKey(const char *certNickname, - SECKEYPublicKey **publicKey, - CERTCertificate **cert); +CryptoX_Result NSS_LoadPublicKey(const unsigned char* certData, + unsigned int certDataSize, + SECKEYPublicKey** publicKey); CryptoX_Result NSS_VerifyBegin(VFYContext **ctx, SECKEYPublicKey * const *publicKey); CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , @@ -46,9 +48,8 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , VFY_DestroyContext(*SignatureHandle, PR_TRUE) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) \ VFY_Update(*SignatureHandle, (const unsigned char*)(buf), len) -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ - NSS_LoadPublicKey(certName, publicKey, cert) +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ + NSS_LoadPublicKey(certData, dataSize, publicKey) #define CryptoX_VerifySignature(hash, publicKey, signedData, len) \ NSS_VerifySignature(hash, (const unsigned char *)(signedData), len) #define CryptoX_FreePublicKey(key) \ @@ -91,7 +92,7 @@ void CryptoMac_FreePublicKey(CryptoX_PublicKey* aPublicKey); #define CryptoX_VerifyUpdate(aInputData, aBuf, aLen) \ CryptoMac_VerifyUpdate(aInputData, aBuf, aLen) #define CryptoX_LoadPublicKey(aProviderHandle, aCertData, aDataSize, \ - aPublicKey, aCertName, aCert) \ + aPublicKey) \ CryptoMac_LoadPublicKey(aCertData, aPublicKey) #define CryptoX_VerifySignature(aInputData, aPublicKey, aSignature, \ aSignatureLen) \ @@ -111,8 +112,7 @@ CryptoX_Result CryptoAPI_InitCryptoContext(HCRYPTPROV *provider); CryptoX_Result CryptoAPI_LoadPublicKey(HCRYPTPROV hProv, BYTE *certData, DWORD sizeOfCertData, - HCRYPTKEY *publicKey, - HCERTSTORE *cert); + HCRYPTKEY *publicKey); CryptoX_Result CryptoAPI_VerifyBegin(HCRYPTPROV provider, HCRYPTHASH* hash); CryptoX_Result CryptoAPI_VerifyUpdate(HCRYPTHASH* hash, BYTE *buf, DWORD len); @@ -133,10 +133,8 @@ CryptoX_Result CyprtoAPI_VerifySignature(HCRYPTHASH *hash, #define CryptoX_FreeSignatureHandle(SignatureHandle) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) \ CryptoAPI_VerifyUpdate(SignatureHandle, (BYTE *)(buf), len) -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ - CryptoAPI_LoadPublicKey(CryptoHandle, (BYTE*)(certData), \ - dataSize, publicKey, cert) +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ + CryptoAPI_LoadPublicKey(CryptoHandle, (BYTE*)(certData), dataSize, publicKey) #define CryptoX_VerifySignature(hash, publicKey, signedData, len) \ CyprtoAPI_VerifySignature(hash, publicKey, signedData, len) #define CryptoX_FreePublicKey(key) \ @@ -163,8 +161,7 @@ CryptoX_Result CyprtoAPI_VerifySignature(HCRYPTHASH *hash, CryptoX_Error #define CryptoX_FreeSignatureHandle(SignatureHandle) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) CryptoX_Error -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ CryptoX_Error #define CryptoX_VerifySignature(hash, publicKey, signedData, len) CryptoX_Error #define CryptoX_FreePublicKey(key) CryptoX_Error diff --git a/modules/libmar/verify/mar_verify.c b/modules/libmar/verify/mar_verify.c index 7578b62..165a802 100644 --- a/modules/libmar/verify/mar_verify.c +++ b/modules/libmar/verify/mar_verify.c @@ -17,6 +17,46 @@ #include "mar.h" #include "cryptox.h" +int +mar_read_entire_file(const char * filePath, uint32_t maxSize, + /*out*/ const uint8_t * *data, + /*out*/ uint32_t *size) +{ + int result; + FILE * f; + + if (!filePath || !data || !size) { + return -1; + } + + f = fopen(filePath, "rb"); + if (!f) { + return -1; + } + + result = -1; + if (!fseeko(f, 0, SEEK_END)) { + int64_t fileSize = ftello(f); + if (fileSize > 0 && fileSize <= maxSize && !fseeko(f, 0, SEEK_SET)) { + unsigned char * fileData; + + *size = (unsigned int) fileSize; + fileData = malloc(*size); + if (fileData) { + if (fread(fileData, *size, 1, f) == 1) { + *data = fileData; + result = 0; + } else { + free(fileData); + } + } + } + fclose(f); + } + + return result; +} + int mar_extract_and_verify_signatures_fp(FILE *fp, CryptoX_ProviderHandle provider, CryptoX_PublicKey *keys, @@ -81,92 +121,8 @@ ReadAndUpdateVerifyContext(FILE *fp, * certificate given, the second signature will be verified using the second * certificate given, etc. The signature count must exactly match the number of * certificates given, and all signature verifications must succeed. - * This is only used by the signmar program when used with arguments to verify - * a MAR. This should not be used to verify a MAR that will be extracted in the - * same operation by updater code. This function prints the error message if - * verification fails. * - * @param pathToMARFile The path of the MAR file to verify. - * @param certData Pointer to the first element in an array of certificate - * file data. - * @param certDataSizes Pointer to the first element in an array for size of the - * cert data. - * @param certNames Pointer to the first element in an array of certificate names. - * Used only if compiled as NSS, specifies the certificate names - * @param certCount The number of elements in certData, certDataSizes, and certNames - * @return 0 on success - * a negative number if there was an error - * a positive number if the signature does not verify - */ -int -mar_verify_signatures(const char *pathToMARFile, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - const char * const *certNames, - uint32_t certCount) { - int rv; - CryptoX_ProviderHandle provider = CryptoX_InvalidHandleValue; - CryptoX_Certificate certs[MAX_SIGNATURES]; - CryptoX_PublicKey keys[MAX_SIGNATURES]; - FILE *fp; - uint32_t k; - - memset(certs, 0, sizeof(certs)); - memset(keys, 0, sizeof(keys)); - - if (!pathToMARFile || certCount == 0) { - fprintf(stderr, "ERROR: Invalid parameter specified.\n"); - return CryptoX_Error; - } - - fp = fopen(pathToMARFile, "rb"); - if (!fp) { - fprintf(stderr, "ERROR: Could not open MAR file.\n"); - return CryptoX_Error; - } - - if (CryptoX_Failed(CryptoX_InitCryptoProvider(&provider))) { - fclose(fp); - fprintf(stderr, "ERROR: Could not init crytpo library.\n"); - return CryptoX_Error; - } - - /* Load the certs and keys */ - for (k = 0; k < certCount; k++) { - if (CryptoX_Failed(CryptoX_LoadPublicKey(provider, certData[k], certDataSizes[k], - &keys[k], certNames[k], &certs[k]))) { - fclose(fp); - fprintf(stderr, "ERROR: Could not load public key.\n"); - return CryptoX_Error; - } - } - - rv = mar_extract_and_verify_signatures_fp(fp, provider, keys, certCount); - fclose(fp); - - /* Cleanup the allocated keys and certs */ - for (k = 0; k < certCount; k++) { - if (keys[k]) { - CryptoX_FreePublicKey(&keys[k]); - } - - if (certs[k]) { - CryptoX_FreeCertificate(&certs[k]); - } - } - return rv; -} - -#ifdef XP_WIN -/** - * Verifies a MAR file by verifying each signature with the corresponding - * certificate. That is, the first signature will be verified using the first - * certificate given, the second signature will be verified using the second - * certificate given, etc. The signature count must exactly match the number of - * certificates given, and all signature verifications must succeed. - * - * @param pathToMARFile The path of the MAR file who's signature - * should be calculated + * @param mar The file who's signature should be calculated * @param certData Pointer to the first element in an array of * certificate data * @param certDataSizes Pointer to the first element in an array for size of @@ -175,17 +131,15 @@ mar_verify_signatures(const char *pathToMARFile, * @return 0 on success */ int -mar_verify_signaturesW(MarFile *mar, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - uint32_t certCount) { +mar_verify_signatures(MarFile *mar, + const uint8_t * const *certData, + const uint32_t *certDataSizes, + uint32_t certCount) { int rv = -1; CryptoX_ProviderHandle provider = CryptoX_InvalidHandleValue; - CryptoX_Certificate certs[MAX_SIGNATURES]; CryptoX_PublicKey keys[MAX_SIGNATURES]; uint32_t k; - memset(certs, 0, sizeof(certs)); memset(keys, 0, sizeof(keys)); if (!mar || !certData || !certDataSizes || certCount == 0) { @@ -205,7 +159,7 @@ mar_verify_signaturesW(MarFile *mar, for (k = 0; k < certCount; ++k) { if (CryptoX_Failed(CryptoX_LoadPublicKey(provider, certData[k], certDataSizes[k], - &keys[k], "", &certs[k]))) { + &keys[k]))) { fprintf(stderr, "ERROR: Could not load public key.\n"); goto failure; } @@ -219,15 +173,10 @@ failure: if (keys[k]) { CryptoX_FreePublicKey(&keys[k]); } - - if (certs[k]) { - CryptoX_FreeCertificate(&certs[k]); - } } return rv; } -#endif /** * Extracts each signature from the specified MAR file, diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index bd6716b..52cdbeb 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -18,9 +18,14 @@ LIBS += \ $(MOZ_BZ2_LIBS) \ $(NULL) -ifeq ($(OS_ARCH),WINNT) +LIBS += $(call EXPAND_LIBNAME_PATH,signmar,$(DEPTH)/modules/libmar/sign) LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) +ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) +else +LIBS += $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ + $(NSPR_LIBS) endif ifdef MOZ_WIDGET_GTK @@ -51,14 +56,13 @@ else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak n PRIMARY_CERT = nightly_aurora_level3_primary.der SECONDARY_CERT = nightly_aurora_level3_secondary.der else - PRIMARY_CERT = dep1.der - SECONDARY_CERT = dep2.der + PRIMARY_CERT = xpcshellCertificate.der + SECONDARY_CERT = xpcshellCertificate.der endif export:: $(PYTHON) $(srcdir)/gen_cert_header.py primaryCertData $(srcdir)/$(PRIMARY_CERT) > primaryCert.h $(PYTHON) $(srcdir)/gen_cert_header.py secondaryCertData $(srcdir)/$(SECONDARY_CERT) > secondaryCert.h - $(PYTHON) $(srcdir)/gen_cert_header.py xpcshellCertData $(srcdir)/xpcshellCertificate.der > xpcshellCert.h ifdef MOZ_WIDGET_GTK libs:: updater.png diff --git a/toolkit/mozapps/update/updater/archivereader.cpp b/toolkit/mozapps/update/updater/archivereader.cpp index f0e6ea3..aa9ccc4 100644 --- a/toolkit/mozapps/update/updater/archivereader.cpp +++ b/toolkit/mozapps/update/updater/archivereader.cpp @@ -15,13 +15,10 @@ #include "updatehelper.h" #endif -#ifdef XP_WIN // These are generated at compile time based on the DER file for the channel // being used #include "primaryCert.h" #include "secondaryCert.h" -#include "xpcshellCert.h" -#endif #define UPDATER_NO_STRING_GLUE_STL #include "nsVersionComparator.cpp" @@ -38,9 +35,6 @@ static int outbuf_size = 262144; static char *inbuf = nullptr; static char *outbuf = nullptr; -#ifdef XP_WIN -#include "resource.h" - /** * Performs a verification on the opened MAR file with the passed in * certificate name ID and type ID. @@ -54,15 +48,13 @@ int VerifyLoadedCert(MarFile *archive, const uint8_t (&certData)[SIZE]) { const uint32_t size = SIZE; - const uint8_t * const data = &certData[0]; - if (mar_verify_signaturesW(archive, &data, &size, 1)) { + const uint8_t* const data = &certData[0]; + if (mar_verify_signatures(archive, &data, &size, 1)) { return CERT_VERIFY_ERROR; } return OK; } -#endif - /** * Performs a verification on the opened MAR file. Both the primary and backup @@ -79,22 +71,11 @@ ArchiveReader::VerifySignature() return ARCHIVE_NOT_OPEN; } -#ifdef XP_WIN - // If the fallback key exists we're running an XPCShell test and we should - // use the XPCShell specific cert for the signed MAR. - int rv; - if (DoesFallbackKeyExist()) { - rv = VerifyLoadedCert(mArchive, xpcshellCertData); - } else { - rv = VerifyLoadedCert(mArchive, primaryCertData); - if (rv != OK) { - rv = VerifyLoadedCert(mArchive, secondaryCertData); - } + int rv = VerifyLoadedCert(mArchive, primaryCertData); + if (rv != OK) { + rv = VerifyLoadedCert(mArchive, secondaryCertData); } return rv; -#else - return OK; -#endif } /** diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 4cf24db..3a3968e 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -108,6 +108,11 @@ static bool sUseHardLinks = true; # define MAYBE_USE_HARD_LINKS 0 #endif +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) +#include "nss.h" +#include "prerror.h" +#endif + #ifdef XP_WIN #include "updatehelper.h" @@ -2520,6 +2525,20 @@ int NS_main(int argc, NS_tchar **argv) _exit(1); } #endif + +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) + // On Windows we rely on CyrptoAPI to do verifications so we don't need to + // initialize NSS at all there. + // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS + // databases. + if (NSS_NoDB_Init(NULL) != SECSuccess) { + PRErrorCode error = PR_GetError(); + fprintf(stderr, "Could not initialize NSS: %s (%d)", + PR_ErrorToName(error), (int) error); + _exit(1); + } +#endif + InitProgressUI(&argc, &argv); // To process an update the updater command line must at a minimum have the

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Sign our MAR files.
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 7612aeba131f3eca1c80a369aab97da6fc249565 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 17 16:37:11 2014 -0500 Bug 13379: Sign our MAR files. Configure with --enable-signmar (build the signmar tool). Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (Mozilla plans to use OS-native APIs on Mac OS and they already do so on Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on all platforms. Use SHA512-based MAR signatures instead of the SHA1-based ones that Mozilla uses. This is implemented inside MAR_USE_SHA512_RSA_SIG #ifdef's and with a signature algorithm ID of 512 to help avoid collisions with future work Mozilla might do in this area. See: https://bugzilla.mozilla.org/show_bug.cgi?id=1105689 --- .mozconfig | 4 +-- .mozconfig-mac | 4 +-- .mozconfig-mingw | 4 +-- modules/libmar/sign/mar_sign.c | 15 ++++++++-- modules/libmar/sign/moz.build | 1 + modules/libmar/src/mar_private.h | 8 +++++ modules/libmar/tool/Makefile.in | 1 - modules/libmar/tool/mar.c | 26 +++++++++++----- modules/libmar/tool/moz.build | 7 +++++ modules/libmar/verify/cryptox.c | 8 +++-- modules/libmar/verify/cryptox.h | 9 ++++++ modules/libmar/verify/mar_verify.c | 21 +++++++++++-- modules/libmar/verify/moz.build | 14 +++------ security/build/Makefile.in | 2 +- toolkit/mozapps/update/updater/Makefile.in | 14 ++++++++- toolkit/mozapps/update/updater/moz.build | 1 + toolkit/mozapps/update/updater/updater.cpp | 21 ++++++++----- toolkit/xre/nsUpdateDriver.cpp | 44 +++++++++++++++++----------- 18 files changed, 147 insertions(+), 57 deletions(-) diff --git a/.mozconfig b/.mozconfig index f0c5510..f2874e8 100755 --- a/.mozconfig +++ b/.mozconfig @@ -11,8 +11,8 @@ ac_add_options --enable-optimize ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --disable-tests diff --git a/.mozconfig-mac b/.mozconfig-mac index 2c06c34..06dc226 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,8 +38,8 @@ ac_add_options --disable-debug ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar # ICU seems still to have cross-compiling issues: ac_add_options --without-intl-api diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 691178b..15954d7 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -16,8 +16,8 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar # ICU seems still to have cross-compiling issues: # https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 diff --git a/modules/libmar/sign/mar_sign.c b/modules/libmar/sign/mar_sign.c index 6f21a31..e867d28 100644 --- a/modules/libmar/sign/mar_sign.c +++ b/modules/libmar/sign/mar_sign.c @@ -95,7 +95,12 @@ NSSSignBegin(const char *certName, return -1; } - *ctx = SGN_NewContext (SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE, *privKey); +#ifdef MAR_USE_SHA512_RSA_SIG + SECOidTag sigAlg = SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION; +#else + SECOidTag sigAlg = SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE; +#endif + *ctx = SGN_NewContext (sigAlg, *privKey); if (!*ctx) { fprintf(stderr, "ERROR: Could not create signature context\n"); return -1; @@ -991,8 +996,12 @@ mar_repackage_and_sign(const char *NSSConfigDir, signaturePlaceholderOffset = ftello(fpDest); for (k = 0; k < certCount; k++) { - /* Write out the signature algorithm ID, Only an ID of 1 is supported */ - signatureAlgorithmID = htonl(1); + /* Write out the signature algorithm ID. */ +#ifdef MAR_USE_SHA512_RSA_SIG + signatureAlgorithmID = htonl(SIGNATURE_ALGORITHM_ID_SHA512_RSA); +#else + signatureAlgorithmID = htonl(SIGNATURE_ALGORITHM_ID_SHA1_RSA); +#endif if (WriteAndUpdateSignatures(fpDest, &signatureAlgorithmID, sizeof(signatureAlgorithmID), ctxs, certCount, "num signatures")) { diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build index a6d0308..2be6da2 100644 --- a/modules/libmar/sign/moz.build +++ b/modules/libmar/sign/moz.build @@ -19,6 +19,7 @@ LOCAL_INCLUDES += [ ] DEFINES['MAR_NSS'] = True +DEFINES['MAR_USE_SHA512_RSA_SIG'] = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h index e0c2632..add03f5 100644 --- a/modules/libmar/src/mar_private.h +++ b/modules/libmar/src/mar_private.h @@ -21,6 +21,14 @@ which is 16 bytes */ #define SIGNATURE_BLOCK_OFFSET 16 +/* Signature algorithm IDs. */ +#define SIGNATURE_ALGORITHM_ID_SHA1_RSA 1 +#ifdef MAR_USE_SHA512_RSA_SIG +/* Use 512 as the algorithm ID so it is less likely that we will conflict with + whatever Mozilla chooses when they add support for a stronger signature. */ +#define SIGNATURE_ALGORITHM_ID_SHA512_RSA 512 +#endif + /* Make sure the file is less than 500MB. We do this to protect against invalid MAR files. */ #define MAX_SIZE_OF_MAR_FILE ((int64_t)524288000) diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index fb456726..06ec0ea 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -44,6 +44,5 @@ include $(topsrcdir)/config/rules.mk ifdef CROSS_COMPILE ifdef HOST_NSPR_MDCPUCFG HOST_CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) -CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) endif endif diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 821813c..82701a9 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -31,7 +31,11 @@ int mar_repackage_and_sign(const char *NSSConfigDir, const char * dest); static void print_version() { +#ifdef TOR_BROWSER_UPDATE + printf("Version: %s\n", TOR_BROWSER_VERSION); +#else printf("Version: %s\n", MOZ_APP_VERSION); +#endif printf("Default Channel ID: %s\n", MAR_CHANNEL_ID); } @@ -61,7 +65,7 @@ static void print_usage() { "signed_input_archive.mar base_64_encoded_signature_file " "changed_signed_output.mar\n"); printf("(i) is the index of the certificate to extract\n"); -#if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(MAR_NSS)) +#if (defined(XP_MACOSX) || defined(XP_WIN)) && !defined(MAR_NSS) printf("Verify a MAR file:\n"); printf(" mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n"); printf("At most %d signature certificate DER files are specified by " @@ -116,7 +120,11 @@ int main(int argc, char **argv) { char *NSSConfigDir = NULL; const char *certNames[MAX_SIGNATURES]; char *MARChannelID = MAR_CHANNEL_ID; +#ifdef TOR_BROWSER_UPDATE + char *productVersion = TOR_BROWSER_VERSION; +#else char *productVersion = MOZ_APP_VERSION; +#endif uint32_t i, k; int rv = -1; uint32_t certCount = 0; @@ -135,8 +143,8 @@ int main(int argc, char **argv) { #if defined(XP_WIN) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY) memset(certBuffers, 0, sizeof(certBuffers)); #endif -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) +#if !defined(NO_SIGN_VERIFY) && (!defined(MAR_NSS) && (defined(XP_WIN) || \ + defined(XP_MACOSX))) memset(DERFilePaths, 0, sizeof(DERFilePaths)); memset(fileSizes, 0, sizeof(fileSizes)); #endif @@ -165,8 +173,8 @@ int main(int argc, char **argv) { argv += 2; argc -= 2; } -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) +#if !defined(NO_SIGN_VERIFY) && (!defined(MAR_NSS) && (defined(XP_WIN) || \ + defined(XP_MACOSX))) /* -D DERFilePath, also matches -D[index] DERFilePath We allow an index for verifying to be symmetric with the import and export command line arguments. */ @@ -341,6 +349,10 @@ int main(int argc, char **argv) { #if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE, &certBuffers[k], &fileSizes[k]); + if (rv) { + fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + break; + } #else /* It is somewhat circuitous to look up a CERTCertificate and then pass * in its DER encoding just so we can later re-create that @@ -357,11 +369,11 @@ int main(int argc, char **argv) { } else { rv = -1; } -#endif if (rv) { - fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + fprintf(stderr, "ERROR: no certificate named %s", certNames[k]); break; } +#endif } if (!rv) { diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index 9e739e0..6b14e00 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -17,8 +17,15 @@ HOST_PROGRAM = 'mar' for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): DEFINES[var] = '"%s"' % CONFIG[var] +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = '%s' % CONFIG['TOR_BROWSER_UPDATE'] +if CONFIG['TOR_BROWSER_VERSION']: + DEFINES['TOR_BROWSER_VERSION'] = '"%s"' % CONFIG['TOR_BROWSER_VERSION'] + if not CONFIG['MOZ_ENABLE_SIGNMAR']: DEFINES['NO_SIGN_VERIFY'] = True +else: + DEFINES['MAR_NSS'] = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True diff --git a/modules/libmar/verify/cryptox.c b/modules/libmar/verify/cryptox.c index af34210..f39669b 100644 --- a/modules/libmar/verify/cryptox.c +++ b/modules/libmar/verify/cryptox.c @@ -64,8 +64,12 @@ NSS_VerifyBegin(VFYContext **ctx, return CryptoX_Error; } - *ctx = VFY_CreateContext(*publicKey, NULL, - SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE, NULL); +#ifdef MAR_USE_SHA512_RSA_SIG + SECOidTag sigAlg = SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION; +#else + SECOidTag sigAlg = SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE; +#endif + *ctx = VFY_CreateContext(*publicKey, NULL, sigAlg, NULL); if (*ctx == NULL) { return CryptoX_Error; } diff --git a/modules/libmar/verify/cryptox.h b/modules/libmar/verify/cryptox.h index ec8f5ac..8f579b6 100644 --- a/modules/libmar/verify/cryptox.h +++ b/modules/libmar/verify/cryptox.h @@ -59,6 +59,10 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , #elif XP_MACOSX +#ifdef MAR_USE_SHA512_RSA_SIG +#error MAR_USE_SHA512_RSA_SIG is not implemented. +#endif + #define CryptoX_InvalidHandleValue NULL #define CryptoX_ProviderHandle void* #define CryptoX_SignatureHandle void* @@ -105,6 +109,11 @@ void CryptoMac_FreePublicKey(CryptoX_PublicKey* aPublicKey); #elif defined(XP_WIN) +#ifdef MAR_USE_SHA512_RSA_SIG +#error MAR_USE_SHA512_RSA_SIG is not implemented. +#endif + + #include <windows.h> #include <wincrypt.h> diff --git a/modules/libmar/verify/mar_verify.c b/modules/libmar/verify/mar_verify.c index 165a802..78b3247 100644 --- a/modules/libmar/verify/mar_verify.c +++ b/modules/libmar/verify/mar_verify.c @@ -276,8 +276,25 @@ mar_extract_and_verify_signatures_fp(FILE *fp, } /* We don't try to verify signatures we don't know about */ - if (signatureAlgorithmIDs[i] != 1) { - fprintf(stderr, "ERROR: Unknown signature algorithm ID.\n"); +#ifdef MAR_USE_SHA512_RSA_SIG + const uint32_t kSupportedAlgID = SIGNATURE_ALGORITHM_ID_SHA512_RSA; +#else + const uint32_t kSupportedAlgID = SIGNATURE_ALGORITHM_ID_SHA1_RSA; +#endif + + if (signatureAlgorithmIDs[i] != kSupportedAlgID) { +#ifdef MAR_USE_SHA512_RSA_SIG + if (signatureAlgorithmIDs[i] == SIGNATURE_ALGORITHM_ID_SHA1_RSA) { + fprintf(stderr, + "ERROR: Unsupported signature algorithm (SHA1 with RSA).\n"); + } else { + fprintf(stderr, "ERROR: Unknown signature algorithm ID %u.\n", + signatureAlgorithmIDs[i]); + } +#else + fprintf(stderr, "ERROR: Unknown signature algorithm ID %u.\n", + signatureAlgorithmIDs[i]); +#endif for (i = 0; i < signatureCount; ++i) { free(extractedSignatures[i]); } diff --git a/modules/libmar/verify/moz.build b/modules/libmar/verify/moz.build index 6667bc1..ec5a3a2 100644 --- a/modules/libmar/verify/moz.build +++ b/modules/libmar/verify/moz.build @@ -15,16 +15,10 @@ FORCE_STATIC_LIB = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True -elif CONFIG['OS_ARCH'] == 'Darwin': - UNIFIED_SOURCES += [ - 'MacVerifyCrypto.cpp', - ] - LDFLAGS += [ - '-framework Security', - ] -else: - DEFINES['MAR_NSS'] = True - LOCAL_INCLUDES += ['../sign'] + +DEFINES['MAR_NSS'] = True +DEFINES['MAR_USE_SHA512_RSA_SIG'] = True +LOCAL_INCLUDES += ['../sign'] LOCAL_INCLUDES += [ '../src', diff --git a/security/build/Makefile.in b/security/build/Makefile.in index 0453492..816acd9 100644 --- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -289,11 +289,11 @@ endif NSS_DIRS += \ nss/cmd/lib \ nss/cmd/shlibsign \ + nss/cmd/certutil \ $(NULL) ifdef ENABLE_TESTS NSS_DIRS += \ - nss/cmd/certutil \ nss/cmd/pk12util \ nss/cmd/modutil \ $(NULL) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 52cdbeb..bdb9f27 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -3,6 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Use NSS for MAR signature verification on all platforms: +MAR_NSS=1 + # Don't link the updater against libmozglue. See bug 687139 MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = @@ -22,7 +25,14 @@ LIBS += $(call EXPAND_LIBNAME_PATH,signmar,$(DEPTH)/modules/libmar/sign) LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) +ifdef MAR_NSS +LINK_UPDATER_WITH_NSS=1 +endif else +LINK_UPDATER_WITH_NSS=1 +endif + +ifdef LINK_UPDATER_WITH_NSS LIBS += $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIBS) @@ -49,7 +59,7 @@ endif include $(topsrcdir)/config/rules.mk -ifneq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifneq (,$(filter alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) PRIMARY_CERT = release_primary.der SECONDARY_CERT = release_secondary.der else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL))) @@ -81,9 +91,11 @@ libs:: rm -f $(DIST)/bin/updater endif +ifndef LINK_UPDATER_WITH_NSS ifeq ($(OS_ARCH),WINNT) EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32) EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32) endif +endif CXXFLAGS += $(MOZ_BZ2_CFLAGS) diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index 833164a..950a6f8 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -57,6 +57,7 @@ if have_progressui == 0: 'progressui_null.cpp', ] +DEFINES['MAR_NSS'] = True DEFINES['NS_NO_XPCOM'] = True DISABLE_STL_WRAPPING = True for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 3a3968e..80de531 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -108,10 +108,12 @@ static bool sUseHardLinks = true; # define MAYBE_USE_HARD_LINKS 0 #endif -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) +#if defined(MOZ_VERIFY_MAR_SIGNATURE) +#if defined(MAR_NSS) || !defined(XP_WIN) #include "nss.h" #include "prerror.h" #endif +#endif #ifdef XP_WIN #include "updatehelper.h" @@ -2422,8 +2424,13 @@ UpdateThreadFunc(void *param) MARStrings.MARChannelID[0] = '\0'; } +#ifdef TOR_BROWSER_UPDATE + const char *appVersion = TOR_BROWSER_VERSION; +#else + const char *appVersion = MOZ_APP_VERSION; +#endif rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID, - MOZ_APP_VERSION); + appVersion); } } #endif @@ -2526,11 +2533,10 @@ int NS_main(int argc, NS_tchar **argv) } #endif -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) - // On Windows we rely on CyrptoAPI to do verifications so we don't need to - // initialize NSS at all there. - // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS - // databases. +#if defined(MOZ_VERIFY_MAR_SIGNATURE) +#if defined(MAR_NSS) || !defined(XP_WIN) + // If using NSS for signature verification, initialize NSS but minimize + // the portion we depend on by avoiding all of the NSS databases. if (NSS_NoDB_Init(NULL) != SECSuccess) { PRErrorCode error = PR_GetError(); fprintf(stderr, "Could not initialize NSS: %s (%d)", @@ -2538,6 +2544,7 @@ int NS_main(int argc, NS_tchar **argv) _exit(1); } #endif +#endif InitProgressUI(&argc, &argv); diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 1188736..aeb2b6b 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -17,6 +17,7 @@ #include "prproces.h" #include "prlog.h" #include "prenv.h" +#include "prprf.h" #include "nsVersionComparator.h" #include "nsXREDirProvider.h" #include "SpecialSystemDirectory.h" @@ -39,7 +40,6 @@ # include <windows.h> # include <shlwapi.h> # include "nsWindowsHelpers.h" -# include "prprf.h" # define getcwd(path, size) _getcwd(path, size) # define getpid() GetCurrentProcessId() #elif defined(XP_UNIX) @@ -134,25 +134,39 @@ GetCurrentWorkingDir(char *buf, size_t size) } +// In Tor Browser, updater(.exe) depends on some shared libraries that are +// located in the app directory. To allow the updater to run when it has been +// copied into the update directory, we prepend the app directory to the +// appropriate environment variable so it will be searched by the dynamic +// linker. + #if defined(XP_WIN) #define PATH_SEPARATOR ";" +#define LD_LIBRARY_PATH_ENVVAR_NAME "PATH" +#else +#define PATH_SEPARATOR ":" +#if defined(XP_MACOSX) +#define LD_LIBRARY_PATH_ENVVAR_NAME "DYLD_LIBRARY_PATH" +#else +#define LD_LIBRARY_PATH_ENVVAR_NAME "LD_LIBRARY_PATH" +#endif +#endif -// In Tor Browser, updater.exe depends on some DLLs that are located in the -// app directory. To allow the updater to run when it has been copied into -// the update directory, we append the app directory to the PATH. static nsresult -AdjustPathForUpdater(nsIFile *appDir) +AdjustLibSearchPathForUpdater(nsIFile *appDir) { nsAutoCString appPath; nsresult rv = appDir->GetNativePath(appPath); NS_ENSURE_SUCCESS(rv, rv); char *s = nullptr; - char *pathValue = PR_GetEnv("PATH"); + char *pathValue = PR_GetEnv(LD_LIBRARY_PATH_ENVVAR_NAME); if ((nullptr == pathValue) || ('\0' == *pathValue)) { - s = PR_smprintf("PATH=%s", appPath.get()); + s = PR_smprintf("%s=%s", + LD_LIBRARY_PATH_ENVVAR_NAME, appPath.get()); } else { - s = PR_smprintf("PATH=%s" PATH_SEPARATOR "%s", pathValue, appPath.get()); + s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", + LD_LIBRARY_PATH_ENVVAR_NAME, appPath.get(), pathValue); } // We intentionally leak the value that is passed into PR_SetEnv() because @@ -162,7 +176,7 @@ AdjustPathForUpdater(nsIFile *appDir) return NS_OK; } -#endif + #ifdef DEBUG static void @@ -623,12 +637,10 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, PR_SetEnv("MOZ_SAFE_MODE_RESTART=1"); } -#if defined(XP_WIN) - nsresult rv2 = AdjustPathForUpdater(appDir); + nsresult rv2 = AdjustLibSearchPathForUpdater(appDir); if (NS_FAILED(rv2)) { - LOG(("SwitchToUpdatedApp -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + LOG(("SwitchToUpdatedApp -- AdjustLibSearchPathForUpdater failed (0x%x)\n", rv2)); } -#endif LOG(("spawning updater process for replacing [%s]\n", updaterPath.get())); @@ -920,12 +932,10 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, PR_SetEnv("MOZ_OS_UPDATE=1"); } -#if defined(XP_WIN) - nsresult rv2 = AdjustPathForUpdater(appDir); + nsresult rv2 = AdjustLibSearchPathForUpdater(appDir); if (NS_FAILED(rv2)) { - LOG(("ApplyUpdate -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + LOG(("ApplyUpdate -- AdjustLibSearchPathForUpdater failed (0x%x)\n", rv2)); } -#endif #if defined(MOZ_WIDGET_GONK) // We want the updater to be CPU friendly and not subject to being killed by

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 902761 - Stop storing certs used for MAR verification in EXE resource files. r=rstrong
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 9c7ea1fb1df0545990a85aabcef8180ea287305f Author: Brian R. Bondy <netzen(a)gmail.com> Date: Wed Oct 15 23:01:11 2014 -0400 Bug 902761 - Stop storing certs used for MAR verification in EXE resource files. r=rstrong --- toolkit/mozapps/update/updater/archivereader.cpp | 70 ++++++---------------- toolkit/mozapps/update/updater/updater.rc | 19 ------ 2 files changed, 18 insertions(+), 71 deletions(-) diff --git a/toolkit/mozapps/update/updater/archivereader.cpp b/toolkit/mozapps/update/updater/archivereader.cpp index 271905d..f0e6ea3 100644 --- a/toolkit/mozapps/update/updater/archivereader.cpp +++ b/toolkit/mozapps/update/updater/archivereader.cpp @@ -15,6 +15,14 @@ #include "updatehelper.h" #endif +#ifdef XP_WIN +// These are generated at compile time based on the DER file for the channel +// being used +#include "primaryCert.h" +#include "secondaryCert.h" +#include "xpcshellCert.h" +#endif + #define UPDATER_NO_STRING_GLUE_STL #include "nsVersionComparator.cpp" #undef UPDATER_NO_STRING_GLUE_STL @@ -34,61 +42,19 @@ static char *outbuf = nullptr; #include "resource.h" /** - * Obtains the data of the specified resource name and type. - * - * @param name The name ID of the resource - * @param type The type ID of the resource - * @param data Out parameter which sets the pointer to a buffer containing - * the needed data. - * @param size Out parameter which sets the size of the returned data buffer - * @return TRUE on success -*/ -BOOL -LoadFileInResource(int name, int type, const uint8_t *&data, uint32_t& size) -{ - HMODULE handle = GetModuleHandle(nullptr); - if (!handle) { - return FALSE; - } - - HRSRC resourceInfoBlockHandle = FindResource(handle, - MAKEINTRESOURCE(name), - MAKEINTRESOURCE(type)); - if (!resourceInfoBlockHandle) { - FreeLibrary(handle); - return FALSE; - } - - HGLOBAL resourceHandle = LoadResource(handle, resourceInfoBlockHandle); - if (!resourceHandle) { - FreeLibrary(handle); - return FALSE; - } - - size = SizeofResource(handle, resourceInfoBlockHandle); - data = static_cast<const uint8_t*>(::LockResource(resourceHandle)); - FreeLibrary(handle); - return TRUE; -} - -/** * Performs a verification on the opened MAR file with the passed in * certificate name ID and type ID. * - * @param archive The MAR file to verify the signature on - * @param name The name ID of the resource - * @param type THe type ID of the resource - * @return OK on success, CERT_LOAD_ERROR or CERT_VERIFY_ERROR on failure. + * @param archive The MAR file to verify the signature on. + * @param certData The certificate data. + * @return OK on success, CERT_VERIFY_ERROR on failure. */ +template<uint32_t SIZE> int -VerifyLoadedCert(MarFile *archive, int name, int type) +VerifyLoadedCert(MarFile *archive, const uint8_t (&certData)[SIZE]) { - uint32_t size = 0; - const uint8_t *data = nullptr; - if (!LoadFileInResource(name, type, data, size) || !data || !size) { - return CERT_LOAD_ERROR; - } - + const uint32_t size = SIZE; + const uint8_t * const data = &certData[0]; if (mar_verify_signaturesW(archive, &data, &size, 1)) { return CERT_VERIFY_ERROR; } @@ -118,11 +84,11 @@ ArchiveReader::VerifySignature() // use the XPCShell specific cert for the signed MAR. int rv; if (DoesFallbackKeyExist()) { - rv = VerifyLoadedCert(mArchive, IDR_XPCSHELL_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, xpcshellCertData); } else { - rv = VerifyLoadedCert(mArchive, IDR_PRIMARY_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, primaryCertData); if (rv != OK) { - rv = VerifyLoadedCert(mArchive, IDR_BACKUP_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, secondaryCertData); } } return rv; diff --git a/toolkit/mozapps/update/updater/updater.rc b/toolkit/mozapps/update/updater/updater.rc index acea427..5dc4c85 100644 --- a/toolkit/mozapps/update/updater/updater.rc +++ b/toolkit/mozapps/update/updater/updater.rc @@ -42,25 +42,6 @@ IDI_DIALOG ICON "updater.ico" ///////////////////////////////////////////////////////////////////////////// // -// Embedded certificates for allowed MARs -// - -#if defined(MAR_SIGNING_RELEASE_BETA) -IDR_PRIMARY_CERT TYPE_CERT "release_primary.der" -IDR_BACKUP_CERT TYPE_CERT "release_secondary.der" -#elif defined(MAR_SIGNING_AURORA_NIGHTLY) -IDR_PRIMARY_CERT TYPE_CERT "nightly_aurora_level3_primary.der" -IDR_BACKUP_CERT TYPE_CERT "nightly_aurora_level3_secondary.der" -#else -IDR_PRIMARY_CERT TYPE_CERT "dep1.der" -IDR_BACKUP_CERT TYPE_CERT "dep2.der" -#endif - -IDR_XPCSHELL_CERT TYPE_CERT "xpcshellCertificate.der" - - -///////////////////////////////////////////////////////////////////////////// -// // Embedded an identifier to uniquely identiy this as a Mozilla updater. //

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 902761 - Build configuration for turning .der files into .h files. r=rstrong
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 7d87311b58709d8ab2a8ec052e0613b574b19a7b Author: Brian R. Bondy <netzen(a)gmail.com> Date: Wed Oct 15 23:00:23 2014 -0400 Bug 902761 - Build configuration for turning .der files into .h files. r=rstrong --- toolkit/mozapps/update/updater/Makefile.in | 16 +++++++++++++ toolkit/mozapps/update/updater/gen_cert_header.py | 25 +++++++++++++++++++++ toolkit/mozapps/update/updater/moz.build | 4 ---- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index d4c06b9..bd6716b 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -44,6 +44,22 @@ endif include $(topsrcdir)/config/rules.mk +ifneq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL))) + PRIMARY_CERT = release_primary.der + SECONDARY_CERT = release_secondary.der +else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL))) + PRIMARY_CERT = nightly_aurora_level3_primary.der + SECONDARY_CERT = nightly_aurora_level3_secondary.der +else + PRIMARY_CERT = dep1.der + SECONDARY_CERT = dep2.der +endif + +export:: + $(PYTHON) $(srcdir)/gen_cert_header.py primaryCertData $(srcdir)/$(PRIMARY_CERT) > primaryCert.h + $(PYTHON) $(srcdir)/gen_cert_header.py secondaryCertData $(srcdir)/$(SECONDARY_CERT) > secondaryCert.h + $(PYTHON) $(srcdir)/gen_cert_header.py xpcshellCertData $(srcdir)/xpcshellCertificate.der > xpcshellCert.h + ifdef MOZ_WIDGET_GTK libs:: updater.png $(NSINSTALL) -D $(DIST)/bin/icons diff --git a/toolkit/mozapps/update/updater/gen_cert_header.py b/toolkit/mozapps/update/updater/gen_cert_header.py new file mode 100644 index 0000000..182e98b --- /dev/null +++ b/toolkit/mozapps/update/updater/gen_cert_header.py @@ -0,0 +1,25 @@ +import sys +import binascii + +def file_byte_generator(filename, block_size = 512): + with open(filename, "rb") as f: + while True: + block = f.read(block_size) + if block: + for byte in block: + yield byte + else: + break + +def create_header(array_name, in_filename): + hexified = ["0x" + binascii.hexlify(byte) for byte in file_byte_generator(in_filename)] + print "const uint8_t " + array_name + "[] = {" + print ", ".join(hexified) + print "};" + return 0 + +if __name__ == '__main__': + if len(sys.argv) < 3: + print 'ERROR: usage: gen_cert_header.py array_name in_filename' + sys.exit(1); + sys.exit(create_header(sys.argv[1], sys.argv[2])) diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index ba1c088..833164a 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -78,7 +78,3 @@ if CONFIG['_MSC_VER']: elif CONFIG['OS_ARCH'] == 'WINNT': WIN32_EXE_LDFLAGS += ['-municode'] -if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr'): - DEFINES['MAR_SIGNING_RELEASE_BETA'] = '1' -elif CONFIG['MOZ_UPDATE_CHANNEL'] in ('nightly', 'aurora', 'nightly-elm', 'nightly-profiling', 'nightly-oak', 'nightly-ux'): - DEFINES['MAR_SIGNING_AURORA_NIGHTLY'] = '1'

1 0

[tor-browser-bundle/master] Bug #13776: Incremental MAR files not reproducible
by brade＠torproject.org 12 Dec '14

12 Dec '14

commit 5130f4ded3705e13f2d20fe49a502ec11e8d7cf2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental MAR files. --- tools/update-responses/update_responses | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c788586..b28b575 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -10,9 +10,16 @@ use Cwd; use File::Temp; use File::Find; use File::Which; +use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 );

1 0

[torbutton/master] Bug 11449: Avoid new identity error when NoScript disabled.
by brade＠torproject.org 11 Dec '14

11 Dec '14

commit 88dfaaaf325f5b86aba3d449b87320d0d962681d Author: Loic Bistuer <loic.bistuer(a)gmail.com> Date: Tue Oct 21 02:30:20 2014 +0700 Bug 11449: Avoid new identity error when NoScript disabled. --- src/chrome/content/torbutton.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2ba4159..5aed682 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1646,8 +1646,10 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions"); try { - var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject - nsSvc.eraseTemp(); + if ("@maone.net/noscript-service;1" in Components.classes) { + var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject + nsSvc.eraseTemp(); + } } catch(e) { torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e); window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e);

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13439: No canvas prompt for content-callers.
by gk＠torproject.org 09 Dec '14

09 Dec '14

commit fc1c9ff7c1b2defdbc039f12214767608f46423f Author: Gunes Acar <gunes.acar(a)esat.kuleuven.be> Date: Wed Dec 3 20:22:22 2014 +0100 Bug 13439: No canvas prompt for content-callers. Both the Inspector and PDF.js raise canvas prompts although they are no danger as they are delivered with the browser itself and are no untrusted content. This patch exempts both of them from canvas prompts, too. If calling `DescribeScriptedCaller` fails neither `scriptFile` nor `scriptLine` are logged. --- content/canvas/src/CanvasUtils.cpp | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index 9a7a441..5a6e05e 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -54,6 +54,20 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) return true; + // Don't show canvas prompt for chrome scripts (e.g. Page Inspector) + if (nsContentUtils::IsCallerChrome()) + return true; + + JS::AutoFilename scriptFile; + unsigned scriptLine = 0; + bool isScriptKnown = false; + if (JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine)) { + isScriptKnown = true; + // Don't show canvas prompt for PDF.js + if (scriptFile.get() && + strcmp(scriptFile.get(), "resource://pdf.js/build/pdf.js") == 0) + return true; + } bool isAllowed = false; nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = do_GetService(THIRDPARTYUTIL_CONTRACTID); @@ -87,19 +101,19 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); - JS::AutoFilename scriptFile;; - unsigned scriptLine = 0; - JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine); - nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from document %s, script from %s:%u ", // L10n - firstPartySpec.get(), docSpec.get(), - scriptFile.get(), scriptLine); - + " from document %s, ", // L10n + firstPartySpec.get(), docSpec.get()); + if (isScriptKnown && scriptFile.get()) { + msg += nsPrintfCString("script from %s:%u", // L10n + scriptFile.get(), scriptLine); + } else { + msg += nsPrintfCString("unknown script"); // L10n + } nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console)

1 0

[torbutton/master] Bug #13881. Localize strings for tor circuit display
by gk＠torproject.org 08 Dec '14

08 Dec '14

commit 000d727a34a7256d993662ce848112c419520860 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 5 16:08:21 2014 -0800 Bug #13881. Localize strings for tor circuit display --- src/chrome/content/popup.xul | 2 +- src/chrome/content/tor-circuit-display.js | 20 ++++++++++++++++---- src/chrome/locale/en/torbutton.dtd | 1 + src/chrome/locale/en/torbutton.properties | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 2965ec5..5f12f2b 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -51,7 +51,7 @@ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="290" height="140" id="tor-circuit" style="display:none;"> <rect x="0" y="0" width="100%" height="100%" fill="#e8f4f4" /> - <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">Tor circuit for this site</text> + <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">&torbutton.circuit_display.title;</text> <text id="domain" style="font-size:13px;" x="10" y="38" fill="black">(trac.torproject.org)</text> <rect x="18.5" width="3" y="56" height="64" fill="#4d363a" stroke-width="0"/> <circle class="node-circle" cx="20" cy="56" r="4" /> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 4c31bc6..d0977f1 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -151,6 +151,17 @@ let collectIsolationData = function (aController) { // ## User interface +// __torbuttonBundle__. +// Bundle of localized strings for torbutton UI. +let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + +// __uiString__. +// Read the localized strings for this UI. +let uiString = function (shortName) { + return torbuttonBundle.GetStringFromName("torbutton.circuit_display." + shortName); +}; + // __regionBundle__. // A list of localized region (country) names. let regionBundle = Services.strings.createBundle( @@ -181,14 +192,15 @@ let showCircuitDisplay = function (show) { // and converts each node data to text, as // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { - let result = ["This browser"]; + let result = [uiString("this_browser")]; for (let {ip, countryCode, type} of nodeData) { let bridge = type === "bridge"; result.push((countryCode ? localizedCountryNameFromCode(countryCode) - : "Unknown country") + - " (" + (bridge ? "Bridge" : (ip || "IP unknown")) + ")"); + : uiString("unknown_country")) + + " (" + (bridge ? uiString("tor_bridge") + : (ip || uiString("ip_unknown"))) + ")"); } - result[4] = "Internet"; + result[4] = uiString("internet"); return result; }; diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 283032b..72c7d41 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -155,3 +155,4 @@ <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> <!ENTITY torbutton.prefs.sec_high "High"> <!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c76be32..c3e85a3 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -1,5 +1,10 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.tor_bridge = Bridge +torbutton.circuit_display.unknown_country = Unknown country torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.plugins.disabled = Click to enable plugins

1 0

[tor-browser-bundle/master] Updated Changelog for 4.5-alpha-2.
by gk＠torproject.org 05 Dec '14

05 Dec '14

commit ce9ae81c8ed530b39ff4be99b2f2053ff74b597c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 5 08:15:38 2014 +0000 Updated Changelog for 4.5-alpha-2. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f1511b0..11cf88b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,6 +8,7 @@ Tor Browser 4.5-alpha-2 -- Dec 5 2014 * Bug 13671: Make bridges visible on circuit display * Bug 9387: Incorporate user feedback * Bug 13784: Remove third party authentication tokens + * Bug 13435: Remove our custom POODLE fix (fixed by Mozilla in ESR 31.3.0) Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms

1 0

[torbutton/master] fixup! #13671: fix circuit display when bridges are used
by gk＠torproject.org 03 Dec '14

03 Dec '14

commit 25921b57878c273ea4f499eb88ac2590563d9869 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 3 11:38:34 2014 +0000 fixup! #13671: fix circuit display when bridges are used --- src/chrome/content/tor-circuit-display.js | 6 +++--- src/modules/tor-control-port.js | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index caf6886..4c31bc6 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -81,10 +81,10 @@ let readBridgeIPs = function (controller) { // nodeDataForID(controller, id)__. // Returns the type, IP and country code of a node with given ID. -// Example: `nodeData(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` -// => `{ type : "default" , ip : "12.23.34.45" , countryCode : "fr" }` +// Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` +// => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // ip, type, countryCode; + let result = {}; // type, ip, countryCode; if (bridgeIDtoIPmap.has(id.toUpperCase())) { result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); result.type = "bridge"; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index d356ebb..3fa7756 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -178,7 +178,7 @@ io.onLineFromOnMessage = function (onMessage) { // __io.callbackDispatcher()__. // Returns dispatcher object with three member functions: -// dispatcher.addCallback(regex, callback), and dispatcher.removeCallback(callback), +// dispatcher.addCallback(regex, callback), dispatcher.removeCallback(callback), // and dispatcher.pushMessage(message). // Pass pushMessage to another function that needs a callback with a single string // argument. Whenever dispatcher.pushMessage receives a string, the dispatcher will @@ -412,12 +412,12 @@ info.routerStatusParser = function (valueString) { dataFun = { "r" : data => utils.listMapData(data, ["nickname", "identity", "digest", "publicationDate", "publicationTime", - "IP", "ORPort", "DirPort"]) , - "a" : data => ({ "IPv6" : data }) , - "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }) , - "v" : data => ({ "version" : data }) , - "w" : data => utils.listMapData(data, []) , - "p" : data => ({ "portList" : data.split(",") }) , + "IP", "ORPort", "DirPort"]), + "a" : data => ({ "IPv6" : data }), + "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }), + "v" : data => ({ "version" : data }), + "w" : data => utils.listMapData(data, []), + "p" : data => ({ "portList" : data.split(",") }), "m" : data => utils.listMapData(data, []) }[line.charAt(0)]; if (dataFun !== undefined) {

1 0

[tor-browser-bundle/master] Correct NoScript hash.
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit b3cecd5a7b2e7e26731606e7b0824527e200c882 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 21:41:21 2014 +0000 Correct NoScript hash. --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a25af43..4e6cead 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -86,7 +86,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701 +NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2ba0141..2545121 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701 +NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[torbutton/master] Bug 9387: Version 0.3 of the Security Slider.
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 6f3904e16b829715b230d927f29d2cf02f1e4964 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 1 15:36:51 2014 +0000 Bug 9387: Version 0.3 of the Security Slider. It contains the following, small improvements: * custom settings are not overwritten on restart/New Identity * the custom checkbox is disabled and not hidden anymore by default * the security level can be chosen by clicking on the respective description --- src/chrome/content/preferences.js | 20 ++++++++++++-------- src/chrome/content/preferences.xul | 19 +++++++++++-------- src/chrome/content/torbutton.js | 9 ++++++--- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 20a6c9f..75937eb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -194,7 +194,7 @@ function torbutton_prefs_init(doc) { // non-responding. We need to handle |movetoclick| as well. sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; - sec_custom.collapsed = !custom_values; + sec_custom.disabled = !custom_values; torbutton_prefs_set_field_attributes(doc); } @@ -447,14 +447,18 @@ function torbutton_prefs_reset_defaults() { prefService.savePrefFile(null); } -function torbutton_toggle_slider(doc) { +function torbutton_toggle_slider(doc, pos) { let slider = doc.getElementById("torbutton_sec_slider"); - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); + // onclick is active even if the element it belongs to is disabled. + if (pos && !slider.disabled) { + slider.value = pos; } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); + if (doc.getElementById("torbutton_sec_custom").checked) { + slider.disabled = true; + slider.setAttribute("movetoclick", false); + } else { + slider.disabled = false; + slider.setAttribute("movetoclick", true); + } } } - diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 7c5633b..cb5f1ab 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -97,7 +97,7 @@ <radiogroup align="center" orient="horizontal" id="torbutton_socksGroup"> <radio id="torbutton_socksv4" label="&torbutton.prefs.socks_vfour;"/> - <radio id="torbutton_socksv5" + <radio id="torbutton_socksv5" label="&torbutton.prefs.socks_vfive;"/> </radiogroup> </row> @@ -129,8 +129,7 @@ oncommand="torbutton_prefs_set_field_attributes(document)"/> </radiogroup> - - + <hbox> <spacer flex="1"/> <button id="torbutton_testSettings" @@ -162,22 +161,26 @@ </vbox> <vbox height="200"> <hbox flex="1" align="center"> - <description id="torbutton_sec_low"> + <description id="torbutton_sec_low" + onclick="torbutton_toggle_slider(document, 1);"> &torbutton.prefs.sec_low; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low"> + <description id="torbutton_sec_med_low" + onclick="torbutton_toggle_slider(document, 2);"> &torbutton.prefs.sec_med_low; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high"> + <description id="torbutton_sec_med_high" + onclick="torbutton_toggle_slider(document, 3);"> &torbutton.prefs.sec_med_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_high"> + <description id="torbutton_sec_high" + onclick="torbutton_toggle_slider(document, 4);"> &torbutton.prefs.sec_high; </description> </hbox> @@ -185,7 +188,7 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document);" + oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index da39864..2ba4159 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -552,8 +552,11 @@ function torbutton_init() { // initialize preferences before we start our prefs observer torbutton_init_prefs(); - // set some important security prefs according to the chosen security level - torbutton_update_security_slider(); + // Set some important security prefs according to the chosen security level + // if there are no custom settings to respect. + if (!m_tb_prefs.getBoolPref("extensions.torbutton.security_custom")) { + torbutton_update_security_slider(); + } // set panel style from preferences torbutton_set_panel_style(); @@ -562,7 +565,7 @@ function torbutton_init() { torbutton_init_toolbutton(); torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); + torbutton_window_pref_observer.register(); torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register();

1 0

[torbutton/master] Bump Torbutton version; update CHANGELOG
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 56c588b63a6f616b886333f6b8e997bcc2497371 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 20:29:01 2014 +0000 Bump Torbutton version; update CHANGELOG --- src/CHANGELOG | 9 +++++++++ src/install.rdf | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4510b0c..5bc86c6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,12 @@ +1.8.1.2 + * Bug 13672: Make circuit display optional + * Bug 13671: Make bridges visible on circuit display + * Bug 9387: Incorporate user feedback + * Bug 13784: Remove third party authentication tokens + +1.8.1.1 + * Bug 13751: Remove remaining SafeCache code. + 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/install.rdf b/src/install.rdf index 402b99c..ae524b2 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.0</em:version> + <em:version>1.8.1.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Revert "Bug 13742: Remove SafeCache code (in favor of C++ implementation)"
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 7b93a59893957db4495abe3541036c760ed119f9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 14:42:13 2014 +0000 Revert "Bug 13742: Remove SafeCache code (in favor of C++ implementation)" This reverts commit 1dedacb01855cab10835d165578575603a208cec. --- src/chrome/content/stanford-safecache.js | 448 ++++++++++++++++++++++++++++++ src/chrome/content/torbutton.xul | 4 + 2 files changed, 452 insertions(+) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js new file mode 100644 index 0000000..0ef52ad --- /dev/null +++ b/src/chrome/content/stanford-safecache.js @@ -0,0 +1,448 @@ +// Bug 1506 P3: This file provides important cache isolation properties, +// but it is not very useful without a patched Firefox to go with it. +// It could probably also use some refactoring into an XPCOM component. +// It is currently registered from torbutton.js's "main window" observers, +// which is not the right place. + +/* + +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 name of Stanford University 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. + +*/ +// Dual-keyed cache/cookie same-origin policy +// Ensures that cache and cookies set in HTTP headers cannot be used for +// non-cooperative or semi-cooperative tracking. +// +// Author: Edward Pastuszenski +// +// Based on Stanford SafeCache +// Author: Collin Jackson +// Other contributors: Andrew Bortz, John Mitchell, Dan Boneh +// + +////////////////////////////////////////////////////////////////////////////// +// Constants + +const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; +const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; +const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; +const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; + +//////////////////////////////////////////////////////////////////////////// +// Debug stuff + +/** + * Dump information to the console? + */ +var SSC_debug = true; + +/** + * Sends data to the console if we're in debug mode + * @param msg The string containing the message to display + */ +function SSC_dump(msg) { + if (SSC_debug) + torbutton_log(3, "SSC: " + msg); +} + +//////////////////////////////////////////////////////////////////////////// +// "Major" objects/classes + +/** + * SafeCache HTTP Request Listener + * Watches for the authentication requests and presents password dialog + */ + +function SSC_RequestListener(controller) { + this.controller = controller; + this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. + getService(Ci.mozIThirdPartyUtil); + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. + getService(Ci.nsICookiePermission); +} + +SSC_RequestListener.prototype = +{ + controller: null, // The SSC_Controller that created this + + observe: function(subject, topic, data) { + try { + if(this.controller.getEnabled() == 2) return; + if(this.controller.getEnabled() == 1 + && !this.controller.getTorButton()) return; + if (topic == 'http-on-modify-request') { + subject.QueryInterface(Components.interfaces.nsIHttpChannel); + subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); + this.onModifyRequest(subject); + } else if (topic == 'http-on-examine-response') { + subject.QueryInterface(Components.interfaces.nsIHttpChannel); + subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); + this.onExamineResponse(subject); + } + } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} + }, + + bypassCache: function(channel) { + channel.loadFlags |= channel.LOAD_BYPASS_CACHE; + // INHIBIT_PERSISTENT_CACHING instead? + channel.cacheKey = this.newCacheKey(0); + SSC_dump("Bypassed cache for " + channel.URI.spec); + }, + + setCacheKey: function(channel, str) { + try { + channel.cacheDomain = str; + SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); + } catch(e) { + var oldData = this.readCacheKey(channel); + var newKey = this.newCacheKey(this.getHash(str) + oldData); + channel.cacheKey = newKey; + SSC_dump("Set cache key to hash(" + str + ") = " + + newKey.data + " for " + channel.URI.spec); + } + }, + + onModifyRequest: function(channel) { + var parent_host = null; + var parent_spec = null; + if (channel.notificationCallbacks || + channel.loadGroup && channel.loadGroup.notificationCallbacks) { + var callbacks = null; + if (channel.notificationCallbacks) { + callbacks = channel.notificationCallbacks; + } else { + callbacks = channel.loadGroup.notificationCallbacks; + } + try { + var wind = callbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent_host = wind.window.top.location.hostname; + parent_spec = wind.window.top.location.href; + } catch(e) { + } + SSC_dump("Parent "+parent_host+" for "+ channel.URI.spec); + } + + if (channel.documentURI && channel.documentURI == channel.URI) { + parent_host = null; // first party interaction + parent_spec = null; + } else if(!parent_host) { + // Questionable first party interaction.. + try { + var anuri = null; + try { + anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); + } catch (e) { + torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); + // We are not using the TBB based on ESR 24. Falling back to the old + // method. + anuri = this.cookie_permissions.getOriginatingURI(channel); + } + parent_host = anuri.host; + parent_spec = anuri.spec; + } catch(e) { + // XXX: This can still fail for OCSP and other windowless requests.. + torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); + if (!channel.referrer) { + torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); + } else { + parent_host = channel.referrer.host; + parent_spec = channel.referrer.spec; + } + } + } + + // Same-origin policy + var referrer; + if (parent_host && parent_host != channel.URI.host) { + SSC_dump("Segmenting " + channel.URI.spec + + " content loaded by " + parent_host); + this.setCacheKey(channel, parent_host); + referrer = parent_host; + try { + // Disable 3rd party http auth, but exempt the browser (for favicon loads) + // FIXME: Hrmm, this is just going to disable auth for 3rd party domains. + // It would be better if we could isolate the auth, but still + // allow it to be transmitted.. But I guess, who still uses http auth anyways? + if (channel.getRequestHeader("Authorization") !== null) { + if (parent_spec == "chrome://browser/content/browser.xul") { + torbutton_log(3, "Allowing auth for browser load of "+channel.URI.spec); + } else { + torbutton_safelog(4, "Removing 3rd party HTTP auth for url ", + channel.URI.spec+", parent: "+parent_spec); + channel.setRequestHeader("Authorization", null, false); + channel.setRequestHeader("Pragma", null, false); + channel.setRequestHeader("Cache-Control", null, false); + } + } + } catch (e) {} + } else { + referrer = channel.URI.host; + if(!this.readCacheKey(channel)) { + this.setCacheKey(channel, channel.URI.host); + } else { + SSC_dump("Existing cache key detected; leaving it unchanged."); + } + } + + if (this.controller.getBlockThirdPartyCache()) { + if(parent_host && parent_host != channel.URI.host) { + //SSC_dump("Third party cache blocked for " + channel.URI.spec + + //" content loaded by " + parent_host); + this.bypassCache(channel); + } + } + + var cookie = null; + if (this.controller.getSafeCookieEnabled()) { + try{ + cookie = channel.getRequestHeader("Cookie"); + //SSC_dump("Cookie: " + cookie); + } catch(e) {cookie = null;} + } + + if(cookie) { + //Strip the secondary key from every referrer-matched cookie + var newHeader = ""; + var i = 0; + var lastStart = 0; + //State 0: no information on next cookie + //State 1: cookie will be sent. + //State 2: cookie will not be sent. + var state = 0; + while (i < cookie.length) { + //Dual-keyed cookie + if(state == 0 && cookie.charAt(i) == '|'){ + //If referrers match, strip key and send cookie + var cookieReferrer = cookie.toString().substr(lastStart, i - lastStart); + if (referrer == cookieReferrer){ + lastStart = i+1; + state = 1; + } else { + state = 2; + } + } + //Single-keyed cookie that was set via scripting. + if (state == 0 && cookie.charAt(i) == '='){ + if(this.controller.getCookieJS()) state = 1; + else { + if (referrer == channel.getRequestHeader("Host")) state = 1; + else state = 2; + } + } + //End of a cookie + if (cookie.charAt(i) == ';') { + var thisCookie = cookie.toString().substr(lastStart, i - lastStart + 2); + if (state == 1){ + newHeader += thisCookie; + } + if (state == 2){ + SSC_dump("Declining to send " + thisCookie + + " for request by embedded domain " + channel.URI.host + + + " " + channel.getRequestHeader("Host") + + " on embedding page " + referrer); + } + lastStart = i+2; + state = 0; + } + //End of the string + if (i == cookie.length - 1){ + thisCookie = cookie.toString().substr(lastStart, i - lastStart + 1); + if (state == 1){ + newHeader += thisCookie; + } + if (state == 2){ + SSC_dump("Declining to send " + thisCookie + + " for request by embedded domain " + channel.URI.host + + + " " + channel.getRequestHeader("Host") + + " on embedding page " + referrer); + } + lastStart = i+1; + } + i++; + } + channel.setRequestHeader("Cookie", newHeader, false); + } + + }, + + onExamineResponse: function(channel) { + var setCookie; + try{ + setCookie = channel.getResponseHeader("Set-Cookie"); + } catch(e) {setCookie = null;} + + if(setCookie) { + var parent = null; + // XXX: need to use loadGroup here if null.. + if (channel.notificationCallbacks) { + var wind = channel.notificationCallbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent = wind.window.top.location; + } + + if (channel.documentURI && channel.documentURI == channel.URI) { + parent = null; // first party interaction + } + + var referrer; + // Same-origin policy + if (parent && parent.hostname != channel.URI.host) { + //SSC_dump("Segmenting " + channel.URI.host + + //" content loaded by " + parent.host); + referrer = parent.hostname; + } else { + referrer = channel.URI.host; + } + //Dual-key each cookie set in the header + var newHeader = ""; + var i = 0; + var lastStart = 0; + //Some messy code that prevents multiple embedding-domain keys + //from being concatenated to cookie names. + var passedname = false; + var namebar = false; + while (i < setCookie.length) { + if (setCookie.charAt(i) == '=') passedname = true; + else if (setCookie.charAt(i) == '|' && passedname == false) + namebar = true; + if (i == setCookie.length - 1 || setCookie.charAt(i) == '\n'){ + if(!namebar){ + newHeader += referrer + "|" + + setCookie.toString().substr(lastStart, i - lastStart + 1); + } + lastStart = i+1; + passedname = false; + namebar = false; + } + i++; + } + //SSC_dump("MODIFIED Set-Cookie: " + newHeader); + channel.setResponseHeader("Set-Cookie", newHeader, false); + } + }, + + // Read the integer data contained in a cache key + readCacheKey: function(channel) { + try { + return channel.cacheDomain; + } catch(e) { + channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); + return channel.cacheKey.data; + } + }, + + // Construct a new cache key with some integer data + newCacheKey: function(data) { + var cacheKey = + Components.classes["@mozilla.org/supports-PRUint32;1"] + .createInstance(Components.interfaces.nsISupportsPRUint32); + cacheKey.data = data; + return cacheKey; + }, + + strMD5: function(str) { + var converter = + Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. + createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + + // nsIURI.host is UTF-8 + converter.charset = "UTF-8"; + // result.value will contain the array length + var result = {}; + // data is an array of bytes + var data = converter.convertToByteArray(str, result); + var ch = Components.classes["@mozilla.org/security/hash;1"] + .createInstance(Components.interfaces.nsICryptoHash); + ch.init(ch.MD5); + ch.update(data, data.length); + return ch.finish(false); + }, + + // Get an integer hash of a string + getHash: function(str) { + var hash = this.strMD5(str); + var intHash = 0; + for(var i = 0; i < hash.length && i < 8; i++) + intHash += hash.charCodeAt(i) << (i << 3); + return intHash; + }, +} + +/** + * Master control object. Adds and removes the RequestListener + */ +function SSC_Controller() { + this.prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); + this.addListener(new SSC_RequestListener(this)); +} + +SSC_Controller.prototype = { + + getEnabled: function() { + return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); + }, + + getSafeCookieEnabled: function() { + return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); + }, + + getBlockThirdPartyCache: function() { + // Meh, no pref for now. Always allow. + return false; + }, + + getTorButton: function() { + return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); + }, + + getCookieJS: function() { + return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); + }, + + addListener: function(listener) { + this.listener = listener; + var observerService = + Components.classes["@mozilla.org/observer-service;1"] + .getService(Components.interfaces.nsIObserverService); + observerService.addObserver(listener, "http-on-modify-request", false); + // XXX: We need an observer to add this listener when the pref gets set + if (this.getSafeCookieEnabled()) { + observerService.addObserver(listener, "http-on-examine-response", false); + } + }, + + removeListener: function() { + var observerService = + Components.classes["@mozilla.org/observer-service;1"] + .getService(Components.interfaces.nsIObserverService); + observerService.removeObserver(this.listener, "http-on-modify-request"); + if (this.getSafeCookieEnabled()) { + observerService.removeObserver(this.listener, "http-on-examine-response"); + } + }, +} + +//////////////////////////////////////////////////////////////////////////// +// Global stuff +// "What script would be complete without a couple of globals?" --Fritz + +var SSC_controller; + +function SSC_startup() { + if(!SSC_controller) SSC_controller = new SSC_Controller(); + SSC_dump("Loaded controller"); +} diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 95624f0..00dc6f0 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -6,6 +6,10 @@ <overlay id="torbutton-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + +  + <script src="chrome://torbutton/content/stanford-safecache.js" /> + <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />

1 0

[torbutton/master] Revert "Bug 13751: Get rid of remaining SafeCache parts."
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit b426228c016a443cc5b2cc29b30f84efc4346ab1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 14:43:36 2014 +0000 Revert "Bug 13751: Get rid of remaining SafeCache parts." This reverts commit e2cce93493a857b062af83f5e8f9130fb76933a0. --- src/CHANGELOG | 3 --- src/chrome/content/torbutton.js | 6 ++++++ src/install.rdf | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1966ab7..4510b0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,6 +1,3 @@ -1.8.1.1 - * Bug 13751: Get rid of remaining SafeCache parts - 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8dba1fd..da39864 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2690,6 +2690,9 @@ function torbutton_do_main_window_startup() torbutton_unique_pref_observer.register(); + // Bug 1506: This is probably the most important observer in this function + // XXX: We should fold this into our code/move it to its own component + SSC_startup(); } // Bug 1506 P4: Most of this function is now useless, save @@ -2955,6 +2958,9 @@ function torbutton_close_window(event) { progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); + // XXX: We should fold this into our code.. + SSC_controller.removeListener(); + if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window diff --git a/src/install.rdf b/src/install.rdf index b39f0de..402b99c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.1</em:version> + <em:version>1.8.1.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] #13671: fix circuit display when bridges are used
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 35ea75545037574c568df386798efb6ea21790d5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 12 12:15:01 2014 -0800 #13671: fix circuit display when bridges are used --- src/chrome/content/tor-circuit-display.js | 142 ++++++++++++++++++---------- src/modules/tor-control-port.js | 146 +++++++++++++++++------------ 2 files changed, 178 insertions(+), 110 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 0817aa6..caf6886 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -27,6 +27,7 @@ let createTorCircuitDisplay = (function () { // Mozilla utilities const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/Task.jsm"); // Import the controller code. let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js"); @@ -39,51 +40,90 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] // A mutable map that stores the current nodes for each domain. let domainToNodeDataMap = {}, - // A mutable map that records what circuits are already known. - knownCircuitIDs = {}; + // A mutable map that reports `true` for IDs of "mature" circuits + // (those that have conveyed a stream).. + knownCircuitIDs = {}, + // A map from bridge fingerprint to its IP address. + bridgeIDtoIPmap = new Map(); // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; -// nodeDataForID(controller, id, onResult)__. -// Requests the IP, country code, and name of a node with given ID. -// Returns result via onResult. -// Example: nodeData(["20BC91DC525C3DC9974B29FBEAB51230DE024C44"], show); -let nodeDataForID = function (controller, ids, onResult) { - let idRequests = ids.map(id => "ns/id/" + id); - controller.getInfoMultiple(idRequests, function (statusMaps) { - let IPs = statusMaps.map(statusMap => statusMap.IP), - countryRequests = IPs.map(ip => "ip-to-country/" + ip); - controller.getInfoMultiple(countryRequests, function (countries) { - let results = []; - for (let i = 0; i < ids.length; ++i) { - results.push({ name : statusMaps[i].nickname, id : ids[i] , - ip : statusMaps[i].IP , country : countries[i] }); - } - onResult(results); - }); - }); +// __readBridgeIPs(controller)__. +// Gets a map from bridge ID to bridge IP, and stores it +// in `bridgeIDtoIPmap`. +let readBridgeIPs = function (controller) { + Task.spawn(function* () { + let configText = yield controller.getInfo("config-text"), + bridgeEntries = configText.Bridge; + if (bridgeEntries) { + bridgeEntries.map(entry => { + let IPplusPort, ID, + tokens = entry.split(/\s+/); + // First check if we have a "vanilla" bridge: + if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { + [IPplusPort, ID] = tokens; + // Several bridge types have a similar format: + } else if (["fte", "obfs3", "obfs4", "scramblesuit"] + .indexOf(tokens[0]) >= 0) { + [IPplusPort, ID] = tokens.slice(1); + } + // (For now, we aren't dealing with meek bridges and flashproxy.) + if (IPplusPort && ID) { + let IP = IPplusPort.split(":")[0]; + bridgeIDtoIPmap.set(ID.toUpperCase(), IP); + } + }); + } + }).then(null, Cu.reportError); }; -// __nodeDataForCircuit(controller, circuitEvent, onResult)__. +// nodeDataForID(controller, id)__. +// Returns the type, IP and country code of a node with given ID. +// Example: `nodeData(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` +// => `{ type : "default" , ip : "12.23.34.45" , countryCode : "fr" }` +let nodeDataForID = function* (controller, id) { + let result = {}; // ip, type, countryCode; + if (bridgeIDtoIPmap.has(id.toUpperCase())) { + result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); + result.type = "bridge"; + } else { + // Get the IP address for the given node ID. + try { + let statusMap = yield controller.getInfo("ns/id/" + id); + result.ip = statusMap.IP; + } catch (e) { } + result.type = "default"; + } + if (result.ip) { + // Get the country code for the node's IP address. + try { + result.countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + } catch (e) { } + } + return result; +}; + +// __nodeDataForCircuit(controller, circuitEvent)__. // Gets the information for a circuit. -let nodeDataForCircuit = function (controller, circuitEvent, onResult) { - let ids = circuitEvent.circuit.map(circ => circ[0]); - nodeDataForID(controller, ids, onResult); +let nodeDataForCircuit = function* (controller, circuitEvent) { + let rawIDs = circuitEvent.circuit.map(circ => circ[0]), + // Remove the leading '$' if present. + ids = rawIDs.map(id => id[0] === "$" ? id.substring(1) : id); + // Get the node data for all IDs in circuit. + return [for (id of ids) yield nodeDataForID(controller, id)]; }; -// __getCircuitStatusByID(aController, circuitID, onCircuitStatus)__ -// Returns the circuit status for the circuit with the given ID -// via onCircuitStatus(status). -let getCircuitStatusByID = function(aController, circuitID, onCircuitStatus) { - aController.getInfo("circuit-status", function (circuitStatuses) { - for (let circuitStatus of circuitStatuses) { - if (circuitStatus.id === circuitID) { - onCircuitStatus(circuitStatus); - } +// __getCircuitStatusByID(aController, circuitID)__ +// Returns the circuit status for the circuit with the given ID. +let getCircuitStatusByID = function* (aController, circuitID) { + let circuitStatuses = yield aController.getInfo("circuit-status"); + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + return circuitStatus; } - }); + } }; // __collectIsolationData(aController)__. @@ -95,20 +135,18 @@ let collectIsolationData = function (aController) { aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - function (streamEvent) { + streamEvent => Task.spawn(function* () { if (!knownCircuitIDs[streamEvent.CircuitID]) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; - getCircuitStatusByID(aController, streamEvent.CircuitID, function (circuitStatus) { - let domain = trimQuotes(circuitStatus.SOCKS_USERNAME); - if (domain) { - nodeDataForCircuit(aController, circuitStatus, function (nodeData) { - domainToNodeDataMap[domain] = nodeData; - }); - } - }); + let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), + domain = trimQuotes(circuitStatus.SOCKS_USERNAME); + if (domain) { + let nodeData = yield nodeDataForCircuit(aController, circuitStatus); + domainToNodeDataMap[domain] = nodeData; + } } - }); + }).then(null, Cu.reportError)); }; // ## User interface @@ -122,7 +160,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return ""; + if (typeof(countryCode) === "undefined") return undefined; try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { @@ -144,10 +182,13 @@ let showCircuitDisplay = function (show) { // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { let result = ["This browser"]; - for (let {ip, country} of nodeData) { - result.push(localizedCountryNameFromCode(country) + " (" + ip + ")"); + for (let {ip, countryCode, type} of nodeData) { + let bridge = type === "bridge"; + result.push((countryCode ? localizedCountryNameFromCode(countryCode) + : "Unknown country") + + " (" + (bridge ? "Bridge" : (ip || "IP unknown")) + ")"); } - result[4] = ("Internet"); + result[4] = "Internet"; return result; }; @@ -207,7 +248,9 @@ let syncDisplayWithSelectedTab = (function() { updateCircuitDisplay(); } else { // Stop syncing. - gBrowser.tabContainer.removeEventListener("TabSelect", listener1); + if (gBrowser.tabContainer) { + gBrowser.tabContainer.removeEventListener("TabSelect", listener1); + } gBrowser.removeTabsProgressListener(listener2); // Hide the display. showCircuitDisplay(false); @@ -269,6 +312,7 @@ let setupDisplay = function (host, port, password, enablePrefName) { logger.eclog(5, "Disabling tor display circuit because of an error."); stop(); }); + readBridgeIPs(myController); syncDisplayWithSelectedTab(true); collectIsolationData(myController); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index eae62f5..d356ebb 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -23,10 +23,16 @@ let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = Co // ### Import Mozilla Services Cu.import("resource://gre/modules/Services.jsm"); -// ## torbutton logger -let logger = Cc["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject, - log = x => logger.eclog(3, x); +// __log__. +// Logging function +let log; +if ((typeof console) !== "undefined") { + log = x => console.log(typeof(x) === "string" ? x : JSON.stringify(x)); +} else { + let logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject; + log = x => logger.eclog(3, x); +} // ### announce this file log("Loading tor-control-port.js\n"); @@ -58,8 +64,8 @@ io.asyncSocketStreams = function (host, port) { // asynchronously pumps incoming data to the onInputData callback. io.pumpInputStream = function (inputStream, onInputData, onError) { // Wrap raw inputStream with a "ScriptableInputStream" so we can read incoming data. - let ScriptableInputStream = CC("@mozilla.org/scriptableinputstream;1", - "nsIScriptableInputStream", "init"), + let ScriptableInputStream = Components.Constructor( + "@mozilla.org/scriptableinputstream;1", "nsIScriptableInputStream", "init"), scriptableInputStream = new ScriptableInputStream(inputStream), // A private method to read all data available on the input stream. readAll = function() { @@ -171,11 +177,12 @@ io.onLineFromOnMessage = function (onMessage) { }; // __io.callbackDispatcher()__. -// Returns [onString, dispatcher] where the latter is an object with two member functions: -// dispatcher.addCallback(regex, callback), and dispatcher.removeCallback(callback). -// Pass onString to another function that needs a callback with a single string argument. -// Whenever dispatcher.onString receives a string, the dispatcher will check for any -// regex matches and pass the string on to the corresponding callback(s). +// Returns dispatcher object with three member functions: +// dispatcher.addCallback(regex, callback), and dispatcher.removeCallback(callback), +// and dispatcher.pushMessage(message). +// Pass pushMessage to another function that needs a callback with a single string +// argument. Whenever dispatcher.pushMessage receives a string, the dispatcher will +// check for any regex matches and pass the string on to the corresponding callback(s). io.callbackDispatcher = function () { let callbackPairs = [], removeCallback = function (aCallback) { @@ -189,34 +196,38 @@ io.callbackDispatcher = function () { } return function () { removeCallback(callback); }; }, - onString = function (message) { + pushMessage = function (message) { for (let [regex, callback] of callbackPairs) { if (message.match(regex)) { callback(message); } } }; - return [onString, {addCallback : addCallback, removeCallback : removeCallback}]; + return { pushMessage : pushMessage, removeCallback : removeCallback, + addCallback : addCallback }; }; -// __io.matchRepliesToCommands(asyncSend)__. -// Takes asyncSend(message), an asynchronous send function, and returns two functions -// sendCommand(command, replyCallback) and onReply(response). If we call sendCommand, -// then when onReply is called, the corresponding replyCallback will be called. -io.matchRepliesToCommands = function (asyncSend) { +// __io.matchRepliesToCommands(asyncSend, dispatcher)__. +// Takes asyncSend(message), an asynchronous send function, and the callback +// displatcher, and returns a function Promise<response> sendCommand(command). +io.matchRepliesToCommands = function (asyncSend, dispatcher) { let commandQueue = [], - sendCommand = function (command, replyCallback) { - commandQueue.push([command, replyCallback]); + sendCommand = function (command, replyCallback, errorCallback) { + commandQueue.push([command, replyCallback, errorCallback]); asyncSend(command); - }, - onReply = function (reply) { - let [command, replyCallback] = commandQueue.shift(); - if (replyCallback) { replyCallback(reply); } - }, - onFailure = function () { - commandQueue.shift(); }; - return [sendCommand, onReply, onFailure]; + // Watch for responses (replies or error messages) + dispatcher.addCallback(/^[245]\d\d/, function (message) { + let [command, replyCallback, errorCallback] = commandQueue.shift(); + if (message.match(/^2/) && replyCallback) replyCallback(message); + if (message.match(/^[45]/) && errorCallback) { + errorCallback(new Error(command + " -> " + message)); + } + }); + // Create and return a version of sendCommand that returns a Promise. + return command => new Promise(function (replyCallback, errorCallback) { + sendCommand(command, replyCallback, errorCallback); + }); }; // __io.controlSocket(host, port, password, onError)__. @@ -228,7 +239,7 @@ io.matchRepliesToCommands = function (asyncSend) { // let socket = controlSocket("127.0.0.1", 9151, "MyPassw0rd", // function (error) { console.log(error.message || error); }); // // Send command and receive "250" reply or error message -// socket.sendCommand(commandText, replyCallback); +// socket.sendCommand(commandText, replyCallback, errorCallback); // // Register or deregister for "650" notifications // // that match regex // socket.addNotificationCallback(regex, callback); @@ -237,26 +248,20 @@ io.matchRepliesToCommands = function (asyncSend) { // socket.close(); io.controlSocket = function (host, port, password, onError) { // Produce a callback dispatcher for Tor messages. - let [onMessage, mainDispatcher] = io.callbackDispatcher(), + let mainDispatcher = io.callbackDispatcher(), // Open the socket and convert format to Tor messages. socket = io.asyncSocket(host, port, - io.onDataFromOnLine(io.onLineFromOnMessage(onMessage)), + io.onDataFromOnLine( + io.onLineFromOnMessage(mainDispatcher.pushMessage)), onError), // Tor expects any commands to be terminated by CRLF. writeLine = function (text) { socket.write(text + "\r\n"); }, - // Ensure we return the correct reply for each sendCommand. - [sendCommand, onReply, onFailure] = io.matchRepliesToCommands(writeLine), + // Create a sendCommand method from writeLine. + sendCommand = io.matchRepliesToCommands(writeLine, mainDispatcher), // Create a secondary callback dispatcher for Tor notification messages. - [onNotification, notificationDispatcher] = io.callbackDispatcher(); - // Pass successful reply back to sendCommand callback. - mainDispatcher.addCallback(/^2\d\d/, onReply); - // Pass error message to sendCommand callback. - mainDispatcher.addCallback(/^[45]\d\d/, function (message) { - onFailure(); - onError(new Error(message)); - }); + notificationDispatcher = io.callbackDispatcher(); // Pass asynchronous notifications to notification dispatcher. - mainDispatcher.addCallback(/^650/, onNotification); + mainDispatcher.addCallback(/^650/, notificationDispatcher.pushMessage); // Log in to control port. sendCommand("authenticate " + (password || "")); // Activate needed events. @@ -310,6 +315,16 @@ utils.splitLines = function (string) { return string.split(/\r?\n/); }; // inside pairs of quotation marks. utils.splitAtSpaces = utils.extractor(/((\S*?"(.*?)")+\S*|\S+)/g); +// __utils.splitAtFirst(string, regex)__. +// Splits a string at the first instance of regex match. If no match is +// found, returns the whole string. +utils.splitAtFirst = function (string, regex) { + let match = string.match(regex); + return match ? [ string.substring(0, match.index), + string.substring(match.index + match[0].length) ] + : string; +}; + // __utils.splitAtEquals(string)__. // Splits a string into chunks between equals. Does not split at equals // inside pairs of quotation marks. @@ -321,7 +336,7 @@ utils.splitAtEquals = utils.extractor(/(([^=]*?"(.*?)")+[^=]*|[^=]+)/g); utils.mergeObjects = function (arrayOfObjects) { let result = {}; for (let obj of arrayOfObjects) { - for (var key in obj) { + for (let key in obj) { result[key] = obj[key]; } } @@ -433,6 +448,20 @@ info.streamStatusParser = function (text) { "CircuitID", "Target"]); }; +// __info.configTextParser(text)__. +// Parse the output of a `getinfo config-text`. +info.configTextParser = function(text) { + let result = {}; + utils.splitLines(text).map(function(line) { + let [name, value] = utils.splitAtFirst(line, /\s/); + if (name) { + if (!result.hasOwnProperty(name)) result[name] = []; + result[name].push(value); + } + }); + return result; +}; + // __info.parsers__. // A map of GETINFO keys to parsing function, which convert result strings to JavaScript // data. @@ -440,7 +469,7 @@ info.parsers = { "version" : utils.identity, "config-file" : utils.identity, "config-defaults-file" : utils.identity, - "config-text" : utils.identity, + "config-text" : info.configTextParser, "ns/id/" : info.routerStatusParser, "ns/name/" : info.routerStatusParser, "ip-to-country/" : utils.identity, @@ -471,10 +500,9 @@ info.stringToValue = function (string) { return info.getParser(key)(valueString); }; -// __info.getInfoMultiple(aControlSocket, keys, onData)__. -// Sends GETINFO for an array of keys. Passes onData an array of their respective results, -// in order. -info.getInfoMultiple = function (aControlSocket, keys, onData) { +// __info.getInfoMultiple(aControlSocket, keys)__. +// Sends GETINFO for an array of keys. Returns a promise with an array of results. +info.getInfoMultiple = function (aControlSocket, keys) { /* if (!(keys instanceof Array)) { throw new Error("keys argument should be an array"); @@ -490,14 +518,14 @@ info.getInfoMultiple = function (aControlSocket, keys, onData) { throw new Error("unsupported key"); } */ - aControlSocket.sendCommand("getinfo " + keys.join(" "), function (message) { - onData(info.keyValueStringsFromMessage(message).map(info.stringToValue)); - }); + return aControlSocket.sendCommand("getinfo " + keys.join(" ")) + .then(message => info.keyValueStringsFromMessage(message) + .map(info.stringToValue)); }; -// __info.getInfo(controlSocket, key, onValue)__. -// Sends GETINFO for a single key. Passes onValue the value for that key. -info.getInfo = function (aControlSocket, key, onValue) { +// __info.getInfo(controlSocket, key)__. +// Sends GETINFO for a single key. Returns a promise with the result. +info.getInfo = function (aControlSocket, key) { /* if (!utils.isString(key)) { throw new Error("key argument should be a string"); @@ -506,9 +534,7 @@ info.getInfo = function (aControlSocket, key, onValue) { throw new Error("onValue argument should be a function"); } */ - info.getInfoMultiple(aControlSocket, [key], function (data) { - onValue(data[0]); - }); + return info.getInfoMultiple(aControlSocket, [key]).then(data => data[0]); }; // ## event @@ -559,10 +585,8 @@ tor.controllerCache = {}; tor.controller = function (host, port, password, onError) { let socket = io.controlSocket(host, port, password, onError), isOpen = true; - return { getInfo : function (key, log) { info.getInfo(socket, key, log); } , - getInfoMultiple : function (keys, log) { - info.getInfoMultiple(socket, keys, log); - }, + return { getInfo : key => info.getInfo(socket, key), + getInfoMultiple : keys => info.getInfoMultiple(socket, keys), watchEvent : function (type, filter, onData) { event.watchEvent(socket, type, filter, onData); },

1 0

[torbutton/master] Bug #13672. bind tor circuit display to a pref
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit bdc987b01c977c177d567eb850ce4c98d02e3538 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 5 23:21:59 2014 -0800 Bug #13672. bind tor circuit display to a pref --- src/chrome/content/tor-circuit-display.js | 256 +++++++++++++++++++---------- src/chrome/content/torbutton.js | 3 +- src/defaults/preferences/preferences.js | 1 + src/modules/tor-control-port.js | 33 ++-- 4 files changed, 188 insertions(+), 105 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 49cd832..0817aa6 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -15,9 +15,12 @@ /* global document, gBrowser, Components */ // ### Main function -// __runTorCircuitDisplay(host, port, password)__. -// The single function we run to activate automatic display of the Tor circuit.. -let runTorCircuitDisplay = (function () { +// __createTorCircuitDisplay(host, port, password, enablePrefName)__. +// The single function that prepares tor circuit display. Connects to a tor +// control port with the given host, port, and password, and binds to +// a named bool pref whose value determines whether the circuit display +// is enabled or disabled. +let createTorCircuitDisplay = (function () { "use strict"; @@ -32,28 +35,12 @@ let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; -// __regionBundle__. -// A list of localized region (country) names. -let regionBundle = Services.strings.createBundle( - "chrome://global/locale/regionNames.properties"); - -// __localizedCountryNameFromCode(countryCode)__. -// Convert a country code to a localized country name. -// Example: `'de'` -> `'Deutschland'` in German locale. -let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return ""; - try { - return regionBundle.GetStringFromName(countryCode.toLowerCase()); - } catch (e) { - return countryCode.toUpperCase(); - } -}; +// ## Circuit/stream domain and node monitoring -// __domainToNodeDataMap__. // A mutable map that stores the current nodes for each domain. -let domainToNodeDataMap = {}; - -let knownCircuitIDs = {}; +let domainToNodeDataMap = {}, + // A mutable map that records what circuits are already known. + knownCircuitIDs = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. @@ -86,6 +73,70 @@ let nodeDataForCircuit = function (controller, circuitEvent, onResult) { nodeDataForID(controller, ids, onResult); }; +// __getCircuitStatusByID(aController, circuitID, onCircuitStatus)__ +// Returns the circuit status for the circuit with the given ID +// via onCircuitStatus(status). +let getCircuitStatusByID = function(aController, circuitID, onCircuitStatus) { + aController.getInfo("circuit-status", function (circuitStatuses) { + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + onCircuitStatus(circuitStatus); + } + } + }); +}; + +// __collectIsolationData(aController)__. +// Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then +// we assume isolation settings (SOCKS username+password) are now fixed for the +// corresponding circuit. Whenever the first stream on a new circuit is seen, +// looks up u+p and records the node data in the domainToNodeDataMap. +let collectIsolationData = function (aController) { + aController.watchEvent( + "STREAM", + streamEvent => streamEvent.StreamStatus === "SENTCONNECT", + function (streamEvent) { + if (!knownCircuitIDs[streamEvent.CircuitID]) { + logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); + knownCircuitIDs[streamEvent.CircuitID] = true; + getCircuitStatusByID(aController, streamEvent.CircuitID, function (circuitStatus) { + let domain = trimQuotes(circuitStatus.SOCKS_USERNAME); + if (domain) { + nodeDataForCircuit(aController, circuitStatus, function (nodeData) { + domainToNodeDataMap[domain] = nodeData; + }); + } + }); + } + }); +}; + +// ## User interface + +// __regionBundle__. +// A list of localized region (country) names. +let regionBundle = Services.strings.createBundle( + "chrome://global/locale/regionNames.properties"); + +// __localizedCountryNameFromCode(countryCode)__. +// Convert a country code to a localized country name. +// Example: `'de'` -> `'Deutschland'` in German locale. +let localizedCountryNameFromCode = function (countryCode) { + if (typeof(countryCode) === "undefined") return ""; + try { + return regionBundle.GetStringFromName(countryCode.toLowerCase()); + } catch (e) { + return countryCode.toUpperCase(); + } +}; + +// __showCircuitDisplay(show)__. +// If show === true, makes the circuit display visible. +let showCircuitDisplay = function (show) { + document.querySelector("svg#tor-circuit").style.display = show ? + 'block' : 'none'; +}; + // __nodeLines(nodeData)__. // Takes a nodeData array of three items each like // `{ ip : "12.34.56.78", country : "fr" }` @@ -121,7 +172,6 @@ let updateCircuitDisplay = function () { document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), - //diagramCircles = document.querySelectorAll("svg#tor-circuit .node-circule"), lines = nodeLines(nodeData); for (let i = 0; i < diagramNodes.length; ++i) { let line = lines[i]; @@ -130,85 +180,109 @@ let updateCircuitDisplay = function () { } } // Only show the Tor circuit if we have a domain and node data. - document.querySelector("svg#tor-circuit").style.display = (domain && nodeData) ? - 'block' : 'none'; + showCircuitDisplay(domain && nodeData); } }; -// __getCircuitStatusByID(aController, circuitID, onCircuitStatus)__ -// Returns the circuit status for the circuit with the given ID -// via onCircuitStatus(status). -let getCircuitStatusByID = function(aController, circuitID, onCircuitStatus) { - aController.getInfo("circuit-status", function (circuitStatuses) { - for (let circuitStatus of circuitStatuses) { - if (circuitStatus.id === circuitID) { - onCircuitStatus(circuitStatus); - } - } - }); -}; - -// __collectIsolationData(aController)__. -// Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then -// the isolation settings (SOCKS username+password) become fixed for the -// corresponding circuit. Whenever the first stream on a new circuit is seen, -// looks up u+p and records the node data in the domainToNodeDataMap. -let collectIsolationData = function (aController) { - aController.watchEvent( - "STREAM", - streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - function (streamEvent) { - if (!knownCircuitIDs[streamEvent.CircuitID]) { - logger.eclog(4, "streamEvent.CircuitID: " + streamEvent.CircuitID); - knownCircuitIDs[streamEvent.CircuitID] = true; - getCircuitStatusByID(aController, streamEvent.CircuitID, function (circuitStatus) { - let domain = trimQuotes(circuitStatus.SOCKS_USERNAME); - if (domain) { - nodeDataForCircuit(aController, circuitStatus, function (nodeData) { - domainToNodeDataMap[domain] = nodeData; - updateCircuitDisplay(); - }); - } else { - updateCircuitDisplay(); - } - }); - } - }); -}; - -// __syncDisplayWithSelectedTab()__. +// __syncDisplayWithSelectedTab(syncOn)__. // We may have multiple tabs, but there is only one instance of TorButton's popup // panel for displaying the Tor circuit UI. Therefore we need to update the display // to show the currently selected tab at its current location. -let syncDisplayWithSelectedTab = function () { - // Whenever a different tab is selected, change the circuit display - // to show the circuit for that tab's domain. - gBrowser.tabContainer.addEventListener("TabSelect", function (event) { - updateCircuitDisplay(); - }); - // If the currently selected tab has been sent to a new location, - // update the circuit to reflect that. - gBrowser.addTabsProgressListener({ onLocationChange : function (aBrowser) { - if (aBrowser == gBrowser.selectedBrowser) { +let syncDisplayWithSelectedTab = (function() { + let listener1 = event => { updateCircuitDisplay(); }, + listener2 = { onLocationChange : function (aBrowser) { + if (aBrowser === gBrowser.selectedBrowser) { + updateCircuitDisplay(); + } + } }; + return function (syncOn) { + if (syncOn) { + // Whenever a different tab is selected, change the circuit display + // to show the circuit for that tab's domain. + gBrowser.tabContainer.addEventListener("TabSelect", listener1); + // If the currently selected tab has been sent to a new location, + // update the circuit to reflect that. + gBrowser.addTabsProgressListener(listener2); + // Get started with a correct display. updateCircuitDisplay(); + } else { + // Stop syncing. + gBrowser.tabContainer.removeEventListener("TabSelect", listener1); + gBrowser.removeTabsProgressListener(listener2); + // Hide the display. + showCircuitDisplay(false); } - } }); + }; +})(); + +// ## Pref utils - // Get started with a correct display. - updateCircuitDisplay(); +// __prefs__. A shortcut to Mozilla Services.prefs. +let prefs = Services.prefs; + +// __getPrefValue(prefName)__ +// Returns the current value of a preference, regardless of its type. +let getPrefValue = function (prefName) { + switch(prefs.getPrefType(prefName)) { + case prefs.PREF_BOOL: return prefs.getBoolPref(prefName); + case prefs.PREF_INT: return prefs.getIntPref(prefName); + case prefs.PREF_STRING: return prefs.getCharPref(prefName); + default: return null; + } }; -// __display(host, port, password)__. -// The main function for activating automatic display of the Tor circuit. -// A reference to this function (called runTorCircuitDisplay) is exported as a global. -let display = function (host, port, password) { - let myController = controller(host, port || 9151, password, function (x) { logger.eclog(5, x); }); - syncDisplayWithSelectedTab(); - collectIsolationData(myController); +// __bindPrefAndInit(prefName, prefHandler)__ +// Applies prefHandler to the current value of pref specified by prefName. +// Re-applies prefHandler whenever the value of the pref changes. +// Returns a zero-arg function that unbinds the pref. +let bindPrefAndInit = function (prefName, prefHandler) { + let update = () => { prefHandler(getPrefValue(prefName)); }, + observer = { observe : function (subject, topic, data) { + if (data === prefName) { + update(); + } + } }; + prefs.addObserver(prefName, observer, false); + update(); + return () => { prefs.removeObserver(prefName, observer); }; }; -return display; +// ## Main function -// Finish runTorCircuitDisplay() -})(); +// setupDisplay(host, port, password, enablePrefName)__. +// Returns a function that lets you start/stop automatic display of the Tor circuit. +// A reference to this function (called createTorCircuitDisplay) is exported as a global. +let setupDisplay = function (host, port, password, enablePrefName) { + let myController = null, + stop = function() { + if (myController) { + syncDisplayWithSelectedTab(false); + myController.close(); + myController = null; + } + }, + start = function () { + if (!myController) { + myController = controller(host, port || 9151, password, function (err) { + // An error has occurred. + logger.eclog(5, err); + logger.eclog(5, "Disabling tor display circuit because of an error."); + stop(); + }); + syncDisplayWithSelectedTab(true); + collectIsolationData(myController); + } + }; + try { + let unbindPref = bindPrefAndInit(enablePrefName, on => { if (on) start(); else stop(); }); + // When this chrome window is unloaded, we need to unbind the pref. + window.addEventListener("unload", unbindPref); + } catch (e) { + logger.eclog(5, "Error: " + e.message + "\n" + e.stack); + } +}; + +return setupDisplay; +// Finish createTorCircuitDisplay() +})(); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2e921da..8dba1fd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -619,7 +619,8 @@ function torbutton_init() { torbutton_update_statusbar(mode); torbutton_notify_if_update_needed(); - runTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass); + createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, + "extensions.torbutton.display_circuit"); torbutton_log(3, 'init completed'); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index d527d7e..3e02b77 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -4,6 +4,7 @@ pref("extensions.torbutton.loglevel",4); pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglog // Display prefs +pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton.display_panel",true); pref("extensions.torbutton.panel_style",'text'); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index ada80b5..eae62f5 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -156,15 +156,16 @@ io.onLineFromOnMessage = function (onMessage) { // Add to the list of pending lines. pendingLines.push(line); // If line is the last in a message, then pass on the full multiline message. - if (line.match(/^\d\d\d /) && (pendingLines.length == 1 || - pendingLines[0].startsWith(line.substring(0,3)))) { + if (line.match(/^\d\d\d /) && + (pendingLines.length === 1 || + pendingLines[0].substring(0,3) === line.substring(0,3))) { // Combine pending lines to form message. let message = pendingLines.join("\r\n"); + log("controlPort >> " + message); // Wipe pendingLines before we call onMessage, in case onMessage throws an error. pendingLines = []; // Pass multiline message to onMessage. onMessage(message); - log("controlPort >> " + message); } }; }; @@ -547,11 +548,17 @@ event.watchEvent = function (controlSocket, type, filter, onData) { // Things related to the main controller. let tor = tor || {}; +// __tor.controllerCache__. +// A map from "host:port" to controller objects. Prevents redundant instantiation +// of control sockets. +tor.controllerCache = {}; + // __tor.controller(host, port, password, onError)__. // Creates a tor controller at the given host and port, with the given password. // onError returns asynchronously whenever a connection error occurs. tor.controller = function (host, port, password, onError) { - let socket = io.controlSocket(host, port, password, onError); + let socket = io.controlSocket(host, port, password, onError), + isOpen = true; return { getInfo : function (key, log) { info.getInfo(socket, key, log); } , getInfoMultiple : function (keys, log) { info.getInfoMultiple(socket, keys, log); @@ -559,14 +566,11 @@ tor.controller = function (host, port, password, onError) { watchEvent : function (type, filter, onData) { event.watchEvent(socket, type, filter, onData); }, - close : socket.close }; + isOpen : () => isOpen, + close : () => { isOpen = false; socket.close(); } + }; }; -// __tor.controllerCache__. -// A map from "host:port" to controller objects. Prevents redundant instantiation -// of control sockets. -tor.controllerCache = {}; - // ## Export // __controller(host, port, password, onError)__. @@ -584,9 +588,12 @@ tor.controllerCache = {}; // // Close the controller permanently // c.close(); let controller = function (host, port, password, onError) { - let dest = host + ":" + port; - return (tor.controllerCache[dest] = tor.controllerCache[dest] || - tor.controller(host, port, password, onError)); + let dest = host + ":" + port, + maybeController = tor.controllerCache[dest]; + return (tor.controllerCache[dest] = + (maybeController && maybeController.isOpen()) ? + maybeController : + tor.controller(host, port, password, onError)); }; // Export the controller function for external use.

1 0

[tor-browser-bundle/master] Bump lang pack version, too.
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit ad84f4205a95dfdbf72a9949014c469c3316f72c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 13:29:02 2014 +0000 Bump lang pack version, too. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1b6aff4..2ba0141 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -37,7 +37,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5

1 0