- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Report wrong key sizes correctly
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 0fd3ad75daf925e8192aa1d44b229b3b7c29829d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:07:08 2011 -0400 Report wrong key sizes correctly When we introduced NEED_KEY_1024 in routerparse.c back in 0.2.0.1-alpha, I forgot to add a *8 when logging the length of a bad-length key. Bugfix for 3318 on 0.2.0.1-alpha. --- changes/bug3318 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug3318 b/changes/bug3318 new file mode 100644 index 0000000..38991c4 --- /dev/null +++ b/changes/bug3318 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a log message that said "bits" while displaying a value in + bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1dcbc6a..3728e99 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3767,7 +3767,7 @@ token_check_object(memarea_t *area, const char *kwd, case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)); + kwd, (int)crypto_pk_keysize(tok->key)*8); RET_ERR(ebuf); } /* fall through */

1 0

[torbutton/master] Bug 3101: Disable WebGL. Too many unknowns for now.
by mikeperry＠torproject.org 01 Jun '11

01 Jun '11

commit 00d5bc28bf82c9fb049368b78cff8f43d775c299 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jun 1 00:31:09 2011 -0700 Bug 3101: Disable WebGL. Too many unknowns for now. I think these folks may be right, at least for the short term: http://www.contextis.com/resources/blog/webgl/ Remote fonts were a minefield of exploits, and the vulnerability surface there was like 1% of OpenGL. After a few releases, we can revisit the remaining fingerprinting issues and consider re-enabling. --- src/chrome/content/torbutton.js | 5 +++++ src/defaults/preferences/preferences.js | 1 + src/install.rdf | 2 +- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9f5c5fe..401443a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1403,6 +1403,11 @@ function torbutton_update_status(mode, force_update) { !mode, mode, changed); } + if (m_tb_ff4) { + torbutton_setBoolPref("webgl.disabled", "webgl_disabled", mode, mode, + changed); + } + if(m_tb_ff35) { // Disable geolocation torbutton_setBoolPref("geo.enabled", "geo_enabled", !mode, mode, diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 58c8abe..fd88a1e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -93,6 +93,7 @@ pref("extensions.torbutton.saved.buildID_override",""); pref("extensions.torbutton.saved.useragent_vendor", ""); pref("extensions.torbutton.saved.useragent_vendorSub",""); pref("extensions.torbutton.saved.transparentTor",false); +pref("extensions.torbutton.saved.webgl_disabled", false); // network.dns.disablePrefetch is a hidden option. It has no default value: //pref("extensions.torbutton.saved.dns_prefetch", false); diff --git a/src/install.rdf b/src/install.rdf index 540e053..0d4c9f7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.3.3-alpha</em:version> + <em:version>1.4.0rc1-pre1</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

r24798: {projects} update some of the 2011 slide masters to be readable if you' (projects/presentations)
by Andrew Lewman 01 Jun '11

01 Jun '11

Author: phobos Date: 2011-06-01 02:26:46 +0000 (Wed, 01 Jun 2011) New Revision: 24798 Modified: projects/presentations/2011-slide-masters.odp projects/presentations/2011-slide-masters.pdf Log: update some of the 2011 slide masters to be readable if you're in the back of a large room. Modified: projects/presentations/2011-slide-masters.odp =================================================================== (Binary files differ) Modified: projects/presentations/2011-slide-masters.pdf =================================================================== (Binary files differ)

1 0

r24797: {website} link to our version, not amo. (website/trunk/torbutton/en)
by Andrew Lewman 01 Jun '11

01 Jun '11

Author: phobos Date: 2011-05-31 20:56:11 +0000 (Tue, 31 May 2011) New Revision: 24797 Modified: website/trunk/torbutton/en/index.wml Log: link to our version, not amo. Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-05-31 20:55:12 UTC (rev 24796) +++ website/trunk/torbutton/en/index.wml 2011-05-31 20:56:11 UTC (rev 24797) @@ -94,9 +94,7 @@ Install Stable: Click to <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" hash="<version-hash-torbutton>" onclick="return - install(event);">install from this website</a> or <a - href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-l…">install - from Mozilla's Add-On site</a> + install(event);">install from this website</a>. Install Alpha: Click to <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi" hash="<version-hash-torbutton-alpha>"

1 0

r24796: {website} local doesn't exist, it's on archive. (website/trunk/torbutton/en)
by Andrew Lewman 01 Jun '11

01 Jun '11

Author: phobos Date: 2011-05-31 20:55:12 +0000 (Tue, 31 May 2011) New Revision: 24796 Modified: website/trunk/torbutton/en/index.wml Log: local doesn't exist, it's on archive. Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-05-31 20:34:13 UTC (rev 24795) +++ website/trunk/torbutton/en/index.wml 2011-05-31 20:55:12 UTC (rev 24796) @@ -109,7 +109,7 @@ <a href="/jsreq.html" title="Ref: 14938 (googleCA)" onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>. - Past Releases: <a href="../dist/torbutton/">Local</a> + Past Releases: <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a> Developer Documentation: <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a>

1 0

r24795: {website} minor faq cleanups (website/trunk/docs/en)
by Roger Dingledine 01 Jun '11

01 Jun '11

Author: arma Date: 2011-05-31 20:34:13 +0000 (Tue, 31 May 2011) New Revision: 24795 Modified: website/trunk/docs/en/faq.wml Log: minor faq cleanups Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-05-30 12:13:48 UTC (rev 24794) +++ website/trunk/docs/en/faq.wml 2011-05-31 20:34:13 UTC (rev 24795) @@ -157,15 +157,17 @@ Simple proxy providers also create a single point of failure. The provider knows who you are and where you browse on the Internet. They can see your -traffic as it passes through their server. In some cases, they can see your +traffic as it passes through their server. In some cases, they can even see +inside your encrypted traffic as they relay it to your banking site or to ecommerce stores. You have to trust the provider isn't doing any number of things, such as watching your traffic, injecting their own advertisements into your traffic -stream, and isn't recording your personal details. +stream, and recording your personal details. Tor passes your traffic through at least 3 different servers before sending -it on to the destination. Tor does not modify, or even know, what you are +it on to the destination. Because there's a separate layer of encryption for +each of the three relays, Tor does not modify, or even know, what you are sending into it. It merely relays your traffic, completely encrypted through the Tor network and has it pop out somewhere else in the world, completely intact. The Tor client is required because we assume you trust your local @@ -1256,7 +1258,7 @@ Right now, there are a small number of places in the world that filter connections to the Tor network. So getting a lot of bridges running right now is mostly a backup measure, a) in case the Tor network does - get blocked somewhere, and b) for people who want an extra layer of + get blocked in more places, and b) for people who want an extra layer of security because they're worried somebody will recognize that it's a public Tor relay IP address they're contacting.

1 0

[metrics-tasks/master] [2714] Graph absolute instability of the HSDir set
by karsten＠torproject.org 31 May '11

31 May '11

commit 93aa1f07c24126a086505efa06621916eac02bab Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 29 04:08:19 2011 -0700 [2714] Graph absolute instability of the HSDir set --- task-2714/README | 1 + task-2714/graph-hsdir-set-absolute-instability | 9 +++++++++ .../graph-hsdir-set-absolute-instability.gnuplot | 12 ++++++++++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/task-2714/README b/task-2714/README index 4283696..f75f70a 100644 --- a/task-2714/README +++ b/task-2714/README @@ -22,6 +22,7 @@ Instructions: ./generate-consensus-hsdir-lists ./compute-hsdir-set-instability ./graph-hsdir-set-instability + ./graph-hsdir-set-absolute-instability Bugs: diff --git a/task-2714/graph-hsdir-set-absolute-instability b/task-2714/graph-hsdir-set-absolute-instability new file mode 100755 index 0000000..06c31a4 --- /dev/null +++ b/task-2714/graph-hsdir-set-absolute-instability @@ -0,0 +1,9 @@ +#!/bin/sh -e + +# This script must be run as ./graph-hsdir-set-instability . + +gnuplot >out/hsdir-set-absolute-instability-graph.ps <<EOF +set terminal postscript color solid +load "graph-hsdir-set-absolute-instability.gnuplot" +EOF + diff --git a/task-2714/graph-hsdir-set-absolute-instability.gnuplot b/task-2714/graph-hsdir-set-absolute-instability.gnuplot new file mode 100644 index 0000000..ee7f088 --- /dev/null +++ b/task-2714/graph-hsdir-set-absolute-instability.gnuplot @@ -0,0 +1,12 @@ + +set xdata time +set timefmt "%Y-%m-%d-%H-%M-%S" +set format x "%Y-%m-%d" +set xrange ["2011-01-01-00-00-00":] + +plot "out/hsdir-set-instability" using 1:(0):2 with lines title "HSDir set size",\ + "out/hsdir-set-instability" using 1:(0):6 with filledcurves title "4 hr",\ + "out/hsdir-set-instability" using 1:(0):5 with filledcurves title "3 hr",\ + "out/hsdir-set-instability" using 1:(0):4 with filledcurves title "2 hr",\ + "out/hsdir-set-instability" using 1:(0):3 with filledcurves title "1 hr" +

1 0

[metrics-tasks/master] Demoronize the HSDir set instability x-axis labels
by karsten＠torproject.org 31 May '11

31 May '11

commit 8d985a5b5fc5843df1f96635cab02565b9a23dfe Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 18:53:27 2011 -0700 Demoronize the HSDir set instability x-axis labels --- task-2649/graph-hsdir-set-instability.gnuplot | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/task-2649/graph-hsdir-set-instability.gnuplot b/task-2649/graph-hsdir-set-instability.gnuplot index e6bbfea..c497395 100644 --- a/task-2649/graph-hsdir-set-instability.gnuplot +++ b/task-2649/graph-hsdir-set-instability.gnuplot @@ -1,6 +1,7 @@ set xdata time set timefmt "%Y-%m-%d-%H-%M-%S" +set format x "%Y-%m" set xrange ["2011-01-01-00-00-00":] set yrange [0:1]

1 0

[metrics-tasks/master] [2714] Move task-2649 to task-2714
by karsten＠torproject.org 31 May '11

31 May '11

commit 4b656e741478aa6f32e6dbcf5398c7e5fbce069f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 29 03:59:07 2011 -0700 [2714] Move task-2649 to task-2714 --- task-2649/.gitignore | 3 - task-2649/MOVED | 1 + task-2649/README | 31 --------- task-2649/compute-hsdir-set-instability | 12 ---- task-2649/compute-hsdir-set-instability.tcl | 83 ------------------------- task-2649/generate-consensus-hsdir-lists | 28 -------- task-2649/graph-hsdir-set-instability | 9 --- task-2649/graph-hsdir-set-instability.gnuplot | 12 ---- task-2649/list-consensus-hsdirs | 19 ------ task-2649/list-consensus-hsdirs.awk | 25 -------- task-2714/.gitignore | 3 + task-2714/README | 31 +++++++++ task-2714/compute-hsdir-set-instability | 12 ++++ task-2714/compute-hsdir-set-instability.tcl | 83 +++++++++++++++++++++++++ task-2714/generate-consensus-hsdir-lists | 28 ++++++++ task-2714/graph-hsdir-set-instability | 9 +++ task-2714/graph-hsdir-set-instability.gnuplot | 12 ++++ task-2714/list-consensus-hsdirs | 19 ++++++ task-2714/list-consensus-hsdirs.awk | 25 ++++++++ 19 files changed, 223 insertions(+), 222 deletions(-) diff --git a/task-2649/.gitignore b/task-2649/.gitignore deleted file mode 100644 index 46ca2bd..0000000 --- a/task-2649/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -dev/ -out/ -*~ diff --git a/task-2649/MOVED b/task-2649/MOVED new file mode 100644 index 0000000..11dbb4c --- /dev/null +++ b/task-2649/MOVED @@ -0,0 +1 @@ +This directory has moved to task-2714. diff --git a/task-2649/README b/task-2649/README deleted file mode 100644 index 4283696..0000000 --- a/task-2649/README +++ /dev/null @@ -1,31 +0,0 @@ - -Purpose: - - These scripts are intended to determine how unstable the set of - relays with the HSDir flag is. - -Dependencies: - - You will need linedemux and linemux installed. See branch parrun in - https://gitweb.torproject.org/rransom/tor-utils.git for now. - - You will also need Tcl 8.5.9 and gnuplot 4.4.0 installed. - -Instructions: - - First, unpack all of the v3 consensus archive tarballs you want to - analyze into a single directory, and set the consensus_archive_dir - environment variable to point to that directory. - - Then run: - - ./generate-consensus-hsdir-lists - ./compute-hsdir-set-instability - ./graph-hsdir-set-instability - -Bugs: - - This code compares each consensus with each of the four following - consensuses; it should compare each hour's consensus with the - consensuses in effect in each of the four following hours. - diff --git a/task-2649/compute-hsdir-set-instability b/task-2649/compute-hsdir-set-instability deleted file mode 100755 index 1a5e767..0000000 --- a/task-2649/compute-hsdir-set-instability +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -# This script must be run as ./compute-hsdir-set-instability . - - -find out/consensus-hsdir-lists -type f -print | -sort | -tclsh8.5 compute-hsdir-set-instability.tcl | -tee out/hsdir-set-instability | -sed -e 's/$/ /' | -tr '\n' '\r' - diff --git a/task-2649/compute-hsdir-set-instability.tcl b/task-2649/compute-hsdir-set-instability.tcl deleted file mode 100644 index 24afb97..0000000 --- a/task-2649/compute-hsdir-set-instability.tcl +++ /dev/null @@ -1,83 +0,0 @@ - -set hsdir_set_name_list {} - -array set hsdir_sets {} - -proc read_file_lines {filename} { - set chanid [open $filename r] - set contents [read -nonewline $chanid] - close $chanid - - return [split $contents "\n"] -} - -proc get_hsdir_set_name {filename} { - return [file tail $filename] -} - -proc read_hsdir_set {set_name filename} { - global hsdir_sets - - set hsdir_set [read_file_lines $filename] - set hsdir_sets($set_name) $hsdir_set -} - -proc forget_hsdir_set {name} { - unset -nocomplain hsdir_sets($name) -} - -proc list_set_symmetric_difference_size {l1 l2} { - set l1 [lsort -ascii -unique $l1] - set l2 [lsort -ascii -unique $l2] - set both [lsort -ascii -unique [concat $l1 $l2]] - - set l1i 0 - set l2i 0 - #set result {} - set result_length 0 - - foreach x $both { - set n_inputs_containing_x 0 - if {[lindex $l1 $l1i] eq $x} { - incr l1i - incr n_inputs_containing_x - } - if {[lindex $l2 $l2i] eq $x} { - incr l2i - incr n_inputs_containing_x - } - if {$n_inputs_containing_x & 1} { - #lappend result $x - incr result_length - } - } - - #return $result - return $result_length -} -rename list_set_symmetric_difference_size lssds - -while {![eof stdin]} { - set x [gets stdin hsdir_set_filename] - if {$x == -1} {break} - - set hsdir_set_name [get_hsdir_set_name $hsdir_set_filename] - read_hsdir_set $hsdir_set_name $hsdir_set_filename - - lappend hsdir_set_name_list $hsdir_set_name - - if {[llength $hsdir_set_name_list] == 5} { - lassign $hsdir_set_name_list set0 set1 set2 set3 set4 - - puts "$set0\ - [llength $hsdir_sets($set0)]\ - [lssds $hsdir_sets($set0) $hsdir_sets($set1)]\ - [lssds $hsdir_sets($set0) $hsdir_sets($set2)]\ - [lssds $hsdir_sets($set0) $hsdir_sets($set3)]\ - [lssds $hsdir_sets($set0) $hsdir_sets($set4)]" - - forget_hsdir_set [lindex $hsdir_set_name_list 0] - set hsdir_set_name_list [lrange $hsdir_set_name_list 1 end] - } -} - diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists deleted file mode 100755 index 9c09ac8..0000000 --- a/task-2649/generate-consensus-hsdir-lists +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e - -# This script must be run as ./generate-consensus-hsdir-lists . - -# This script will die horribly later if $consensus_archive_dir -# expands to a string containing a shell metacharacter, so don't try -# to not die now. -test -z $consensus_archive_dir && -export consensus_archive_dir=/usr/local/opt/tor-consensuses - - -mkdir -m 0700 -p dev/ -for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i || true ;done - -mkdir -p out/consensus-hsdir-lists - - -(cd "$consensus_archive_dir" ;find consensuses-* -type f -print ) | -sed -e 's|^|./list-consensus-hsdirs |' | -linedemux --fname -- dev/in0 dev/in1 dev/in2 dev/in3 & - -sh <dev/in0 >dev/out0 & -sh <dev/in1 >dev/out1 & -sh <dev/in2 >dev/out2 & -sh <dev/in3 >dev/out3 & - -linemux --fname -- dev/out0 dev/out1 dev/out2 dev/out3 - diff --git a/task-2649/graph-hsdir-set-instability b/task-2649/graph-hsdir-set-instability deleted file mode 100755 index 013d287..0000000 --- a/task-2649/graph-hsdir-set-instability +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -# This script must be run as ./graph-hsdir-set-instability . - -gnuplot >out/hsdir-set-instability-graph.ps <<EOF -set terminal postscript color solid -load "graph-hsdir-set-instability.gnuplot" -EOF - diff --git a/task-2649/graph-hsdir-set-instability.gnuplot b/task-2649/graph-hsdir-set-instability.gnuplot deleted file mode 100644 index c497395..0000000 --- a/task-2649/graph-hsdir-set-instability.gnuplot +++ /dev/null @@ -1,12 +0,0 @@ - -set xdata time -set timefmt "%Y-%m-%d-%H-%M-%S" -set format x "%Y-%m" -set xrange ["2011-01-01-00-00-00":] -set yrange [0:1] - -plot "out/hsdir-set-instability" using 1:(0):($6/$2) with filledcurves title "4 hr",\ - "out/hsdir-set-instability" using 1:(0):($5/$2) with filledcurves title "3 hr",\ - "out/hsdir-set-instability" using 1:(0):($4/$2) with filledcurves title "2 hr",\ - "out/hsdir-set-instability" using 1:(0):($3/$2) with filledcurves title "1 hr" - diff --git a/task-2649/list-consensus-hsdirs b/task-2649/list-consensus-hsdirs deleted file mode 100755 index d6edb27..0000000 --- a/task-2649/list-consensus-hsdirs +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -e - -# This script must be run as ./list-consensus-hsdirs , by -# generate-consensus-hsdir-lists. - -consensus_file="$1" - - -consensus_basename="$(basename "$consensus_file" -consensus )" -hsdir_list_dir="out/consensus-hsdir-lists/$(echo "$consensus_basename" |cut -f 1-2 -d - )" -hsdir_list_name="$hsdir_list_dir/$consensus_basename" - - -mkdir -p "$hsdir_list_dir" - -awk -f list-consensus-hsdirs.awk <"$consensus_archive_dir/$consensus_file" >"$hsdir_list_name" - -echo "generated HSDir list $consensus_basename" - diff --git a/task-2649/list-consensus-hsdirs.awk b/task-2649/list-consensus-hsdirs.awk deleted file mode 100644 index 343c5e7..0000000 --- a/task-2649/list-consensus-hsdirs.awk +++ /dev/null @@ -1,25 +0,0 @@ - -BEGIN { - OFS=":" - idDigest="<oops>" -} - -$1 == "r" { - idDigest=$3 -} - -$1 == "s" { - isHSDir=0 - for (i = NF; i >= 1; --i) { - if ($i == "HSDir") { - isHSDir=1 - } - } - - if (isHSDir != 0) { - print idDigest - } - - idDigest="<oops>" -} - diff --git a/task-2714/.gitignore b/task-2714/.gitignore new file mode 100644 index 0000000..46ca2bd --- /dev/null +++ b/task-2714/.gitignore @@ -0,0 +1,3 @@ +dev/ +out/ +*~ diff --git a/task-2714/README b/task-2714/README new file mode 100644 index 0000000..4283696 --- /dev/null +++ b/task-2714/README @@ -0,0 +1,31 @@ + +Purpose: + + These scripts are intended to determine how unstable the set of + relays with the HSDir flag is. + +Dependencies: + + You will need linedemux and linemux installed. See branch parrun in + https://gitweb.torproject.org/rransom/tor-utils.git for now. + + You will also need Tcl 8.5.9 and gnuplot 4.4.0 installed. + +Instructions: + + First, unpack all of the v3 consensus archive tarballs you want to + analyze into a single directory, and set the consensus_archive_dir + environment variable to point to that directory. + + Then run: + + ./generate-consensus-hsdir-lists + ./compute-hsdir-set-instability + ./graph-hsdir-set-instability + +Bugs: + + This code compares each consensus with each of the four following + consensuses; it should compare each hour's consensus with the + consensuses in effect in each of the four following hours. + diff --git a/task-2714/compute-hsdir-set-instability b/task-2714/compute-hsdir-set-instability new file mode 100755 index 0000000..1a5e767 --- /dev/null +++ b/task-2714/compute-hsdir-set-instability @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# This script must be run as ./compute-hsdir-set-instability . + + +find out/consensus-hsdir-lists -type f -print | +sort | +tclsh8.5 compute-hsdir-set-instability.tcl | +tee out/hsdir-set-instability | +sed -e 's/$/ /' | +tr '\n' '\r' + diff --git a/task-2714/compute-hsdir-set-instability.tcl b/task-2714/compute-hsdir-set-instability.tcl new file mode 100644 index 0000000..24afb97 --- /dev/null +++ b/task-2714/compute-hsdir-set-instability.tcl @@ -0,0 +1,83 @@ + +set hsdir_set_name_list {} + +array set hsdir_sets {} + +proc read_file_lines {filename} { + set chanid [open $filename r] + set contents [read -nonewline $chanid] + close $chanid + + return [split $contents "\n"] +} + +proc get_hsdir_set_name {filename} { + return [file tail $filename] +} + +proc read_hsdir_set {set_name filename} { + global hsdir_sets + + set hsdir_set [read_file_lines $filename] + set hsdir_sets($set_name) $hsdir_set +} + +proc forget_hsdir_set {name} { + unset -nocomplain hsdir_sets($name) +} + +proc list_set_symmetric_difference_size {l1 l2} { + set l1 [lsort -ascii -unique $l1] + set l2 [lsort -ascii -unique $l2] + set both [lsort -ascii -unique [concat $l1 $l2]] + + set l1i 0 + set l2i 0 + #set result {} + set result_length 0 + + foreach x $both { + set n_inputs_containing_x 0 + if {[lindex $l1 $l1i] eq $x} { + incr l1i + incr n_inputs_containing_x + } + if {[lindex $l2 $l2i] eq $x} { + incr l2i + incr n_inputs_containing_x + } + if {$n_inputs_containing_x & 1} { + #lappend result $x + incr result_length + } + } + + #return $result + return $result_length +} +rename list_set_symmetric_difference_size lssds + +while {![eof stdin]} { + set x [gets stdin hsdir_set_filename] + if {$x == -1} {break} + + set hsdir_set_name [get_hsdir_set_name $hsdir_set_filename] + read_hsdir_set $hsdir_set_name $hsdir_set_filename + + lappend hsdir_set_name_list $hsdir_set_name + + if {[llength $hsdir_set_name_list] == 5} { + lassign $hsdir_set_name_list set0 set1 set2 set3 set4 + + puts "$set0\ + [llength $hsdir_sets($set0)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set1)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set2)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set3)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set4)]" + + forget_hsdir_set [lindex $hsdir_set_name_list 0] + set hsdir_set_name_list [lrange $hsdir_set_name_list 1 end] + } +} + diff --git a/task-2714/generate-consensus-hsdir-lists b/task-2714/generate-consensus-hsdir-lists new file mode 100755 index 0000000..9c09ac8 --- /dev/null +++ b/task-2714/generate-consensus-hsdir-lists @@ -0,0 +1,28 @@ +#!/bin/sh -e + +# This script must be run as ./generate-consensus-hsdir-lists . + +# This script will die horribly later if $consensus_archive_dir +# expands to a string containing a shell metacharacter, so don't try +# to not die now. +test -z $consensus_archive_dir && +export consensus_archive_dir=/usr/local/opt/tor-consensuses + + +mkdir -m 0700 -p dev/ +for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i || true ;done + +mkdir -p out/consensus-hsdir-lists + + +(cd "$consensus_archive_dir" ;find consensuses-* -type f -print ) | +sed -e 's|^|./list-consensus-hsdirs |' | +linedemux --fname -- dev/in0 dev/in1 dev/in2 dev/in3 & + +sh <dev/in0 >dev/out0 & +sh <dev/in1 >dev/out1 & +sh <dev/in2 >dev/out2 & +sh <dev/in3 >dev/out3 & + +linemux --fname -- dev/out0 dev/out1 dev/out2 dev/out3 + diff --git a/task-2714/graph-hsdir-set-instability b/task-2714/graph-hsdir-set-instability new file mode 100755 index 0000000..013d287 --- /dev/null +++ b/task-2714/graph-hsdir-set-instability @@ -0,0 +1,9 @@ +#!/bin/sh -e + +# This script must be run as ./graph-hsdir-set-instability . + +gnuplot >out/hsdir-set-instability-graph.ps <<EOF +set terminal postscript color solid +load "graph-hsdir-set-instability.gnuplot" +EOF + diff --git a/task-2714/graph-hsdir-set-instability.gnuplot b/task-2714/graph-hsdir-set-instability.gnuplot new file mode 100644 index 0000000..c497395 --- /dev/null +++ b/task-2714/graph-hsdir-set-instability.gnuplot @@ -0,0 +1,12 @@ + +set xdata time +set timefmt "%Y-%m-%d-%H-%M-%S" +set format x "%Y-%m" +set xrange ["2011-01-01-00-00-00":] +set yrange [0:1] + +plot "out/hsdir-set-instability" using 1:(0):($6/$2) with filledcurves title "4 hr",\ + "out/hsdir-set-instability" using 1:(0):($5/$2) with filledcurves title "3 hr",\ + "out/hsdir-set-instability" using 1:(0):($4/$2) with filledcurves title "2 hr",\ + "out/hsdir-set-instability" using 1:(0):($3/$2) with filledcurves title "1 hr" + diff --git a/task-2714/list-consensus-hsdirs b/task-2714/list-consensus-hsdirs new file mode 100755 index 0000000..d6edb27 --- /dev/null +++ b/task-2714/list-consensus-hsdirs @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# This script must be run as ./list-consensus-hsdirs , by +# generate-consensus-hsdir-lists. + +consensus_file="$1" + + +consensus_basename="$(basename "$consensus_file" -consensus )" +hsdir_list_dir="out/consensus-hsdir-lists/$(echo "$consensus_basename" |cut -f 1-2 -d - )" +hsdir_list_name="$hsdir_list_dir/$consensus_basename" + + +mkdir -p "$hsdir_list_dir" + +awk -f list-consensus-hsdirs.awk <"$consensus_archive_dir/$consensus_file" >"$hsdir_list_name" + +echo "generated HSDir list $consensus_basename" + diff --git a/task-2714/list-consensus-hsdirs.awk b/task-2714/list-consensus-hsdirs.awk new file mode 100644 index 0000000..343c5e7 --- /dev/null +++ b/task-2714/list-consensus-hsdirs.awk @@ -0,0 +1,25 @@ + +BEGIN { + OFS=":" + idDigest="<oops>" +} + +$1 == "r" { + idDigest=$3 +} + +$1 == "s" { + isHSDir=0 + for (i = NF; i >= 1; --i) { + if ($i == "HSDir") { + isHSDir=1 + } + } + + if (isHSDir != 0) { + print idDigest + } + + idDigest="<oops>" +} +

1 0

[metrics-tasks/master] Merge remote branch 'rransom/task-2714'
by karsten＠torproject.org 31 May '11

31 May '11

commit 073bb839180811c66bd8d8c617b5bdc41e2a46ba Merge: a7ad71b c0e88f4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 31 08:30:54 2011 +0200 Merge remote branch 'rransom/task-2714' task-2649/.gitignore | 2 - task-2649/MOVED | 1 + task-2649/README | 31 ------- task-2649/compute-hsdir-set-instability | 12 --- task-2649/compute-hsdir-set-instability.tcl | 83 -------------------- task-2649/generate-consensus-hsdir-lists | 28 ------- task-2649/graph-hsdir-set-instability | 9 -- task-2649/graph-hsdir-set-instability.gnuplot | 11 --- task-2649/list-consensus-hsdirs | 19 ----- task-2649/list-consensus-hsdirs.awk | 25 ------ task-2714/.gitignore | 3 + task-2714/README | 32 ++++++++ task-2714/compute-hsdir-set-instability | 12 +++ task-2714/compute-hsdir-set-instability.tcl | 83 ++++++++++++++++++++ task-2714/generate-consensus-hsdir-lists | 28 +++++++ task-2714/graph-hsdir-set-absolute-instability | 9 ++ .../graph-hsdir-set-absolute-instability.gnuplot | 12 +++ task-2714/graph-hsdir-set-instability | 9 ++ task-2714/graph-hsdir-set-instability.gnuplot | 12 +++ task-2714/list-consensus-hsdirs | 19 +++++ task-2714/list-consensus-hsdirs.awk | 25 ++++++ 21 files changed, 245 insertions(+), 220 deletions(-)

1 0