September 2012 - tor-commits - lists.torproject.org

[flashproxy/master] --help alignment.
by dcf＠torproject.org 25 Sep '12

25 Sep '12

commit 5019a7999d2fad0c036e06cc9bb59fe4a77db33e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 24 00:32:54 2012 -0700 --help alignment. --- flashproxy-client | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 692a0f0..14ea1bc 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -70,7 +70,7 @@ register in some way in order to get any service. The --facilitator option allows controlling which facilitator is used; if omitted, it uses a public default. - --daemon daemonize (Unix only). + --daemon daemonize (Unix only). -f, --facilitator=URL advertise willingness to receive connections to URL. -h, --help show this help. -l, --log FILENAME write log to FILENAME (default stdout). @@ -78,7 +78,7 @@ default. -r, --register register with the facilitator. --register-addr=ADDR register the given address (in case it differs from REMOTE). Implies --register. - --unsafe-logging don't scrub IP addresses from logs.\ + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "local_port": DEFAULT_LOCAL_PORT,

1 0

r25817: {website} Added tor-reports mailing list (website/trunk/docs/en)
by Sebastian Hahn 24 Sep '12

24 Sep '12

Author: sebastian Date: 2012-09-24 23:01:16 +0000 (Mon, 24 Sep 2012) New Revision: 25817 Modified: website/trunk/docs/en/documentation.wml Log: Added tor-reports mailing list Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-09-24 20:55:29 UTC (rev 25816) +++ website/trunk/docs/en/documentation.wml 2012-09-24 23:01:16 UTC (rev 25817) @@ -200,6 +200,7 @@ commits</a> may be interesting for developers.</li> <li>An automated list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs/">bug reports from trac</a> may be interesting for users and developers.</li> + <li>A list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-reports/">Tor stats reports.</li> </ul> <a id="DesignDoc"></a>

1 0

r25816: {} add images from the latest presentations for sake of posteri (projects/presentations/images)
by Andrew Lewman 24 Sep '12

24 Sep '12

Author: phobos Date: 2012-09-24 20:55:29 +0000 (Mon, 24 Sep 2012) New Revision: 25816 Added: projects/presentations/images/2012-08-29-bitcoin-ponzi-scheme.png projects/presentations/images/2012-08-30-anon-optelecomix.png projects/presentations/images/331855-4361-7.jpg projects/presentations/images/BC_Logotype.png projects/presentations/images/GZ07v.jpg projects/presentations/images/Ia7Hz.png projects/presentations/images/Riot_Police_011.jpg projects/presentations/images/anonymous_logo_by_viperaviator-d4bwqvn.png projects/presentations/images/botnet-oper-bronie.png projects/presentations/images/img_7399.jpg projects/presentations/images/nO8sV.jpg projects/presentations/images/riot-police_9-2-08.jpg projects/presentations/images/romainian-riot-police.jpg projects/presentations/images/technology11.jpg projects/presentations/images/telecomix_logo_by_xp0s3-d5alqnr.png projects/presentations/images/twid-water-balloons.jpg projects/presentations/images/what_will_sgt__joe_friday_say_about_world_today__by_fadetoblack88-d4n7hmm.png projects/presentations/images/world-map-of-social-networks.jpg Log: add images from the latest presentations for sake of posterity Added: projects/presentations/images/2012-08-29-bitcoin-ponzi-scheme.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2012-08-29-bitcoin-ponzi-scheme.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2012-08-30-anon-optelecomix.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2012-08-30-anon-optelecomix.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/331855-4361-7.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/331855-4361-7.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/BC_Logotype.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/BC_Logotype.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/GZ07v.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/GZ07v.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/Ia7Hz.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/Ia7Hz.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/Riot_Police_011.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/Riot_Police_011.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/anonymous_logo_by_viperaviator-d4bwqvn.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/anonymous_logo_by_viperaviator-d4bwqvn.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/botnet-oper-bronie.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/botnet-oper-bronie.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/img_7399.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/img_7399.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/nO8sV.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/nO8sV.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/riot-police_9-2-08.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/riot-police_9-2-08.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/romainian-riot-police.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/romainian-riot-police.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/technology11.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/technology11.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/telecomix_logo_by_xp0s3-d5alqnr.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/telecomix_logo_by_xp0s3-d5alqnr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/twid-water-balloons.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/twid-water-balloons.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/what_will_sgt__joe_friday_say_about_world_today__by_fadetoblack88-d4n7hmm.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/what_will_sgt__joe_friday_say_about_world_today__by_fadetoblack88-d4n7hmm.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/world-map-of-social-networks.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/world-map-of-social-networks.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

[tor-cloud/master] Let normal bridges be obfsproxy bridges as well
by runa＠torproject.org 24 Sep '12

24 Sep '12

commit ac98111c72302022459193868c14139391be0f89 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Sep 24 20:40:27 2012 +0100 Let normal bridges be obfsproxy bridges as well --- ec2-prep.sh | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 0db2765..f3033ce 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -1,9 +1,8 @@ #!/bin/bash -e -# ec2-prep by: Jacob Appelbaum -# git://git.torproject.org/ioerror/tor-cloud.git -# This is the code to run on an Ubuntu machine to prep it as a relay, bridge or +# Copyright (c) 2011 The Tor Project, Inc +# git://git.torproject.org/tor-cloud.git +# Set up an EC2 instance as either an (obfsproxy) bridge or a normal # private bridge -# USER="`whoami`"; DISTRO="`lsb_release -c|cut -f2`"; SOURCES="/etc/apt/sources.list"; @@ -158,13 +157,13 @@ apt-key add $GPGKEY # Install Tor and arm echo "Installing Tor..."; apt-get update -apt-get -y install tor tor-geoipdb tor-arm deb.torproject.org-keyring +apt-get -y install tor tor-geoipdb tor-arm deb.torproject.org-keyring obfsproxy # Configure Tor echo "Configuring Tor..."; cp /etc/tor/torrc /etc/tor/torrc.bkp -# Normal bridge +# (Obfsproxy) bridge if [ $CONFIG == "bridge" ]; then echo "Configuring Tor as a $CONFIG"; cat << EOF > $CONFIG_FILE @@ -187,6 +186,9 @@ ORListenAddress 0.0.0.0:9001 # Start Tor as a bridge. BridgeRelay 1 +# Run obfsproxy +ServerTransportPlugin obfs2 exec /usr/bin/obfsproxy --managed + # Never send or receive more than 10GB of data per week. The accounting # period runs from 10 AM on the 1st day of the week (Monday) to the same # day and time of the next week. @@ -197,8 +199,13 @@ AccountingMax 10 GB # so it shouldn't expose the operator to abuse complaints. ExitPolicy reject *:* EOF + +# Edit /var/lib/tor/state and change the obfs port +/etc/init.d/tor reload +/etc/init.d/tor stop +sed -i 's/TransportProxy.*/TransportProxy obfs2 0.0.0.0:52176/' /var/lib/tor/state echo "Done configuring the system, will reboot" -echo "Your system has been configured as a Tor bridge, see https://cloud.torproject.org/ for more info" > /etc/ec2-prep.sh +echo "Your system has been configured as a Tor obfsproxy bridge, see https://cloud.torproject.org/ for more info" > /etc/ec2-prep.sh reboot fi

1 0

[tor-cloud/master] Do not hardcode distro name
by runa＠torproject.org 24 Sep '12

24 Sep '12

commit 16519bc465e1a024bb8e4bf449e874ecf310cd08 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Sep 24 20:28:13 2012 +0100 Do not hardcode distro name --- ec2-prep.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 9236527..0db2765 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -50,11 +50,11 @@ EOF cat << EOF > $UNATTENDED_UPGRADES // Automatically upgrade packages from these (origin, archive) pairs Unattended-Upgrade::Allowed-Origins { - "Ubuntu lucid"; - "Ubuntu lucid-security"; - "Ubuntu lucid-updates"; - "TorProject lucid"; - "TorProject experimental-lucid"; + "Ubuntu $DISTRO"; + "Ubuntu $DISTRO-security"; + "Ubuntu $DISTRO-updates"; + "TorProject $DISTRO"; + "TorProject experimental-$DISTRO"; }; // Automatically reboot *WITHOUT CONFIRMATION* if the file

1 0

r25815: {website} update mirror status. (in website/trunk: . include)
by Andrew Lewman 24 Sep '12

24 Sep '12

Author: phobos Date: 2012-09-24 18:07:55 +0000 (Mon, 24 Sep 2012) New Revision: 25815 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-09-22 23:26:52 UTC (rev 25814) +++ website/trunk/include/mirrors-table.wmi 2012-09-24 18:07:55 UTC (rev 25815) @@ -35,6 +35,23 @@ <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>US</td> <td>Quintex</td> @@ -273,23 +290,6 @@ <tr> - <td>US</td> - - <td>hessmo</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>crazyhaze.de</td> @@ -715,15 +715,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td></td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> - <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,32 +732,32 @@ <tr> - <td>INT</td> + <td>DE</td> - <td>CoralCDN</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> - <td>Amorphis</td> + <td></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><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -766,15 +766,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>hessmo</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -783,28 +783,11 @@ <tr> - <td>DE</td> - - <td>[[:bbs:]]</td> - - <td>Out of date</td> - - <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>searchprivate</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://tor.searchprivate.com/dist/">http</a></td> @@ -821,7 +804,7 @@ <td>India Tor Fans</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://www.torproject.org.in/dist/">http</a></td> @@ -838,7 +821,7 @@ <td></td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://tor.freie-re.de/dist/">http</a></td> @@ -855,7 +838,7 @@ <td></td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://tor.loritsu.com/dist/">http</a></td> @@ -906,7 +889,7 @@ <td></td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td> - </td> @@ -916,3 +899,37 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td>US</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-09-22 23:26:52 UTC (rev 25814) +++ website/trunk/update-mirrors.pl 2012-09-24 18:07:55 UTC (rev 25815) @@ -1088,6 +1088,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror076 => { + adminContact => "", + orgName => "", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.nametoday.me/tor/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.nametoday.me/tor/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[doctor/master] Add UseOptimisticData to set of known consensus params.
by karsten＠torproject.org 24 Sep '12

24 Sep '12

commit e65fb018244db01927832d15dce764e607c2b9c6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 24 13:16:18 2012 -0400 Add UseOptimisticData to set of known consensus params. --- src/org/torproject/doctor/Checker.java | 4 ++-- .../torproject/doctor/MetricsWebsiteReport.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index 86ef7f7..4a96bf1 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -260,8 +260,8 @@ public class Checker { ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," - + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate"). - split(","))); + + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate," + + "UseOptimisticData").split(","))); SortedSet<String> conflicts = new TreeSet<String>(); for (RelayNetworkStatusVote vote : this.downloadedVotes) { Map<String, Integer> voteConsensusParams = diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java index 9c634ca..d81c362 100644 --- a/src/org/torproject/doctor/MetricsWebsiteReport.java +++ b/src/org/torproject/doctor/MetricsWebsiteReport.java @@ -426,7 +426,8 @@ public class MetricsWebsiteReport { ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," - + "cbtmintimeout,cbtinitialtimeout").split(","))); + + "cbtmintimeout,cbtinitialtimeout,perconnbwburst," + + "perconnbwrate,UseOptimisticData").split(","))); Map<String, Integer> consensusConsensusParams = downloadedConsensus.getConsensusParams(); for (RelayNetworkStatusVote vote : this.downloadedVotes.values()) {

1 0

[doctor/master] Distinguish between conflicting and unknown consensus params.
by karsten＠torproject.org 24 Sep '12

24 Sep '12

commit 1ea13ab733bbd97e16ff76d56c26bcc7eb888090 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 24 13:13:51 2012 -0400 Distinguish between conflicting and unknown consensus params. Fixes #6904. --- src/org/torproject/doctor/Checker.java | 62 ++++++++++++++++------- src/org/torproject/doctor/StatusFileReport.java | 11 +++- src/org/torproject/doctor/Warning.java | 10 +++- 3 files changed, 58 insertions(+), 25 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index 9de06cb..86ef7f7 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -38,7 +38,8 @@ public class Checker { if (this.isConsensusFresh(this.downloadedConsensus)) { this.checkConsensusMethods(); this.checkRecommendedVersions(); - this.checkConsensusParameters(); + this.checkUnknownConsensusParameters(); + this.checkConflictingConsensusParameters(); this.checkAuthorityKeys(); this.checkMissingVotes(); this.checkBandwidthScanners(); @@ -253,10 +254,9 @@ public class Checker { } } - /* Check if a vote contains conflicting or invalid consensus - * parameters. */ - private void checkConsensusParameters() { - Set<String> validParameters = new HashSet<String>(Arrays.asList( + /* Check if a vote contains unknown consensus parameters. */ + private void checkUnknownConsensusParameters() { + Set<String> knownParameters = new HashSet<String>(Arrays.asList( ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," @@ -266,31 +266,55 @@ public class Checker { for (RelayNetworkStatusVote vote : this.downloadedVotes) { Map<String, Integer> voteConsensusParams = vote.getConsensusParams(); - boolean conflictOrInvalid = false; if (voteConsensusParams != null) { + StringBuilder message = new StringBuilder(); + message.append(vote.getNickname()); + int unknownParameters = 0; + for (Map.Entry<String, Integer> e : + voteConsensusParams.entrySet()) { + if (!knownParameters.contains(e.getKey()) && + !e.getKey().startsWith("bwauth")) { + message.append(" " + e.getKey() + "=" + e.getValue()); + unknownParameters++; + } + } + if (unknownParameters > 0) { + conflicts.add(message.toString()); + } + } + } + if (!conflicts.isEmpty()) { + this.warnings.put(Warning.UnknownConsensusParams, conflicts); + } + } + + /* Check if a vote contains conflicting consensus parameters. */ + private void checkConflictingConsensusParameters() { + SortedSet<String> conflicts = new TreeSet<String>(); + for (RelayNetworkStatusVote vote : this.downloadedVotes) { + Map<String, Integer> voteConsensusParams = + vote.getConsensusParams(); + if (voteConsensusParams != null) { + StringBuilder message = new StringBuilder(); + message.append(vote.getNickname()); + int conflictingParameters = 0; for (Map.Entry<String, Integer> e : voteConsensusParams.entrySet()) { if (!downloadedConsensus.getConsensusParams().containsKey( e.getKey()) || !downloadedConsensus.getConsensusParams().get(e.getKey()). - equals(e.getValue()) || - (!validParameters.contains(e.getKey()) && - !e.getKey().startsWith("bwauth"))) { - StringBuilder message = new StringBuilder(); - message.append(vote.getNickname()); - for (Map.Entry<String, Integer> p : - voteConsensusParams.entrySet()) { - message.append(" " + p.getKey() + "=" + p.getValue()); - } - conflicts.add(message.toString()); - break; + equals(e.getValue())) { + message.append(" " + e.getKey() + "=" + e.getValue()); + conflictingParameters++; } } + if (conflictingParameters > 0) { + conflicts.add(message.toString()); + } } } if (!conflicts.isEmpty()) { - this.warnings.put(Warning.ConflictingOrInvalidConsensusParams, - conflicts); + this.warnings.put(Warning.ConflictingConsensusParams, conflicts); } } diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index a0aef09..107b435 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -114,10 +114,15 @@ public class StatusFileReport { + "authorities recommend other server versions than the " + "consensus: " + detailsString, 150L * 60L * 1000L); break; - case ConflictingOrInvalidConsensusParams: + case UnknownConsensusParams: warningStrings.put("NOTICE: The following directory " - + "authorities set conflicting or invalid consensus " - + "parameters: " + detailsString, 330L * 60L * 1000L); + + "authorities set unknown consensus parameters: " + + detailsString, 330L * 60L * 1000L); + break; + case ConflictingConsensusParams: + warningStrings.put("NOTICE: The following directory " + + "authorities set conflicting consensus parameters: " + + detailsString, 330L * 60L * 1000L); break; case CertificateExpiresInThreeMonths: warningStrings.put("NOTICE: The certificates of the following " diff --git a/src/org/torproject/doctor/Warning.java b/src/org/torproject/doctor/Warning.java index ca1181a..8194425 100644 --- a/src/org/torproject/doctor/Warning.java +++ b/src/org/torproject/doctor/Warning.java @@ -28,9 +28,13 @@ public enum Warning { * versions than the ones in the consensus. */ DifferentRecommendedServerVersions, - /* One or more directory authorities set conflicting or invalid - * consensus parameters. */ - ConflictingOrInvalidConsensusParams, + /* One or more directory authorities set unknown consensus + * parameters. */ + UnknownConsensusParams, + + /* One or more directory authorities set conflicting consensus + * parameters. */ + ConflictingConsensusParams, /* The certificate(s) of one or more directory authorities expire within * the next three months, which we warn about just once. */

1 0

[stem/master] Couple minor fixes for tests
by atagar＠torproject.org 24 Sep '12

24 Sep '12

commit 5a0da767e086aab1f196f60ed9fd042eb6825db4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 24 09:00:08 2012 -0700 Couple minor fixes for tests Correcting an ImportError due to test.util being moved, and preventing the 'is valid IP' check from being a no-op. --- test/integ/control/controller.py | 8 ++++---- test/util.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2af68c3..7c6708f 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -15,7 +15,7 @@ import stem.socket import stem.version import stem.response.protocolinfo import test.runner -import test.utils +import test.util class TestController(unittest.TestCase): def test_from_port(self): @@ -418,13 +418,13 @@ class TestController(unittest.TestCase): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect(('127.0.0.1', int(controller.get_conf('SocksPort')))) - test.utils.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(test.utils.ip_request) # make the http request for the ip address + test.util.negotiate_socks(s, '1.2.1.2', 80) + s.sendall(test.util.ip_request) # make the http request for the ip address response = s.recv(1000) # everything after the blank line is the 'data' in a HTTP response. # The response data for our request for request should be an IP address + '\n' ip_addr = response[response.find("\r\n\r\n"):].strip() - stem.util.connection.is_valid_ip_address(ip_addr) + self.assertTrue(stem.util.connection.is_valid_ip_address(ip_addr)) diff --git a/test/util.py b/test/util.py index 51e9bd9..ddc96f0 100644 --- a/test/util.py +++ b/test/util.py @@ -37,7 +37,7 @@ def external_ip(sock): # The response data for our request for request should be an IP address + '\n' return response[response.find("\r\n\r\n"):].strip() except: - pass + return None def negotiate_socks(sock, host, port): """

1 0

[stem/master] Fix a typo
by atagar＠torproject.org 24 Sep '12

24 Sep '12

commit 060c82b3a874c88159ee4a20803c93f22512851a Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Sun Sep 23 11:45:33 2012 +0530 Fix a typo --- stem/util/conf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 8ffcc8e..9781370 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -94,7 +94,7 @@ def config_dict(handle, conf_mappings, handler = None): for staying in sync is similar to the Config class' synchronize() method, only changing the dictionary's values if we're able to cast to the same type. - If an handler is provided then this is called just prior to assigning new + If a handler is provided then this is called just prior to assigning new values to the config_dict. The handler function is expected to accept the (key, value) for the new values and return what we should actually insert into the dictionary. If this returns None then the value is updated as

1 0