November 2011 - tor-commits - lists.torproject.org

[flashproxy/master] Add switching-all.sh.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 3160def02d3175158064c98c175a5af2ec1f14c7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:41:33 2011 -0700 Add switching-all.sh. This automatically runs all the switching experiments multiple times. --- experiments/common.sh | 11 ++++++++++ experiments/switching/switching-all.sh | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index f788235..dcafd84 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -45,3 +45,14 @@ real_time() { # original stderr (fd 2) output of time. (time -p eval "$@" 2>&3) |& tail -n 3 | head -n 1 | awk '{print $2}' } + +# Repeat a subcommand N times. +repeat() { + local N + N="$1" + shift + while [ $N -gt 0 ]; do + eval "$@" + N=$((N-1)) + done +} diff --git a/experiments/switching/switching-all.sh b/experiments/switching/switching-all.sh new file mode 100755 index 0000000..b3051cc --- /dev/null +++ b/experiments/switching/switching-all.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Usage: ./switching-all.sh [-n NUM_ITERATIONS] +# +# Runs the switching experiment scripts several times and stores the results in +# log files +# local-http-constant-DATE.log +# local-http-alternating-DATE.log +# remote-tor-constant-DATE.log +# remote-tor-alternating-DATE.log +# where DATE is the current date. + +. ../common.sh + +NUM_ITERATIONS=1 + +while getopts "n:" OPTNAME; do + if [ "$OPTNAME" == n ]; then + NUM_ITERATIONS="$OPTARG" + fi +done + +DATE="$(date --iso)" + +> "local-http-constant-$DATE.log" +repeat $NUM_ITERATIONS ./local-http-constant.sh "local-http-constant-$DATE.log" + +> "local-http-alternating-$DATE.log" +repeat $NUM_ITERATIONS ./local-http-alternating.sh "local-http-alternating-$DATE.log" + +> "remote-tor-constant-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-constant.sh "remote-tor-constant-$DATE.log" + +> "remote-tor-alternating-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-alternating.sh "remote-tor-alternating-$DATE.log"

1 0

[flashproxy/master] Let switching experiments write time to a log file.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit c907b00a096f770942fc2df7507dcf54233a2659 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:26:12 2011 -0700 Let switching experiments write time to a log file. --- experiments/common.sh | 10 ++++++++++ experiments/switching/local-http-alternating.sh | 13 ++++++++++--- experiments/switching/local-http-constant.sh | 12 +++++++++--- experiments/switching/remote-tor-alternating.sh | 12 +++++++++--- experiments/switching/remote-tor-constant.sh | 10 ++++++++-- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 632a99b..f788235 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -35,3 +35,13 @@ browser_goto() { ensure_browser_started "$PROFILE" "$FIREFOX" -P "$PROFILE" -remote "openurl($URL)" 2>/dev/null } + +# Run a command and get the "real" part of time(1) output as a number of +# seconds. +real_time() { + # Make a spare copy of stderr (fd 1). + exec 3>&2 + # Point the subcommand's stderr to our copy (fd 3), and extract the + # original stderr (fd 2) output of time. + (time -p eval "$@" 2>&3) |& tail -n 3 | head -n 1 | awk '{print $2}' +} diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 5eea428..8e11065 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./local-http-alternating.sh +# Usage: ./local-http-alternating.sh [OUTPUT_FILENAME] # -# Tests a download over alternating flash proxies. +# Tests a download over alternating flash proxies. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -56,4 +58,9 @@ echo "Start socat." PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + +if [ -n "$OUTPUT_FILENAME" ]; then + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 1a74aaf..0fed6e4 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./local-http-constant.sh +# Usage: ./local-http-constant.sh [OUTPUT_FILENAME] # -# Tests a download over an uninterrupted flash proxy. +# Tests a download over an uninterrupted flash proxy. If OUTPUT_FILENAME +# is supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -51,4 +53,8 @@ echo "Start socat." PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 52da3aa..5309dce 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./remote-tor-alternating.sh +# Usage: ./remote-tor-alternating.sh [OUTPUT_FILENAME] # -# Tests a Tor download over alternating flash proxies. +# Tests a Tor download over alternating flash proxies. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -52,4 +54,8 @@ PIDS_TO_KILL+=($!) # Let Tor bootstrap. visible_sleep 15 -time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 4f530be..c0d6338 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -2,7 +2,8 @@ # Usage: ./remote-tor-constant.sh # -# Tests a Tor download over an uninterrupted flash proxy. +# Tests a Tor download over an uninterrupted flash proxy. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -47,4 +49,8 @@ browser_goto "$PROFILE_1" "$PROXY_URL" # Let Tor bootstrap. visible_sleep 15 -time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +fi

1 0

[flashproxy/master] Use a smaller 500 MB local download file.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 751c46714d914dc17ac197bbb3c452c610770752 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:42:21 2011 -0700 Use a smaller 500 MB local download file. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/local-http-constant.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 8e11065..05276e7 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -29,7 +29,7 @@ stop() { trap stop EXIT echo "Create data file." -dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=1024 2>/dev/null || exit +dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=500 2>/dev/null || exit echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 & diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 0fed6e4..e5e50be 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -29,7 +29,7 @@ stop() { trap stop EXIT echo "Create data file." -dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=1024 2>/dev/null || exit +dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=500 2>/dev/null || exit echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 &

1 0

[flashproxy/master] Increase some delays to make sure browser starts up.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 46de5dfda5774934ed7c85b2716f94e4f49e7bee Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 02:35:01 2011 -0700 Increase some delays to make sure browser starts up. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/proxy-loop.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 7847a33..8b3bf91 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -51,7 +51,7 @@ ensure_browser_started "$PROFILE_2" ./proxy-loop.sh "$PROXY_URL" "$PROFILE_1" "$PROFILE_2" >/dev/null 2>&1 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & diff --git a/experiments/switching/proxy-loop.sh b/experiments/switching/proxy-loop.sh index 3c3b78a..5fa76a7 100755 --- a/experiments/switching/proxy-loop.sh +++ b/experiments/switching/proxy-loop.sh @@ -22,6 +22,8 @@ browser_clear "$PROFILE_1" ensure_browser_started "$PROFILE_2" browser_clear "$PROFILE_2" +sleep 1 + while true; do echo "1 on" firefox -P "$PROFILE_1" -remote "openurl($URL)"

1 0

[flashproxy/master] Use --wait=0 --waitretry=0 in Wgets that retry.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 7b4695fdb7b2cbafd9d5b4c664ad8a9cca70614e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 02:21:56 2011 -0700 Use --wait=0 --waitretry=0 in Wgets that retry. By default, Wget waits between retrying failed downloads, and this was interfering with measurements. Here's an except from wget(1): --waitretry=seconds If you don't want Wget to wait between every retrieval, but only between retries of failed downloads, you can use this option. Wget will use linear backoff, waiting 1 second after the first failure on a given file, then waiting 2 seconds after the second failure on that file, up to the maximum number of seconds you specify. By default, Wget will assume a value of 10 seconds. --- experiments/switching/local-http-alternating.sh | 6 +++--- experiments/switching/local-http-constant.sh | 6 +++--- experiments/switching/remote-tor-alternating.sh | 4 ++-- experiments/switching/remote-tor-constant.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 05276e7..7847a33 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -56,11 +56,11 @@ visible_sleep 1 echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index e5e50be..bcc65c8 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -51,10 +51,10 @@ browser_goto "$PROFILE_1" "$PROXY_URL" echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 5309dce..97fb749 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -55,7 +55,7 @@ PIDS_TO_KILL+=($!) visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c0d6338..e4dc48c 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -50,7 +50,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi

1 0

[flashproxy/master] Keep retrying remote-tor downloads.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit f993a27167655b4d565987d54acf3aa6a9b39221 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 3 20:29:15 2011 -0700 Keep retrying remote-tor downloads. Sometimes a proxy going down at just the right moment can cause Tor to reject a SOCKS connection (with code 91). This seems to confuse Wget's automatic retrying; it starts over from the beginning. I have also seen it abort the Wget download completely. So download the file to an actual file rather than /dev/null, and run Wget with -c in a loop. --- experiments/switching/remote-tor-alternating.sh | 12 ++++++++++-- experiments/switching/remote-tor-constant.sh | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 97fb749..a9c394d 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -22,6 +22,8 @@ stop() { echo "Kill pids ${PIDS_TO_KILL[@]}." kill "${PIDS_TO_KILL[@]}" fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" exit } trap stop EXIT @@ -54,8 +56,14 @@ PIDS_TO_KILL+=($!) # Let Tor bootstrap. visible_sleep 15 +repeat_download() { + until torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME"; do + echo "retrying" + done +} + if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time repeat_download >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time repeat_download fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index e4dc48c..c1cce88 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -21,6 +21,8 @@ stop() { echo "Kill pids ${PIDS_TO_KILL[@]}." kill "${PIDS_TO_KILL[@]}" fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" exit } trap stop EXIT @@ -50,7 +52,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" fi

1 0

r25194: {website} update mirror status (website/trunk/include)
by Andrew Lewman 04 Nov '11

04 Nov '11

Author: phobos Date: 2011-11-04 02:31:24 +0000 (Fri, 04 Nov 2011) New Revision: 25194 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror status Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-11-01 03:35:45 UTC (rev 25193) +++ website/trunk/include/mirrors-table.wmi 2011-11-04 02:31:24 UTC (rev 25194) @@ -1,8 +1,42 @@ <tr> + <td>TN</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirror.tn/dist/">http</a></td> + <td><a href="http://tor.mirror.tn/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td></td> <td>Up to date</td> @@ -52,15 +86,15 @@ <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -224,6 +258,23 @@ <td>DE</td> + <td>factor.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td>chaos darmstadt</td> <td>Up to date</td> @@ -290,91 +341,6 @@ <tr> - <td>IS</td> - - <td>TheOnionRouter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.theonionrouter.com/dist/">http</a></td> - <td><a href="http://www.theonionrouter.com/">http</a></td> - <td><a href="https://www.theonionrouter.com/dist/">https</a></td> - <td><a href="https://www.theonionrouter.com/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>TN</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.mirror.tn/dist/">http</a></td> - <td><a href="http://tor.mirror.tn/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IL</td> <td>Host4site</td> @@ -426,6 +392,23 @@ <tr> + <td>IS</td> + + <td>TheOnionRouter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.theonionrouter.com/dist/">http</a></td> + <td><a href="http://www.theonionrouter.com/">http</a></td> + <td><a href="https://www.theonionrouter.com/dist/">https</a></td> + <td><a href="https://www.theonionrouter.com/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>SE</td> <td>homosu</td> @@ -460,15 +443,15 @@ <tr> - <td>DE</td> + <td>EE</td> - <td></td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,15 +460,15 @@ <tr> - <td>LT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -545,6 +528,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td>

1 0

[tor/master] fix grammar in man page entries from proposal 171
by arma＠torproject.org 03 Nov '11

03 Nov '11

commit 350fe952590fdfd1711aaaddcb478cdea20b6e6a Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Nov 3 19:08:25 2011 -0400 fix grammar in man page entries from proposal 171 --- doc/tor.1.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 89dd7dc..c99c999 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -694,11 +694,11 @@ The following options are useful only for clients (that is, if received on this SOCKSPort are allowed to share circuits with one another. Recognized isolation flags are: **IsolateClientAddr**;; - Don't share a circuits with streams from a different + Don't share circuits with streams from a different client address. (On by default and strongly recommended; you can disable it with **NoIsolateClientAddr**.) **IsolateSOCKSAuth**;; - Don't share a circuits with streams for which different + Don't share circuits with streams for which different SOCKS authentication was provided. (On by default; you can disable it with **NoIsolateSOCKSAuth**.) **IsolateClientProtocol**;; @@ -706,10 +706,10 @@ The following options are useful only for clients (that is, if (SOCKS 4, SOCKS 5, TransPort connections, NATDPort connections, and DNSPort requests are all considered to be different protocols.) **IsolateDestPort**;; - Don't share a circuits with streams targetting a different + Don't share circuits with streams targetting a different destination port. **IsolateDestAddr**;; - Don't share a circuits with streams targetting a different + Don't share circuits with streams targetting a different destination address. **SessionGroup=**__INT__;; If no other isolation rules would prevent it, allow streams

1 0

[thandy/master] First part of makethppackage
by nickm＠torproject.org 03 Nov '11

03 Nov '11

commit 2ca16b64ac00ce6375e3828d334979e5b7abf098 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue Jun 21 23:57:11 2011 -0300 First part of makethppackage Creates its metadata based on a config file. This still needs a sanity check. --- lib/thandy/SignerCLI.py | 41 ++++++++++++++++++++++- lib/thandy/formats.py | 67 +++++++++++++++++++++++++++++++++++++++ lib/thandy/util.py | 7 ++++ samples/example-thp-package.cfg | 18 ++++++++++ 4 files changed, 131 insertions(+), 2 deletions(-) diff --git a/lib/thandy/SignerCLI.py b/lib/thandy/SignerCLI.py index 06536aa..ed573ad 100644 --- a/lib/thandy/SignerCLI.py +++ b/lib/thandy/SignerCLI.py @@ -3,6 +3,8 @@ import os import getopt import sys +import tempfile +import time import thandy.keys import thandy.formats @@ -93,6 +95,39 @@ def makepackage(args): f.write(metaFile) f.close() +def makethppackage(args): + options, args = getopt.getopt(args, "", "keyid=") + keyid = None + for o,v in options: + if o == "--keyid": + keyid = v + + if len(args) < 2: + usage() + + tmpPath = tempfile.mkdtemp(suffix=str(time.time()), + prefix="thp") + + print "Using temporary directory: %s" % tmpPath + + configFile = args[0] + dataPath = args[1] + print "Generating package metadata." + metadata = thandy.formats.makeThpPackageObj(configFile, dataPath) + + try: + os.mkdir(os.path.join(tmpPath, "meta")); + except Exception as e: + print e + thandy.util.deltree(tmpPath) + sys.exit(1) + + thandy.util.replaceFile(os.path.join(tmpPath, "meta", "package.json"), + json.dumps(metadata, indent=3)) + + thandy.util.deltree(tmpPath) + print metadata + def makebundle(args): options, args = getopt.getopt(args, "", "keyid=") keyid = None @@ -307,6 +342,7 @@ def usage(): print " delrole keyid role path" print " dumpkey [--include-secret] keyid" print " makepackage config datafile" + print " makethppackage config datapath" print " makebundle config packagefile ..." print " signkeylist keylist" print " makekeylist keylist" @@ -319,8 +355,9 @@ def main(): cmd = sys.argv[1] args = sys.argv[2:] if cmd in [ "keygen", "listkeys", "addrole", "delrole", "chpass", - "dumpkey", "makepackage", "makebundle", "signkeylist", - "makekeylist", "signkeylist", "makemirrorlist", ]: + "dumpkey", "makepackage", "makebundle", "makethppackage", + "signkeylist", "makekeylist", "signkeylist", + "makemirrorlist", ]: try: globals()[cmd](args) except thandy.BadPassword: diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py index a59f696..438b045 100644 --- a/lib/thandy/formats.py +++ b/lib/thandy/formats.py @@ -564,6 +564,23 @@ PACKAGE_SCHEMA = S.Obj( shortdesc=S.DictOf(S.AnyStr(), S.AnyStr()), longdesc=S.DictOf(S.AnyStr(), S.AnyStr())) +THP_PACKAGE_SCHEMA = S.Obj( + format_version=S.Any(), + manifest=S.ListOf(S.Obj(name=RELPATH_SCHEMA, + digest=HASH_SCHEMA, + is_config=S.Bool())), + package_name=S.AnyStr(), + package_version=S.AnyStr(), + package_version_tuple=VERSION_SCHEMA, + timestamp=TIME_SCHEMA, + additional_files=S.Opt(S.ListOf(S.AnyStr())), + install_order=S.Opt(S.Int()), + options=S.Opt(S.DictOf(S.AnyStr(), S.Any())), + platform=S.Opt(S.DictOf(S.AnyStr(), S.AnyStr())), + require_features=S.Opt(S.ListOf(S.AnyStr())), + require_packages=S.Opt(S.ListOf(S.ListOf(S.AnyStr()))), + scripts=S.Opt(S.DictOf(S.AnyStr(), S.AnyStr()))) + PACKAGE_SCHEMA = S.Func(checkPackageFormatConsistency, PACKAGE_SCHEMA) ALL_ROLES = ('timestamp', 'mirrors', 'bundle', 'package', 'master') @@ -787,6 +804,56 @@ def makePackageObj(config_fname, package_fname): return result +def makeThpPackageObj(config_fname, package_path): + """Given a description of a thandy Thp package in config_fname, and the + name of the directory where the installable contests are in + package_fname, return a new unsigned package object. + """ + preload = {} + r = readConfigFile(config_fname, + ['format_version', + 'files', + 'package_name', + 'package_version', + 'package_version_tuple', + ], ['additional_files', + 'install_order', + 'options', + 'platform', + 'require_features', + 'require_packages', + 'scripts' + ], preload) + + file_list = [] + for (file, is_config) in r["files"]: + f = open(os.path.join(package_path, file), 'rb') + digest = getFileDigest(f) + f.close() + + file_list.append({'name' : file, + 'digest' : formatHash(digest), + 'is_config' : is_config}) + + result = { 'format_version' : r['format_version'], + 'manifest' : file_list, + 'package_name' : r['package_name'], + 'package_version' : r['package_version'], + 'package_version_tuple' : r['package_version_tuple'], + 'timestamp' : formatTime(time.time()), + 'additional_files' : r['additional_files'], + 'install_order' : r['install_order'], + 'options' : r['options'], + 'platform' : r['platform'], + 'require_features' : r['require_features'], + 'require_packages' : r['require_packages'], + 'scripts' : r['scripts'] + } + + THP_PACKAGE_SCHEMA.checkMatch(result) + + return result + def makeBundleObj(config_fname, getPackage, getPackageLength): """Given a description of a thandy bundle in config_fname, return a new unsigned bundle object. getPackage must be a function diff --git a/lib/thandy/util.py b/lib/thandy/util.py index 29c7b87..606d6c0 100644 --- a/lib/thandy/util.py +++ b/lib/thandy/util.py @@ -217,3 +217,10 @@ def logCtrl(key, **args): "%s=%s"%(k, formatLogString(v)) for k,v in sorted(args.iteritems())) _controlLog.log(logging.INFO, " ".join(parts)) +def deltree(top): + for dirpath, dirnames, filenames in os.walk(top, topdown=False): + for f in filenames: + os.unlink(os.path.join(dirpath, f)) + for d in dirnames: + os.rmdir(os.path.join(dirpath, d)) + os.rmdir(top) diff --git a/samples/example-thp-package.cfg b/samples/example-thp-package.cfg new file mode 100644 index 0000000..1c69661 --- /dev/null +++ b/samples/example-thp-package.cfg @@ -0,0 +1,18 @@ +format_version = 1 + +package_name = "test_package" +package_version = "0.0.1-1" +package_version_tuple = [0,0,1,1] +# A list of tuples (file_relative_path, is_config) +files = [ ("file1", False), + ("file2", False), + ("directory/file3", True) ] + +additional_files = [ "add_file1", "add_file2" ] +install_order = 50 +options = { "cycle-install" : False } +platform = { "os" : "GNU/Linux", + "arch" : "x86" } +require_features = [ "pythonscripts" ] +require_packages = [] +scripts = { "preinst" : "/some/path" }

1 0

[thandy/master] Make optional keys actually optional
by nickm＠torproject.org 03 Nov '11

03 Nov '11

commit 5974512b79234882c59eab75669440628a6a8142 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed Jun 22 08:07:14 2011 -0300 Make optional keys actually optional --- lib/thandy/formats.py | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py index cd7cb0a..b73e5ac 100644 --- a/lib/thandy/formats.py +++ b/lib/thandy/formats.py @@ -811,20 +811,21 @@ def makeThpPackageObj(config_fname, package_path): package_fname, return a new unsigned package object. """ preload = {} + optKeys = ['additional_files', + 'install_order', + 'options', + 'platform', + 'require_features', + 'require_packages', + 'scripts' + ] r = readConfigFile(config_fname, ['format_version', 'files', 'package_name', 'package_version', 'package_version_tuple', - ], ['additional_files', - 'install_order', - 'options', - 'platform', - 'require_features', - 'require_packages', - 'scripts' - ], preload) + ], optKeys, preload) file_list = [] for (file, is_config) in r["files"]: @@ -841,16 +842,13 @@ def makeThpPackageObj(config_fname, package_path): 'package_name' : r['package_name'], 'package_version' : r['package_version'], 'package_version_tuple' : r['package_version_tuple'], - 'timestamp' : formatTime(time.time()), - 'additional_files' : r['additional_files'], - 'install_order' : r['install_order'], - 'options' : r['options'], - 'platform' : r['platform'], - 'require_features' : r['require_features'], - 'require_packages' : r['require_packages'], - 'scripts' : r['scripts'] + 'timestamp' : formatTime(time.time()) } + for optKey in optKeys: + if optKey in r: + result[optKey] = r[optKey] + THP_PACKAGE_SCHEMA.checkMatch(result) return result

1 0