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

[tor/master] fix wide lines from tor_log rename
by nickm＠torproject.org 01 Feb '13

01 Feb '13

commit 7301339e33bd15af777958ed884fbeadc5c0b10f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 16:19:02 2013 -0500 fix wide lines from tor_log rename --- src/common/crypto.c | 5 +++-- src/or/circuitlist.c | 8 ++++---- src/or/relay.c | 5 +++-- src/or/router.c | 18 +++++++++--------- src/tools/tor-gencert.c | 5 +++-- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 7cfe2a8..70bd452 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -152,9 +152,10 @@ crypto_log_errors(int severity, const char *doing) if (!func) func = "(null)"; if (doing) { tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)", - doing, msg, lib, func); + doing, msg, lib, func); } else { - tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func); + tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", + msg, lib, func); } } } diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8a378c0..6987dc4 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -783,8 +783,8 @@ circuit_dump_conn_details(int severity, int this_circid, int other_circid) { - tor_log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), " - "state %d (%s), born %ld:", + tor_log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d " + "(other side %d), state %d (%s), born %ld:", conn_array_index, type, this_circid, other_circid, circ->state, circuit_state_to_string(circ->state), (long)circ->timestamp_began.tv_sec); @@ -846,8 +846,8 @@ circuit_dump_chan_details(int severity, int this_circid, int other_circid) { - tor_log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d (other side %d), " - "state %d (%s), born %ld:", + tor_log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d " + "(other side %d), state %d (%s), born %ld:", chan, type, this_circid, other_circid, circ->state, circuit_state_to_string(circ->state), (long)circ->timestamp_began.tv_sec); diff --git a/src/or/relay.c b/src/or/relay.c index 66b3089..eef23a7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2023,8 +2023,9 @@ dump_cell_pool_usage(int severity) n_cells += TO_OR_CIRCUIT(c)->p_chan_cells.n; ++n_circs; } - tor_log(severity, LD_MM, "%d cells allocated on %d circuits. %d cells leaked.", - n_cells, n_circs, total_cells_allocated - n_cells); + tor_log(severity, LD_MM, + "%d cells allocated on %d circuits. %d cells leaked.", + n_cells, n_circs, total_cells_allocated - n_cells); mp_pool_log_status(cell_pool, severity); } diff --git a/src/or/router.c b/src/or/router.c index 69d346f..db396f0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -406,8 +406,8 @@ init_key_from_file(const char *fname, int generate, int severity) if (try_locking(get_options(), 0)<0) { /* Make sure that --list-fingerprint only creates new keys * if there is no possibility for a deadlock. */ - tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not " - "writing any new keys.", fname); + tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". " + "Not writing any new keys.", fname); /*XXXX The 'other process' might make a key in a second or two; * maybe we should wait for it. */ goto error; @@ -473,8 +473,8 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out, if (try_locking(get_options(), 0)<0) { /* Make sure that --list-fingerprint only creates new keys * if there is no possibility for a deadlock. */ - tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not " - "writing any new keys.", fname); + tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". " + "Not writing any new keys.", fname); /*XXXX The 'other process' might make a key in a second or two; * maybe we should wait for it. */ goto error; @@ -632,13 +632,13 @@ v3_authority_check_key_expiry(void) if (time_left <= 0) { tor_log(badness, LD_DIR, "Your v3 authority certificate has expired." - " Generate a new one NOW."); + " Generate a new one NOW."); } else if (time_left <= 24*60*60) { - tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d hours;" - " Generate a new one NOW.", time_left/(60*60)); + tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d " + "hours; Generate a new one NOW.", time_left/(60*60)); } else { - tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d days;" - " Generate a new one soon.", time_left/(24*60*60)); + tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d " + "days; Generate a new one soon.", time_left/(24*60*60)); } last_warned = now; } diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index d2057ea..3809b22 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -83,9 +83,10 @@ crypto_log_errors(int severity, const char *doing) if (!func) func = "(null)"; if (doing) { tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)", - doing, msg, lib, func); + doing, msg, lib, func); } else { - tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func); + tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", + msg, lib, func); } } }

1 0

[tor/master] Help us track bug 8093:
by arma＠torproject.org 01 Feb '13

01 Feb '13

commit fd492263859c7f7c5801df9d2cc99b767bd660ef Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 1 16:22:34 2013 -0500 Help us track bug 8093: Improve the log message when "Bug/attack: unexpected sendme cell from client" occurs. --- changes/bug8093 | 4 ++++ src/or/relay.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug8093 b/changes/bug8093 new file mode 100644 index 0000000..cbddfd9 --- /dev/null +++ b/changes/bug8093 @@ -0,0 +1,4 @@ + o Minor features: + - Improve the log message when "Bug/attack: unexpected sendme cell + from client" occurs, to help us track bug 8093. + diff --git a/src/or/relay.c b/src/or/relay.c index f711eae..1289f7d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1443,7 +1443,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ log_fn(LOG_WARN, LD_PROTOCOL, "Bug/attack: unexpected sendme cell from client. " - "Closing circ."); + "Closing circ (window %d).", + circ->package_window); return -END_CIRC_REASON_TORPROTOCOL; } circ->package_window += CIRCWINDOW_INCREMENT;

1 0

[ooni-probe/master] Update archive reports script to reflect report format changes
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 33b32860bb5a0675c321991b43bcd155c31af90a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 7 21:26:51 2013 +0100 Update archive reports script to reflect report format changes --- scripts/archive_reports.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/archive_reports.py b/scripts/archive_reports.py index 8246822..c49bd7a 100755 --- a/scripts/archive_reports.py +++ b/scripts/archive_reports.py @@ -83,6 +83,10 @@ def get_report_header_fields(report_header): except KeyError: return None +def get_test_name(fields): + test_name = fields['test_name'].lower().replace(' ', '_') + return test_name + def get_target_or_fail(fields, report): # set the target filename reportFormatVersion = fields['test_version'] @@ -90,6 +94,7 @@ def get_target_or_fail(fields, report): # XXX: wouldn't hurt to check timestamp for sanity again? dateInISO8601Format,__,__ = os.path.basename(report).split('_') probeASNumber = fields['probe_asn'] + testName = get_test_name(fields) # make sure path reportFormatVersion/CC exists path = os.path.abspath(report_archive_dir) @@ -103,15 +108,15 @@ def get_target_or_fail(fields, report): return None # if the target file already exists, try to find another filename - filename = "%s_%s.yamloo" % (dateInISO8601Format, probeASNumber) + filename = "%s-%s-%s.yamloo" % (testName, dateInISO8601Format, probeASNumber) target = os.path.join(path, filename) # try to get a unique filename. os.open as used below requires # that the file not already exist naming_attempts = 1 while os.path.exists(target) and naming_attempts < retry_attempts: - filename = "%s_%s.%d.yamloo" % (dateInISO8601Format, probeASNumber, - naming_attempts) + filename = "%s-%s-%s.%d.yamloo" % (testName, dateInISO8601Format, + probeASNumber, naming_attempts) target = os.path.join(path, filename) naming_attempts = naming_attempts + 1

1 0

[ooni-probe/master] Update version in __init__.py to match tag
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 6d96de34db8690e71939c5293da6aff8588ef6f2 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 14:20:25 2013 +0100 Update version in __init__.py to match tag --- ooni/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 7b5eb5f..5261982 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -11,7 +11,7 @@ from . import templates from . import utils __author__ = "Arturo Filastò" -__version__ = "0.0.8" +__version__ = "0.0.10" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter',

1 0

[ooni-probe/master] Update docs to reflect changes in report filename format
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 4016e0b6136d0f0f38844330aadf3747ae5b640f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 7 21:08:07 2013 +0100 Update docs to reflect changes in report filename format --- docs/source/index.rst | 1 + docs/source/reports.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 7ad895a..ca74809 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -122,6 +122,7 @@ More developer documentation architecture oonib + reports writing_tests api/* nettests/modules diff --git a/docs/source/reports.rst b/docs/source/reports.rst index 00c2db9..77d8cf6 100644 --- a/docs/source/reports.rst +++ b/docs/source/reports.rst @@ -16,7 +16,7 @@ https://ooni.torproject.org/reports/0.1/IT/ This directory shall contain the various reports for the test using the following convention: -``dateInISO8601Format`` _ ``probeASNumber`` .yamloo +``testName`` - ``dateInISO8601Format`` - ``probeASNumber`` .yamloo The date is expressed using `ISO 8601 <http://en.wikipedia.org/wiki/ISO_8601>`_ including seconds and with no ``:`` to delimit hours, minutes, days.

1 0

[ooni-probe/master] More consistent naming (dl is the deferred list l is the list)
by art＠torproject.org 01 Feb '13

01 Feb '13

commit ed4e733d207c3ad9929b657bc0cf388d49471eec Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 21 00:49:33 2013 +0100 More consistent naming (dl is the deferred list l is the list) --- nettests/blocking/http_requests.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nettests/blocking/http_requests.py b/nettests/blocking/http_requests.py index 34f5d04..aedb1b8 100644 --- a/nettests/blocking/http_requests.py +++ b/nettests/blocking/http_requests.py @@ -117,7 +117,7 @@ class HTTPRequestsTest(httpt.HTTPTest): """ self.experiment_headers = headers_dict - dl = [] + l = [] log.msg("Performing GET request to %s" % self.url) experiment_request = self.doRequest(self.url, method="GET", body_processor=experiment_body, @@ -128,8 +128,8 @@ class HTTPRequestsTest(httpt.HTTPTest): use_tor=True, body_processor=control_body, headers_processor=control_headers) - dl.append(experiment_request) - dl.append(control_request) - d = defer.DeferredList(dl) - return d + l.append(experiment_request) + l.append(control_request) + dl = defer.DeferredList(l) + return dl

1 0

[ooni-probe/master] Expand the user (~) fragment when creating directory
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 2c01f11c1d7d3fdc1ecf9bc967f7a830257d34e8 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:11:20 2013 +0100 Expand the user (~) fragment when creating directory --- ooni/runner.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 1a7e629..19d7e1f 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -529,10 +529,12 @@ def startTor(): config.tor.socks_port = socks_port if config.tor.data_dir: - if not os.path.exists(config.tor.data_dir): - log.msg("%s does not exist. Creating it." % config.tor.data_dir) - os.makedirs(config.tor.data_dir) - tor_config.DataDirectory = os.path.expanduser(config.tor.data_dir) + data_dir = os.path.expanduser(config.tor.data_dir) + + if not os.path.exists(data_dir): + log.msg("%s does not exist. Creating it." % data_dir) + os.makedirs(data_dir) + tor_config.DataDirectory = data_dir tor_config.save()

1 0

[ooni-probe/master] Remove unnecessary ooni imports (closes #8010)
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 950851641bc59f235a786fa51a9b74c5d6bafd0a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 21 00:47:43 2013 +0100 Remove unnecessary ooni imports (closes #8010) --- ooni/templates/httpt.py | 1 - ooni/templates/scapyt.py | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index c61b5ff..b506d77 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -2,7 +2,6 @@ import copy import random import struct -from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import protocol, defer from twisted.internet.ssl import ClientContextFactory diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 6310000..5f6c7c8 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -1,6 +1,5 @@ import random from zope.interface import implements -from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import protocol, defer, threads

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/TheTorProject/ooni-probe
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 4ab90f8a39bac65f634247383959059f8ee175a1 Merge: f734d02 09c94c9 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 1 16:27:26 2013 +0100 Merge branch 'master' of https://github.com/TheTorProject/ooni-probe * 'master' of https://github.com/TheTorProject/ooni-probe: Expand the user (~) fragment when creating directory Strictly require Twisted 12.2.0. This is a temporary fix for issue #28 The problem arises from the fact that we are overriding a private method (_WrappingProtocol that has been removed in 12.3.0). The proper way to fix this would be to get rid of the hack and use a HTTP Connection Pool. Add ability to specify the Tor data directory from the config file Update version in __init__.py to match tag Update archive reports script to reflect report format changes Update docs to reflect changes in report filename format

1 0

[ooni-probe/master] Add note on the versions of libdnet and pypcap (#7994)
by art＠torproject.org 01 Feb '13

01 Feb '13

commit f734d026ef5e5010ea2064434d3b31760798139c Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 1 16:23:11 2013 +0100 Add note on the versions of libdnet and pypcap (#7994) --- README.md | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eed217a..2c0935c 100644 --- a/README.md +++ b/README.md @@ -102,10 +102,14 @@ If you are not in a virtualenv you will have to run the above command as root: ## Install libdnet and pypcap python bindings -It's ideal to install these manually since the ones in debian or ubuntu are not up to date. +It's ideal to install these manually since the ones in debian or ubuntu are not +up to date. + +The version of pypcap and libdnet ooniprobe is current tested with are +libdnet-1.12 and pypcap 1.1, any other version should be considered untested. If you don't already have Subversion installed: - + sudo apt-get install subversion For libdnet:

1 0