February 2015 - tor-commits - lists.torproject.org

[guardfraction/master] Fix an error message.
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit f69c4d4b86ce70daffe8042a18ff8a46b8af8790 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 16:55:49 2015 +0100 Fix an error message. --- guardfraction_cron.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index a5d5f75..e52da5e 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -26,7 +26,7 @@ GUARDFRACTION_OUTPUT_FILE="$STATE_DIR/guardfraction.output" # Use flock to avoid parallel runs of the script exec 9< "$STATE_DIR" if ! flock -n -e 9; then - echo >&2 "LOCK-ERROR" + echo >&2 "Could not acquire lock on $STATE_DIR." exit 1 fi

1 0

[guardfraction/master] Make things configurable in a config file
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit bc15be307b9fa06880feb42a1176a607ed4dfba5 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 17:01:26 2015 +0100 Make things configurable in a config file --- guardfraction_cron.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index cd6debc..60d0f01 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -17,15 +17,19 @@ STATE_DIR="$GUARDFRACTION_SRC/var" WGET_PREFIX="" #WGET_PREFIX="torify" CONSENSUS_SOURCE="http://128.31.0.39:9131/tor/status-vote/current/consensus" - DAYS_WORTH=90 +GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output +VERBOSE=0 + +# You can override any of the above variables in ~/.guardfraction.conf +[ -e ~/.guardfraction.conf ] && . ~/.guardfraction.conf if ! [ -d "$STATE_DIR" ]; then mkdir "$STATE_DIR" fi # Where the guardfraction output file should be placed. -GUARDFRACTION_OUTPUT_FILE="$STATE_DIR/guardfraction.output" +GUARDFRACTION_OUTPUT_FILE="${GUARDFRACTION_OUTPUT_FILE:$STATE_DIR/guardfraction.output}" # Use flock to avoid parallel runs of the script exec 9< "$STATE_DIR"

1 0

[guardfraction/master] Move torification and consensus url into variables
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit 6bf1d0349a67617109398a2ef69528fa248c5598 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 16:59:05 2015 +0100 Move torification and consensus url into variables --- guardfraction_cron.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index 654debd..cd6debc 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -14,6 +14,9 @@ set -e GUARDFRACTION_SRC=$(dirname "$0") GUARDFRACTION_SRC=$(readlink -f "$GUARDFRACTION_SRC") STATE_DIR="$GUARDFRACTION_SRC/var" +WGET_PREFIX="" +#WGET_PREFIX="torify" +CONSENSUS_SOURCE="http://128.31.0.39:9131/tor/status-vote/current/consensus" DAYS_WORTH=90 @@ -35,7 +38,7 @@ tmpdir=`mktemp -d "/tmp/guardfraction-XXXXXX"` trap "rm -rf '$tmpdir'" EXIT # Download latest consensus. -if ! torify wget -q http://128.31.0.39:9131/tor/status-vote/current/consensus -O "$tmpdir/consensus" +if ! $WGET_PREFIX wget -q "$CONSENSUS_SOURCE" -O "$tmpdir/consensus" then echo >&2 "Failed while getting newest consensus." exit 1

1 0

[guardfraction/master] Run with set -e
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit af8b20c4903b72042006ce0bb2f8e8d430961735 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 16:56:59 2015 +0100 Run with set -e --- guardfraction_cron.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index e52da5e..654debd 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -1,6 +1,7 @@ #!/bin/bash set -u +set -e # This script is run every hour. It gets the latest consensus, imports # it to the database and outputs a guardfraction output file. @@ -34,10 +35,7 @@ tmpdir=`mktemp -d "/tmp/guardfraction-XXXXXX"` trap "rm -rf '$tmpdir'" EXIT # Download latest consensus. -torify wget -q http://128.31.0.39:9131/tor/status-vote/current/consensus -O "$tmpdir/consensus" - -# Bail on error -if [ "$?" != 0 ] +if ! torify wget -q http://128.31.0.39:9131/tor/status-vote/current/consensus -O "$tmpdir/consensus" then echo >&2 "Failed while getting newest consensus." exit 1 @@ -49,10 +47,7 @@ cd "$GUARDFRACTION_SRC" # Import latest consensus to our database. # (suppress any output because of cron job) -python databaser.py --db-file="$STATE_DIR/guardfraction.db" "$tmpdir" - -# Bail on error -if [ "$?" != 0 ] +if ! python databaser.py --db-file="$STATE_DIR/guardfraction.db" "$tmpdir" then echo >&2 "Failed during database import." exit 1 @@ -61,10 +56,7 @@ fi # echo "[*] Imported!" # Calculate guardfraction -python guardfraction.py --db-file="$STATE_DIR/guardfraction.db" --output="$GUARDFRACTION_OUTPUT_FILE" "$DAYS_WORTH" - -# Bail on error -if [ "$?" != 0 ] +if ! python guardfraction.py --db-file="$STATE_DIR/guardfraction.db" --output="$GUARDFRACTION_OUTPUT_FILE" "$DAYS_WORTH" then echo >&2 "Failed during guardfraction calculation." exit 1

1 0

[guardfraction/master] Enable debugging output when run with VERBOSE=1
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit 513465301dc2f076a206f04d512fcab32ff125e3 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 17:01:41 2015 +0100 Enable debugging output when run with VERBOSE=1 --- guardfraction_cron.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index 60d0f01..c7c72dd 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -19,7 +19,7 @@ WGET_PREFIX="" CONSENSUS_SOURCE="http://128.31.0.39:9131/tor/status-vote/current/consensus" DAYS_WORTH=90 GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output -VERBOSE=0 +VERBOSE=${VERBOSE:0} # You can override any of the above variables in ~/.guardfraction.conf [ -e ~/.guardfraction.conf ] && . ~/.guardfraction.conf @@ -48,7 +48,7 @@ then exit 1 fi -# echo "[*] Downloaded latest consensus" +[ "$VERBOSE" -gt 0 ] && echo "[*] Downloaded latest consensus" cd "$GUARDFRACTION_SRC" @@ -60,7 +60,7 @@ then exit 1 fi -# echo "[*] Imported!" +[ "$VERBOSE" -gt 0 ] && echo "[*] Imported!" # Calculate guardfraction if ! python guardfraction.py --db-file="$STATE_DIR/guardfraction.db" --output="$GUARDFRACTION_OUTPUT_FILE" "$DAYS_WORTH" @@ -69,5 +69,4 @@ then exit 1 fi -# echo "[*] Done!" - +[ "$VERBOSE" -gt 0 ] && echo "[*] Done!"

1 0

[guardfraction/master] variable shuffling
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit 78192868b37958b8e7e6070cf78d2b402fd5e577 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 17:05:40 2015 +0100 variable shuffling --- guardfraction_cron.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index c7c72dd..d1539cf 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -13,24 +13,27 @@ set -e GUARDFRACTION_SRC=$(dirname "$0") GUARDFRACTION_SRC=$(readlink -f "$GUARDFRACTION_SRC") -STATE_DIR="$GUARDFRACTION_SRC/var" -WGET_PREFIX="" -#WGET_PREFIX="torify" +STATE_DIR="" # defaults to $GUARDFRACTION_SRC/var +GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output + +WGET_PREFIX="" # one option might be "torify" CONSENSUS_SOURCE="http://128.31.0.39:9131/tor/status-vote/current/consensus" + DAYS_WORTH=90 -GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output -VERBOSE=${VERBOSE:0} + +VERBOSE=${VERBOSE:-0} # You can override any of the above variables in ~/.guardfraction.conf [ -e ~/.guardfraction.conf ] && . ~/.guardfraction.conf +[ "$VERBOSE" -gt 1 ] && set -x + +STATE_DIR="${STATE_DIR:-$GUARDFRACTION_SRC/var}" +GUARDFRACTION_OUTPUT_FILE="${GUARDFRACTION_OUTPUT_FILE:-$STATE_DIR/guardfraction.output}" if ! [ -d "$STATE_DIR" ]; then mkdir "$STATE_DIR" fi -# Where the guardfraction output file should be placed. -GUARDFRACTION_OUTPUT_FILE="${GUARDFRACTION_OUTPUT_FILE:$STATE_DIR/guardfraction.output}" - # Use flock to avoid parallel runs of the script exec 9< "$STATE_DIR" if ! flock -n -e 9; then

1 0

[guardfraction/master] Clean up comments
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit 94f50d6f9194d3c0dd4d3118471ba1f14db3ea61 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Feb 4 17:16:06 2015 +0100 Clean up comments --- guardfraction_cron.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index d1539cf..cba8552 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -5,11 +5,8 @@ set -e # This script is run every hour. It gets the latest consensus, imports # it to the database and outputs a guardfraction output file. -# Please edit the definitions below to your liking: -# Where the consensuses and data are going to be stored - -################################# +################################################################## GUARDFRACTION_SRC=$(dirname "$0") GUARDFRACTION_SRC=$(readlink -f "$GUARDFRACTION_SRC") @@ -25,6 +22,9 @@ VERBOSE=${VERBOSE:-0} # You can override any of the above variables in ~/.guardfraction.conf [ -e ~/.guardfraction.conf ] && . ~/.guardfraction.conf + +################################################################## + [ "$VERBOSE" -gt 1 ] && set -x STATE_DIR="${STATE_DIR:-$GUARDFRACTION_SRC/var}"

1 0

[guardfraction/master] Use guardfraction.conf for CONSENSUS_SOURCE too.
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit 48a7bc02896131e39d30fa65f02d5fceec64cfd9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 24 12:22:48 2015 +0000 Use guardfraction.conf for CONSENSUS_SOURCE too. Patch by weasel. --- guardfraction_cron.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index cba8552..08e0d70 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -14,7 +14,7 @@ STATE_DIR="" # defaults to $GUARDFRACTION_SRC/var GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output WGET_PREFIX="" # one option might be "torify" -CONSENSUS_SOURCE="http://128.31.0.39:9131/tor/status-vote/current/consensus" +CONSENSUS_SOURCE="" DAYS_WORTH=90 @@ -25,6 +25,12 @@ VERBOSE=${VERBOSE:-0} ################################################################## +if [ -z "$CONSENSUS_SOURCE" ]; then + echo >&2 "No CONSENSUS_SOURCE set. Please set CONSENSUS_SOURCE in ~/.guardfraction.conf." + echo >&2 " e.g. CONSENSUS_SOURCE=http://128.31.0.39:9131/tor/status-vote/current/consensus" + exit 1 +fi + [ "$VERBOSE" -gt 1 ] && set -x STATE_DIR="${STATE_DIR:-$GUARDFRACTION_SRC/var}"

1 0

[guardfraction/master] Add some documentation for the configuration variables.
by asn＠torproject.org 24 Feb '15

24 Feb '15

commit eacb5bfc44751c777c68dbba841d4bc5f59765e9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 24 13:36:21 2015 +0000 Add some documentation for the configuration variables. --- guardfraction_cron.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh index 08e0d70..8ca1d78 100755 --- a/guardfraction_cron.sh +++ b/guardfraction_cron.sh @@ -8,23 +8,40 @@ set -e ################################################################## +# Source directory of this script GUARDFRACTION_SRC=$(dirname "$0") GUARDFRACTION_SRC=$(readlink -f "$GUARDFRACTION_SRC") -STATE_DIR="" # defaults to $GUARDFRACTION_SRC/var -GUARDFRACTION_OUTPUT_FILE="" # defaults to :$STATE_DIR/guardfraction.output + +# Directory where the database and output of this script will be saved +# on. Make sure you have write access to it. Defaults to $GUARDFRACTION_SRC/var . +STATE_DIR="" + +# Filename of the output file. This is the file that Tor should read. +# Defaults to: $STATE_DIR/guardfraction.output +GUARDFRACTION_OUTPUT_FILE="" WGET_PREFIX="" # one option might be "torify" + +# Where to fetch the consensus from. This should be set in the +# configuration file. Please set it to something like: +# CONSENSUS_SOURCE=http://128.31.0.39:9131/tor/status-vote/current/consensus CONSENSUS_SOURCE="" +# How many days of consensuses should we consider? This should be +# equal to the guard lifetime period. Leave it as is for now. DAYS_WORTH=90 +# Set to 1 if you want verbose output. VERBOSE=${VERBOSE:-0} -# You can override any of the above variables in ~/.guardfraction.conf +# Please override CONSENSUS_SOURCE and any other of the above +# variables in ~/.guardfraction.conf . [ -e ~/.guardfraction.conf ] && . ~/.guardfraction.conf ################################################################## +[ "$VERBOSE" -gt 0 ] && echo "[*] Starting up" + if [ -z "$CONSENSUS_SOURCE" ]; then echo >&2 "No CONSENSUS_SOURCE set. Please set CONSENSUS_SOURCE in ~/.guardfraction.conf." echo >&2 " e.g. CONSENSUS_SOURCE=http://128.31.0.39:9131/tor/status-vote/current/consensus" @@ -50,6 +67,8 @@ fi tmpdir=`mktemp -d "/tmp/guardfraction-XXXXXX"` trap "rm -rf '$tmpdir'" EXIT +[ "$VERBOSE" -gt 0 ] && echo "[*] About to download consensus" + # Download latest consensus. if ! $WGET_PREFIX wget -q "$CONSENSUS_SOURCE" -O "$tmpdir/consensus" then

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Feb '15

24 Feb '15

commit e4453af78fd91f23146497071dca2ab1f3f6246d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 24 13:16:11 2015 +0000 Update translations for torbutton-torbuttonproperties --- nb/torbutton.properties | 2 +- pt_BR/torbutton.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/torbutton.properties b/nb/torbutton.properties index 1a7cf26..461c2a9 100644 --- a/nb/torbutton.properties +++ b/nb/torbutton.properties @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = Viktig Torbutton informasjon!\n\nTorbutton er torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade personvernet og anonymiteten din.\n\nDe kan også omgå Tor og dermed avsløre din nåværende plassering og IP-adresse.\n\nEr du sikker på at du vil aktivere nettlesertillegg?\n\n torbutton.popup.never_ask_again = Ikke spør meg igjen -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = TOR nettleseren vil stenge alle vinduer og faner. Alle nettstedssesjoner vil gå tapt.\n\n\nRestart TOR nettleseren nå for å resette din identitet?\n\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Denne nettsiden (%S) prøvde å pakke ut HTML5-canvas billeddata, hvilket kan brukes til å tilkjennegi din datamaskin spesifikt i identifiseringsøyemed.\n\nSkal Tor-nettleseren tillate denne nettsiden å pakke ut HTML5-canvas billeddata? diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties index de4b14c..fa266d6 100644 --- a/pt_BR/torbutton.properties +++ b/pt_BR/torbutton.properties @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO To torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nPode ser ainda que eles ignorem o Tor e revelem a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n torbutton.popup.never_ask_again = Não me pergunte novamente -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocê deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML555?

1 0