- tor-commits - lists.torproject.org

[tor/master] Move tor_gettimeofday_cached() into compat_libevent
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit e62104a7d21432380c66db1901215412e9c53ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 10:31:34 2012 -0400 Move tor_gettimeofday_cached() into compat_libevent --- changes/move_cached_gtod | 3 +++ src/common/compat_libevent.c | 34 ++++++++++++++++++++++++++++++++++ src/common/compat_libevent.h | 3 +++ src/or/relay.c | 23 ----------------------- src/or/relay.h | 2 -- 5 files changed, 40 insertions(+), 25 deletions(-) diff --git a/changes/move_cached_gtod b/changes/move_cached_gtod new file mode 100644 index 0000000..53d8092 --- /dev/null +++ b/changes/move_cached_gtod @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move tor_gettimeofday_cached() into compat_libevent.c, and use + Libevent's notion of cached time when possible. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 9f7ac63..544d16a 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -689,3 +689,37 @@ tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, } #endif +#if defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER >= V(2,1,1) +void +tor_gettimeofday_cached(struct timeval *tv) +{ + event_base_gettimeofday_cached(the_event_base, tv); +} +void +tor_gettimeofday_cache_clear(void) +{ + event_base_update_cache_time(the_event_base); +} +#else +/** Cache the current hi-res time; the cache gets reset when libevent + * calls us. */ +static struct timeval cached_time_hires = {0, 0}; + +/** Return a fairly recent view of the current time. */ +void +tor_gettimeofday_cached(struct timeval *tv) +{ + if (cached_time_hires.tv_sec == 0) { + tor_gettimeofday(&cached_time_hires); + } + *tv = cached_time_hires; +} + +/** Reset the cached view of the current time, so that the next time we try + * to learn it, we will get an up-to-date value. */ +void +tor_gettimeofday_cache_clear(void) +{ + cached_time_hires.tv_sec = 0; +} +#endif diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 224c76f..56285ef 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -88,5 +88,8 @@ int tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, struct bufferevent_rate_limit_group *g); #endif +void tor_gettimeofday_cached(struct timeval *tv); +void tor_gettimeofday_cache_clear(void); + #endif diff --git a/src/or/relay.c b/src/or/relay.c index 8bbc989..3f894bf 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -52,11 +52,6 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); -/* XXXX023 move this all to compat_libevent */ -/** Cache the current hi-res time; the cache gets reset when libevent - * calls us. */ -static struct timeval cached_time_hires = {0, 0}; - /** Stop reading on edge connections when we have this many cells * waiting on the appropriate queue. */ #define CELL_QUEUE_HIGHWATER_SIZE 256 @@ -64,24 +59,6 @@ static struct timeval cached_time_hires = {0, 0}; * cells. */ #define CELL_QUEUE_LOWWATER_SIZE 64 -/** Return a fairly recent view of the current time. */ -static void -tor_gettimeofday_cached(struct timeval *tv) -{ - if (cached_time_hires.tv_sec == 0) { - tor_gettimeofday(&cached_time_hires); - } - *tv = cached_time_hires; -} - -/** Reset the cached view of the current time, so that the next time we try - * to learn it, we will get an up-to-date value. */ -void -tor_gettimeofday_cache_clear(void) -{ - cached_time_hires.tv_sec = 0; -} - /** Stats: how many relay cells have originated at this hop, or have * been relayed onward (not recognized at this hop)? */ diff --git a/src/or/relay.h b/src/or/relay.h index 6a54373..41675e2 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,8 +64,6 @@ void cell_ewma_set_scale_factor(const or_options_t *options, const networkstatus_t *consensus); void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); -void tor_gettimeofday_cache_clear(void); - #ifdef RELAY_PRIVATE int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, crypt_path_t **layer_hint, char *recognized);

1 0

[tor/master] Change a silent ignore-the-bug in microdesc.c to a LOG_INFO
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 32bf25888110482255cda8bcc77fb4fc7d8c0d38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 10:40:37 2012 -0400 Change a silent ignore-the-bug in microdesc.c to a LOG_INFO I don't believe this bug occurs, but there was an XXX023 to make sure it doesn't. --- changes/log_bad_md_entry | 3 +++ src/or/microdesc.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/log_bad_md_entry b/changes/log_bad_md_entry new file mode 100644 index 0000000..3c65327 --- /dev/null +++ b/changes/log_bad_md_entry @@ -0,0 +1,3 @@ + o Minor features (debugging): + - Log a BUG message at INFO if we have a networkstatus with a missing + entry for some microdescriptor. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 10dab25..d5a27d5 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -643,8 +643,13 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, continue; if (skip && digestmap_get(skip, rs->descriptor_digest)) continue; - if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) - continue; /* This indicates a bug somewhere XXXX023*/ + if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) { + log_info(LD_BUG, "Found an entry in networktatus with no microdescriptor " + "digest. (Router %s=%s at %s:%d.)", rs->nickname, + hex_str(rs->identity_digest, DIGEST_LEN), + fmt_addr32(rs->addr), rs->or_port); + continue; + } /* XXXX Also skip if we're a noncache and wouldn't use this router. * XXXX NM Microdesc */

1 0

[tor/master] Check the correct consensus before giving it to the client
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit cc21e56ed4cfc9c83b2cbfef9a8ff088471f7925 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 10:50:41 2012 -0400 Check the correct consensus before giving it to the client Previously, a directory would check the latest NS consensus for having the signatures the client wanted, and use that consensus's valid_until time to set the HTTP lifetime. With this patch, the directory looks at NS consensus or the microdesc consensus, depending on what the client asked for. --- changes/check_correct_flav_sigs | 4 ++++ src/or/directory.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/check_correct_flav_sigs b/changes/check_correct_flav_sigs new file mode 100644 index 0000000..db21182 --- /dev/null +++ b/changes/check_correct_flav_sigs @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When checking for requested signatures on the latest consensus before + serving it to a client, make sure to check the right consensus flavor. + Bugfix on 0.2.2.6-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index ee05ff8..1fb4835 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2775,10 +2775,11 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, else request_type = "/tor/status/?"; } else { - networkstatus_t *v = networkstatus_get_latest_consensus(); + networkstatus_t *v; time_t now = time(NULL); const char *want_fps = NULL; char *flavor = NULL; + int flav = FLAV_NS; #define CONSENSUS_URL_PREFIX "/tor/status-vote/current/consensus/" #define CONSENSUS_FLAVORED_PREFIX "/tor/status-vote/current/consensus-" /* figure out the flavor if any, and who we wanted to sign the thing */ @@ -2792,12 +2793,16 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } else { flavor = tor_strdup(f); } + flav = networkstatus_parse_flavor_name(flavor); + if (flav < 0) + flav = FLAV_NS; } else { if (!strcmpstart(url, CONSENSUS_URL_PREFIX)) want_fps = url+strlen(CONSENSUS_URL_PREFIX); } - /* XXXX023 MICRODESC NM NM should check document of correct flavor */ + v = networkstatus_get_latest_consensus_by_flavor(flav); + if (v && want_fps && !client_likes_consensus(v, want_fps)) { write_http_status_line(conn, 404, "Consensus not signed by sufficient "

1 0

[tor/master] Merge remote-tracking branch 'public/xxx023'
by nickm＠torproject.org 15 Jun '12

15 Jun '12

1 0

[torspec/master] Update proposal status: anything not done for 0.2.3 is not getting done for 0.2.3
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 4cda4b42288221893a25ef25875ebda3062fac0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 16:10:15 2012 -0400 Update proposal status: anything not done for 0.2.3 is not getting done for 0.2.3 --- proposals/000-index.txt | 26 +++++++++++----------- proposals/117-ipv6-exits.txt | 2 +- proposals/147-prevoting-opinions.txt | 2 +- proposals/157-specific-cert-download.txt | 2 +- proposals/172-circ-getinfo-option.txt | 1 - proposals/173-getinfo-option-expansion.txt | 1 - proposals/177-flag-abstention.txt | 2 +- proposals/180-pluggable-transport.txt | 4 +- proposals/186-multiple-orports.txt | 8 ++++++- proposals/198-restore-clienthello-semantics.txt | 8 ++++++- proposals/199-bridgefinder-integration.txt | 2 +- 11 files changed, 34 insertions(+), 24 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index edab8f2..0293b44 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -100,13 +100,13 @@ Proposals by number: 177 Abstaining from votes on individual flags [OPEN] 178 Require majority of authorities to vote for consensus parameters [CLOSED] 179 TLS certificate and parameter normalization [CLOSED] -180 Pluggable transports for circumvention [OPEN] +180 Pluggable transports for circumvention [FINISHED] 181 Optimistic Data for Tor: Client Side [CLOSED] 182 Credit Bucket [DRAFT] 183 Refill Intervals [CLOSED] 184 Miscellaneous changes for a v3 Tor link protocol [CLOSED] 185 Directory caches without DirPort [OPEN] -186 Multiple addresses for one OR or bridge [DRAFT] +186 Multiple addresses for one OR or bridge [ACCEPTED] 187 Reserve a cell type to allow client authorization [CLOSED] 188 Bridge Guards and other anti-enumeration defenses [OPEN] 189 AUTHORIZE and AUTHORIZED cells [OPEN] @@ -118,7 +118,7 @@ Proposals by number: 195 TLS certificate normalization for Tor 0.2.4.x [DRAFT] 196 Extended ORPort and TransportControlPort [OPEN] 197 Message-based Inter-Controller IPC Channel [OPEN] -198 Restore semantics of TLS ClientHello [OPEN] +198 Restore semantics of TLS ClientHello [ACCEPTED] 199 Integration of BridgeFinder and BridgeFinderHelper [OPEN] 200 Adding new, extensible CREATE, EXTEND, and related cells [OPEN] 201 Make bridges report statistics on daily v3 network status requests [OPEN] @@ -134,7 +134,6 @@ Proposals by status: 144 Increase the diversity of circuits by detecting nodes belonging the same provider 175 Automatically promoting Tor clients to nodes 182 Credit Bucket - 186 Multiple addresses for one OR or bridge 195 TLS certificate normalization for Tor 0.2.4.x [for 0.2.4.x] NEEDS-REVISION: 131 Help users to verify they are using Tor @@ -149,8 +148,7 @@ Proposals by status: 164 Reporting the status of server votes 165 Easy migration for voting authority sets 168 Reduce default circuit window - 177 Abstaining from votes on individual flags [for 0.2.3.x] - 180 Pluggable transports for circumvention [for 0.2.3.x] + 177 Abstaining from votes on individual flags [for 0.2.4.x] 185 Directory caches without DirPort 188 Bridge Guards and other anti-enumeration defenses 189 AUTHORIZE and AUTHORIZED cells @@ -159,17 +157,18 @@ Proposals by status: 194 Mnemonic .onion URLs 196 Extended ORPort and TransportControlPort [for 0.2.4.x] 197 Message-based Inter-Controller IPC Channel [for 0.2.4.x] - 198 Restore semantics of TLS ClientHello - 199 Integration of BridgeFinder and BridgeFinderHelper [for 0.2.3.x+] + 199 Integration of BridgeFinder and BridgeFinderHelper [for 0.2.4.x+] 200 Adding new, extensible CREATE, EXTEND, and related cells 201 Make bridges report statistics on daily v3 network status requests [for 0.2.4.x] ACCEPTED: - 117 IPv6 exits [for 0.2.3.x] + 117 IPv6 exits [for 0.2.4.x] 140 Provide diffs between consensuses - 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.3.x] - 157 Make certificate downloads specific [for 0.2.3.x] - 172 GETINFO controller option for circuit information [for 0.2.3.x] - 173 GETINFO Option Expansion [for 0.2.3.x] + 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x] + 157 Make certificate downloads specific [for 0.2.4.x] + 172 GETINFO controller option for circuit information + 173 GETINFO Option Expansion + 186 Multiple addresses for one OR or bridge [for 0.2.4.x+] + 198 Restore semantics of TLS ClientHello [for 0.2.4.x] META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -183,6 +182,7 @@ Proposals by status: 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] 161 Computing Bandwidth Adjustments [for 0.2.1.x] 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] + 180 Pluggable transports for circumvention [in 0.2.3.x] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] diff --git a/proposals/117-ipv6-exits.txt b/proposals/117-ipv6-exits.txt index 648c520..60ae332 100644 --- a/proposals/117-ipv6-exits.txt +++ b/proposals/117-ipv6-exits.txt @@ -3,7 +3,7 @@ Title: IPv6 exits Author: coderman Created: 10-Jul-2007 Status: Accepted -Target: 0.2.3.x +Target: 0.2.4.x Overview diff --git a/proposals/147-prevoting-opinions.txt b/proposals/147-prevoting-opinions.txt index 44c48f3..b9c571e 100644 --- a/proposals/147-prevoting-opinions.txt +++ b/proposals/147-prevoting-opinions.txt @@ -3,7 +3,7 @@ Title: Eliminate the need for v2 directories in generating v3 directories Author: Nick Mathewson Created: 2-Jul-2008 Status: Accepted -Target: 0.2.3.x +Target: 0.2.4.x Overview diff --git a/proposals/157-specific-cert-download.txt b/proposals/157-specific-cert-download.txt index 739c580..cf29dd9 100644 --- a/proposals/157-specific-cert-download.txt +++ b/proposals/157-specific-cert-download.txt @@ -3,7 +3,7 @@ Title: Make certificate downloads specific Author: Nick Mathewson Created: 2-Dec-2008 Status: Accepted -Target: 0.2.3.x +Target: 0.2.4.x History: diff --git a/proposals/172-circ-getinfo-option.txt b/proposals/172-circ-getinfo-option.txt index f716194..b7fd79c 100644 --- a/proposals/172-circ-getinfo-option.txt +++ b/proposals/172-circ-getinfo-option.txt @@ -3,7 +3,6 @@ Title: GETINFO controller option for circuit information Author: Damian Johnson Created: 03-June-2010 Status: Accepted -Target: 0.2.3.x Overview: diff --git a/proposals/173-getinfo-option-expansion.txt b/proposals/173-getinfo-option-expansion.txt index b9ba4bd..54356c9 100644 --- a/proposals/173-getinfo-option-expansion.txt +++ b/proposals/173-getinfo-option-expansion.txt @@ -3,7 +3,6 @@ Title: GETINFO Option Expansion Author: Damian Johnson Created: 02-June-2010 Status: Accepted -Target: 0.2.3.x Overview: diff --git a/proposals/177-flag-abstention.txt b/proposals/177-flag-abstention.txt index 8c83504..f63f1cc 100644 --- a/proposals/177-flag-abstention.txt +++ b/proposals/177-flag-abstention.txt @@ -3,7 +3,7 @@ Title: Abstaining from votes on individual flags Author: Nick Mathewson Created: 14 Feb 2011 Status: Open -Target: 0.2.3.x +Target: 0.2.4.x Overview: diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index e5e4ee7..c548675 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -2,8 +2,8 @@ Filename: 180-pluggable-transport.txt Title: Pluggable transports for circumvention Author: Jacob Appelbaum, Nick Mathewson Created: 15-Oct-2010 -Status: Open -Target: 0.2.3.x +Status: Finished +Implemented-In: 0.2.3.x Overview diff --git a/proposals/186-multiple-orports.txt b/proposals/186-multiple-orports.txt index 20638a5..926f92c 100644 --- a/proposals/186-multiple-orports.txt +++ b/proposals/186-multiple-orports.txt @@ -3,7 +3,13 @@ Title: Multiple addresses for one OR or bridge Author: Nick Mathewson Created: 19-Sep-2011 Supersedes: 118 -Status: Draft +Status: Accepted +Target: 0.2.4.x+ + +Status: + + This proposal is partially implemented to the extent needed to allow nodes + to have one IPv4 and one IPv6 address. Overview: diff --git a/proposals/198-restore-clienthello-semantics.txt b/proposals/198-restore-clienthello-semantics.txt index 0e97126..3e336b0 100644 --- a/proposals/198-restore-clienthello-semantics.txt +++ b/proposals/198-restore-clienthello-semantics.txt @@ -2,7 +2,13 @@ Filename: 198-restore-clienthello-semantics.txt Title: Restore semantics of TLS ClientHello Author: Nick Mathewson Created: 19-Mar-2012 -Status: Open +Status: Accepted +Target: 0.2.4.x + +Status: + + Tor 0.2.3.17-beta implements the client-side changes, and no longer + advertises openssl-supported TLS ciphersuites we don't have. Overview: diff --git a/proposals/199-bridgefinder-integration.txt b/proposals/199-bridgefinder-integration.txt index d3796ad..2fd6224 100644 --- a/proposals/199-bridgefinder-integration.txt +++ b/proposals/199-bridgefinder-integration.txt @@ -3,7 +3,7 @@ Title: Integration of BridgeFinder and BridgeFinderHelper Author: Mike Perry Created: 18-03-2012 Status: Open -Target: 0.2.3.x+ +Target: 0.2.4.x+ Overview

1 0

[tor/master] Downgrade an eventdns warning to PROTOCOL_WARN.
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit f9fddba53900f33218ff7f1623cffbe8753d3228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 7 13:03:39 2012 -0400 Downgrade an eventdns warning to PROTOCOL_WARN. --- changes/bug5932 | 3 +++ src/or/dns.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug5932 b/changes/bug5932 new file mode 100644 index 0000000..f2ca98e --- /dev/null +++ b/changes/bug5932 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN. + Fixes bug 5932; bugfix on 0.2.2.7-alpha. diff --git a/src/or/dns.c b/src/or/dns.c index 77c1a21..02447ec 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1437,7 +1437,7 @@ launch_resolve(edge_connection_t *exitconn) r = 0; if (!req) { - log_warn(LD_EXIT, "eventdns rejected address %s.", + log_fn(LOG_PROTOCOL_WARN, LD_EXIT, "eventdns rejected address %s.", escaped_safe_str(addr)); r = -1; tor_free(addr); /* There is no evdns request in progress; stop

1 0

[tor/master] Merge remote-tracking branch 'public/bug5932'
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 879b1e10101f4eb5ecfb37c7a51f2882c2ac3ea1 Merge: 8030ec4 f9fddba Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 14:44:32 2012 -0400 Merge remote-tracking branch 'public/bug5932' changes/bug5932 | 3 +++ src/or/dns.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0

[metrics-tasks/master] Add links to metrics.tpo graphs for every censorship incident.
by karsten＠torproject.org 15 Jun '12

15 Jun '12

commit ca2169aa0272ebe08d2e00c52435fabe3f9e25a5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 15 17:38:03 2012 +0300 Add links to metrics.tpo graphs for every censorship incident. --- task-2718/detector.py | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 9fa5584..5cc8bb7 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -356,6 +356,17 @@ def write_all(tss, minc, maxc, INTERVAL=7): ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close() +"""Return a URL that points to a graph in metrics.tpo that displays +the number of direct Tor users in country 'country_code', for a +'period'-days period. + +Let's hope that the metrics.tpo URL scheme doesn't change often. +""" +def get_tor_usage_graph_url_for_cc_and_date(country_code, dates, period): + url = "https://metrics.torproject.org/users.html?graph=direct-users&start=%s&end=%…" % \ + (dates[-period], dates[-1], country_code) + return url + """Write a file containing a short censorship report over the last 'notification_period' days. """ @@ -384,12 +395,15 @@ def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): file_prologue_written = True if ((upscores > 0) and (downscores == 0)): - s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users).\n" % \ + s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users):\n" % \ (get_country_name_from_cc(country_code), upscores, users_n) else: - s = "We detected %d potential censorship events in %s (users: %d, upscores: %d).\n" % \ + s = "We detected %d potential censorship events in %s (users: %d, upscores: %d):\n" % \ (downscores, get_country_name_from_cc(country_code), users_n, upscores) + # Also give out a link for the appropriate usage graph for a 90-days period. + s += get_tor_usage_graph_url_for_cc_and_date(country_code, tss.all_dates, 90) + report_file.write(s + "\n") report_file.close()

1 0

[metrics-tasks/master] Display country names instead of country codes.
by karsten＠torproject.org 15 Jun '12

15 Jun '12

commit fb0eb99ffcca02667a73a2a440f391173206227a Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 15 18:49:35 2012 +0300 Display country names instead of country codes. --- task-2718/country_info.py | 251 +++++++++++++++++++++++++++++++++++++++++++++ task-2718/detector.py | 19 +++- 2 files changed, 266 insertions(+), 4 deletions(-) diff --git a/task-2718/country_info.py b/task-2718/country_info.py new file mode 100644 index 0000000..9dbdeb5 --- /dev/null +++ b/task-2718/country_info.py @@ -0,0 +1,251 @@ +# -*- coding: utf-8 -*- + +countries = { + "ad" : "Andorra", + "ae" : "the United Arab Emirates", + "af" : "Afghanistan", + "ag" : "Antigua and Barbuda", + "ai" : "Anguilla", + "al" : "Albania", + "am" : "Armenia", + "an" : "the Netherlands Antilles", + "ao" : "Angola", + "aq" : "Antarctica", + "ar" : "Argentina", + "as" : "American Samoa", + "at" : "Austria", + "au" : "Australia", + "aw" : "Aruba", + "ax" : "the Aland Islands", + "az" : "Azerbaijan", + "ba" : "Bosnia and Herzegovina", + "bb" : "Barbados", + "bd" : "Bangladesh", + "be" : "Belgium", + "bf" : "Burkina Faso", + "bg" : "Bulgaria", + "bh" : "Bahrain", + "bi" : "Burundi", + "bj" : "Benin", + "bl" : "Saint Bartelemey", + "bm" : "Bermuda", + "bn" : "Brunei", + "bo" : "Bolivia", + "br" : "Brazil", + "bs" : "the Bahamas", + "bt" : "Bhutan", + "bv" : "the Bouvet Island", + "bw" : "Botswana", + "by" : "Belarus", + "bz" : "Belize", + "ca" : "Canada", + "cc" : "the Cocos (Keeling) Islands", + "cd" : "the Democratic Republic of the Congo", + "cf" : "Central African Republic", + "cg" : "Congo", + "ch" : "Switzerland", + "ci" : u"Côte d'Ivoire", + "ck" : "the Cook Islands", + "cl" : "Chile", + "cm" : "Cameroon", + "cn" : "China", + "co" : "Colombia", + "cr" : "Costa Rica", + "cu" : "Cuba", + "cv" : "Cape Verde", + "cx" : "the Christmas Island", + "cy" : "Cyprus", + "cz" : "the Czech Republic", + "de" : "Germany", + "dj" : "Djibouti", + "dk" : "Denmark", + "dm" : "Dominica", + "do" : "the Dominican Republic", + "dz" : "Algeria", + "ec" : "Ecuador", + "ee" : "Estonia", + "eg" : "Egypt", + "eh" : "the Western Sahara", + "er" : "Eritrea", + "es" : "Spain", + "et" : "Ethiopia", + "fi" : "Finland", + "fj" : "Fiji", + "fk" : "the Falkland Islands (Malvinas)", + "fm" : "the Federated States of Micronesia", + "fo" : "the Faroe Islands", + "fr" : "France", + "fx" : "Metropolitan France", + "ga" : "Gabon", + "gb" : "the United Kingdom", + "gd" : "Grenada", + "ge" : "Georgia", + "gf" : "French Guiana", + "gg" : "Guernsey", + "gh" : "Ghana", + "gi" : "Gibraltar", + "gl" : "Greenland", + "gm" : "Gambia", + "gn" : "Guinea", + "gp" : "Guadeloupe", + "gq" : "Equatorial Guinea", + "gr" : "Greece", + "gs" : "South Georgia and the South Sandwich Islands", + "gt" : "Guatemala", + "gu" : "Guam", + "gw" : "Guinea-Bissau", + "gy" : "Guyana", + "hk" : "Hong Kong", + "hm" : "Heard Island and McDonald Islands", + "hn" : "Honduras", + "hr" : "Croatia", + "ht" : "Haiti", + "hu" : "Hungary", + "id" : "Indonesia", + "ie" : "Ireland", + "il" : "Israel", + "im" : "the Isle of Man", + "in" : "India", + "io" : "the British Indian Ocean Territory", + "iq" : "Iraq", + "ir" : "Iran", + "is" : "Iceland", + "it" : "Italy", + "je" : "Jersey", + "jm" : "Jamaica", + "jo" : "Jordan", + "jp" : "Japan", + "ke" : "Kenya", + "kg" : "Kyrgyzstan", + "kh" : "Cambodia", + "ki" : "Kiribati", + "km" : "Comoros", + "kn" : "Saint Kitts and Nevis", + "kp" : "North Korea", + "kr" : "the Republic of Korea", + "kw" : "Kuwait", + "ky" : "the Cayman Islands", + "kz" : "Kazakhstan", + "la" : "Laos", + "lb" : "Lebanon", + "lc" : "Saint Lucia", + "li" : "Liechtenstein", + "lk" : "Sri Lanka", + "lr" : "Liberia", + "ls" : "Lesotho", + "lt" : "Lithuania", + "lu" : "Luxembourg", + "lv" : "Latvia", + "ly" : "Libya", + "ma" : "Morocco", + "mc" : "Monaco", + "md" : "the Republic of Moldova", + "me" : "Montenegro", + "mf" : "Saint Martin", + "mg" : "Madagascar", + "mh" : "the Marshall Islands", + "mk" : "Macedonia", + "ml" : "Mali", + "mm" : "Burma", + "mn" : "Mongolia", + "mo" : "Macau", + "mp" : "the Northern Mariana Islands", + "mq" : "Martinique", + "mr" : "Mauritania", + "ms" : "Montserrat", + "mt" : "Malta", + "mu" : "Mauritius", + "mv" : "the Maldives", + "mw" : "Malawi", + "mx" : "Mexico", + "my" : "Malaysia", + "mz" : "Mozambique", + "na" : "Namibia", + "nc" : "New Caledonia", + "ne" : "Niger", + "nf" : "Norfolk Island", + "ng" : "Nigeria", + "ni" : "Nicaragua", + "nl" : "the Netherlands", + "no" : "Norway", + "np" : "Nepal", + "nr" : "Nauru", + "nu" : "Niue", + "nz" : "New Zealand", + "om" : "Oman", + "pa" : "Panama", + "pe" : "Peru", + "pf" : "French Polynesia", + "pg" : "Papua New Guinea", + "ph" : "the Philippines", + "pk" : "Pakistan", + "pl" : "Poland", + "pm" : "Saint Pierre and Miquelon", + "pn" : "the Pitcairn Islands", + "pr" : "Puerto Rico", + "ps" : "the Palestinian Territory", + "pt" : "Portugal", + "pw" : "Palau", + "py" : "Paraguay", + "qa" : "Qatar", + "re" : "Reunion", + "ro" : "Romania", + "rs" : "Serbia", + "ru" : "Russia", + "rw" : "Rwanda", + "sa" : "Saudi Arabia", + "sb" : "the Solomon Islands", + "sc" : "the Seychelles", + "sd" : "Sudan", + "se" : "Sweden", + "sg" : "Singapore", + "sh" : "Saint Helena", + "si" : "Slovenia", + "sj" : "Svalbard and Jan Mayen", + "sk" : "Slovakia", + "sl" : "Sierra Leone", + "sm" : "San Marino", + "sn" : "Senegal", + "so" : "Somalia", + "sr" : "Suriname", + "st" : u"São Tomé and Príncipe", + "sv" : "El Salvador", + "sy" : "the Syrian Arab Republic", + "sz" : "Swaziland", + "tc" : "Turks and Caicos Islands", + "td" : "Chad", + "tf" : "the French Southern Territories", + "tg" : "Togo", + "th" : "Thailand", + "tj" : "Tajikistan", + "tk" : "Tokelau", + "tl" : "East Timor", + "tm" : "Turkmenistan", + "tn" : "Tunisia", + "to" : "Tonga", + "tr" : "Turkey", + "tt" : "Trinidad and Tobago", + "tv" : "Tuvalu", + "tw" : "Taiwan", + "tz" : "the United Republic of Tanzania", + "ua" : "Ukraine", + "ug" : "Uganda", + "um" : "the United States Minor Outlying Islands", + "us" : "the United States", + "uy" : "Uruguay", + "uz" : "Uzbekistan", + "va" : "Vatican City", + "vc" : "Saint Vincent and the Grenadines", + "ve" : "Venezuela", + "vg" : "the British Virgin Islands", + "vi" : "the United States Virgin Islands", + "vn" : "Vietnam", + "vu" : "Vanuatu", + "wf" : "Wallis and Futuna", + "ws" : "Samoa", + "ye" : "Yemen", + "yt" : "Mayotte", + "za" : "South Africa", + "zm" : "Zambia", + "zw" : "Zimbabwe" + } diff --git a/task-2718/detector.py b/task-2718/detector.py index 5a55b39..9fa5584 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -54,8 +54,19 @@ from datetime import date from datetime import timedelta import os.path +# Country code -> Country names +import country_info + +# write utf8 to file +import codecs + days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] +def get_country_name_from_cc(country_code): + if (country_code.lower() in country_info.countries): + return country_info.countries[country_code.lower()] + return country_code # if we didn't find the cc in our map + """ Represents a .csv file containing information on the number of connecting Tor users per country. @@ -352,7 +363,7 @@ def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): if notification_period is None: notification_period = DAYS - report_file = open('short_censorship_report.txt', 'w') + report_file = codecs.open('short_censorship_report.txt', 'w', 'utf-8') file_prologue_written = False s = tss.get_largest(None) # no restrictions, get 'em all. @@ -363,7 +374,7 @@ def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): scores.sort() scores.reverse() - for downscores,users_n,upscores,country_name in scores: + for downscores,users_n,upscores,country_code in scores: if (downscores > 0) or (upscores > 0): if not file_prologue_written: prologue = "=======================\n" @@ -374,10 +385,10 @@ def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): if ((upscores > 0) and (downscores == 0)): s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users).\n" % \ - (country_name, upscores, users_n) + (get_country_name_from_cc(country_code), upscores, users_n) else: s = "We detected %d potential censorship events in %s (users: %d, upscores: %d).\n" % \ - (downscores, country_name, users_n, upscores) + (downscores, get_country_name_from_cc(country_code), users_n, upscores) report_file.write(s + "\n")

1 0

[doctor/master] Ignore old consensuses for some checks.
by karsten＠torproject.org 15 Jun '12

15 Jun '12

commit 5eda069c2af005078c445889552d219969ee0236 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 15 16:47:09 2012 +0200 Ignore old consensuses for some checks. Issue pointed out by rransom for the consensus-health report from June 13, 12:02 UTC: WARNING: The consensuses published by the following directory authorities are more than 1 hour old and therefore not fresh anymore: dannenberg, urras NOTICE: The consensuses downloaded from the following authorities are missing votes that are contained in consensuses downloaded from other authorities: dizum, gabelmoo, maatuska, moria1, tor26, turtles The second line should go away, because we shouldn't be looking at old consensuses and referenced votes. --- src/org/torproject/doctor/Checker.java | 18 +++++++++++++++--- src/org/torproject/doctor/Warning.java | 10 +++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index 2cfb68b..ec3c020 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -119,11 +119,16 @@ public class Checker { } } - /* Check if all downloaded consensuses contain the same set of votes. */ + /* Check if all downloaded, fresh consensuses contain the same set of + * votes. */ private void checkContainedVotes() { + long fresh = System.currentTimeMillis() - 60L * 60L * 1000L; Set<String> allVotes = new HashSet<String>(); for (RelayNetworkStatusConsensus consensus : downloadedConsensuses.values()) { + if (consensus.getValidAfterMillis() < fresh) { + continue; + } allVotes.addAll(consensus.getDirSourceEntries().keySet()); } SortedSet<String> missingVotes = new TreeSet<String>(); @@ -131,6 +136,9 @@ public class Checker { downloadedConsensuses.entrySet()) { String nickname = e.getKey(); RelayNetworkStatusConsensus downloadedConsensus = e.getValue(); + if (downloadedConsensus.getValidAfterMillis() < fresh) { + continue; + } if (!downloadedConsensus.getDirSourceEntries().keySet().containsAll( allVotes)) { missingVotes.add(nickname); @@ -141,14 +149,18 @@ public class Checker { } } - /* Check if all downloaded consensuses contain signatures from all other - * authorities. */ + /* Check if all downloaded, fresh consensuses contain signatures from + * all other authorities. */ private void checkConsensusSignatures() { + long fresh = System.currentTimeMillis() - 60L * 60L * 1000L; SortedSet<String> missingSignatures = new TreeSet<String>(); for (Map.Entry<String, RelayNetworkStatusConsensus> e : downloadedConsensuses.entrySet()) { String nickname = e.getKey(); RelayNetworkStatusConsensus downloadedConsensus = e.getValue(); + if (downloadedConsensus.getValidAfterMillis() < fresh) { + continue; + } if (!downloadedConsensus.getDirectorySignatures().keySet(). containsAll(downloadedConsensus.getDirSourceEntries(). keySet())) { diff --git a/src/org/torproject/doctor/Warning.java b/src/org/torproject/doctor/Warning.java index a49c3ba..ca1181a 100644 --- a/src/org/torproject/doctor/Warning.java +++ b/src/org/torproject/doctor/Warning.java @@ -51,13 +51,13 @@ public enum Warning { * results. */ BandwidthScannerResultsMissing, - /* The consensuses downloaded from one or more authorities are missing - * votes that are contained in consensuses downloaded from other - * authorities. */ + /* The fresh consensuses downloaded from one or more authorities are + * missing votes that are contained in fresh consensuses downloaded from + * other authorities. */ ConsensusMissingVotes, - /* The consensuses downloaded from one or more authorities are missing - * signatures from previously voting authorities. */ + /* The fresh consensuses downloaded from one or more authorities are + * missing signatures from previously voting authorities. */ ConsensusMissingSignatures, /* One or more authorities are missing in the consensus. */

1 0