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

[tor/maint-0.2.4] Fix an EOL@EOF in circuituse.c
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 8e29a7ae1da643197cc237ecb81096cd55913eff Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 20 11:03:18 2013 -0700 Fix an EOL@EOF in circuituse.c --- src/or/circuituse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d48449f..f02597e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2312,3 +2312,4 @@ mark_circuit_unusable_for_new_conns(origin_circuit_t *circ) circ->unusable_for_new_conns = 1; } +

1 0

[tor/maint-0.2.4] Set default minimum bandwidth for exit flag to zero for TestingTorNetwork
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 5c5198e713365fecf44741ae6f287c2ebdef18f6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 20 11:16:41 2013 -0700 Set default minimum bandwidth for exit flag to zero for TestingTorNetwork --- src/or/config.c | 1 + src/or/dirserv.c | 10 ++++++++-- src/or/or.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9e2230e..a238a1a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -341,6 +341,7 @@ static config_var_t option_vars_[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(TestingMinExitFlagThreshold, MEMUNIT, "0"), V(TestingMinFastFlagThreshold, MEMUNIT, "0"), V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 81f328a..e837e4b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1894,11 +1894,17 @@ router_counts_toward_thresholds(const node_t *node, time_t now, /* Have measured bw? */ int have_mbw = dirserv_has_measured_bw(node->ri->cache_info.identity_digest); + uint64_t min_bw = ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER; + const or_options_t *options = get_options(); + + if (options->TestingTorNetwork) { + min_bw = (int64_t)options->TestingMinExitFlagThreshold; + } return node->ri && router_is_active(node->ri, node, now) && !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) && - (dirserv_get_credible_bandwidth(node->ri) >= - ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER) && (have_mbw || !require_mbw); + (dirserv_get_credible_bandwidth(node->ri) >= min_bw) && + (have_mbw || !require_mbw); } /** Look through the routerlist, the Mean Time Between Failure history, and diff --git a/src/or/or.h b/src/or/or.h index 2b0102d..4e19140 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3910,6 +3910,9 @@ typedef struct { * of certain configuration options. */ int TestingTorNetwork; + /** Minimum value for the Exit flag threshold on testing networks. */ + uint64_t TestingMinExitFlagThreshold; + /** Minimum value for the Fast flag threshold on testing networks. */ uint64_t TestingMinFastFlagThreshold;

1 0

[ooni-probe/master] Change ooni.director.start() to set config.reports.pcap option.
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 745ae4a115133ab2a22d2aea3271b57e273bae39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 23:01:59 2013 +0000 Change ooni.director.start() to set config.reports.pcap option. * ooni.director.start() is changed in order to set the now instanced config.reports.pcap object, rather than calling a function in ooni/config.py which sets it. --- ooni/director.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 8365ebd..952b74a 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -84,7 +84,7 @@ class Director(object): if config.privacy.includepcap: log.msg("Starting") if not config.reports.pcap: - config.generatePcapFilename() + config.reports.pcap = config.generatePcapFilename() self.startSniffing() if config.advanced.start_tor:

1 0

[ooni-probe/master] Rewrite config.generatePcapFilename().
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 3b502c46a9f073671a0212b95c43cc74a14bf03d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 22:56:14 2013 +0000 Rewrite config.generatePcapFilename(). * Fixes #8446. * Move attribute for storing sniffer_running state to the top of the file, where the other config attributes are. --- ooni/config.py | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index 74a1668..c40e569 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -34,6 +34,9 @@ sample_config_file = None # This is used to store the probes IP address obtained via Tor probe_ip = None +# This is used to keep track of the state of the sniffer +sniffer_running = None + def get_root_path(): this_directory = os.path.dirname(__file__) root = os.path.join(this_directory, '..') @@ -90,18 +93,10 @@ def loadConfigFile(): class TestFilenameNotSet(Exception): pass -def generatePcapFilename(): - if cmd_line_options['pcapfile']: - reports.pcap = cmd_line_options['pcapfile'] - else: - if cmd_line_options['test']: - test_filename = os.path.basename(cmd_line_options['test']) - else: - test_filename = os.path.basename(cmd_line_options['testdeck']) - test_name = '.'.join(test_filename.split(".")[:-1]) - frm_str = "report_%s_"+otime.timestamp()+".%s" - reports.pcap = frm_str % (test_name, "pcap") +## This is the raw yaml configuration, and should not be publicly accessible, +## i.e., you shouldn't need to touch it: +_configuration = loadConfigFile() if not basic: # Here we make sure that we instance the config file attributes only once @@ -114,5 +109,23 @@ if not resume_filename: except IOError as e: with open(resume_filename, 'w+') as f: pass -# This is used to keep track of the state of the sniffer -sniffer_running = None + +def generatePcapFilename(cmd_line_options=None): + if not cmd_line_options: + cmd_line_options = {} + + if 'pcapfile' in cmd_line_options: + pcap_filename = cmd_line_options['pcapfile'] + else: + if 'test' in cmd_line_options: + test_filename = os.path.basename(cmd_line_options['test']) + elif 'testdeck' in cmd_line_options: + test_filename = os.path.basename(cmd_line_options['testdeck']) + else: + test_filename = '' + + test_name = '.'.join(test_filename.split(".")[:-1]) + frm_str = "report_%s_" + otime.timestamp() + ".%s" + pcap_filename = frm_str % (test_name, "pcap") + + return pcap_filename

1 0

[ooni-probe/master] Move config processing options to new function config.processConfigFile().
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 0dccfda7c10e2dd0e2ba25c4425a71a627fe55c3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 22:59:04 2013 +0000 Move config processing options to new function config.processConfigFile(). * Change config.loadConfigFile() to return the raw YAML config from yaml.safe_loads(). * Change reports to not be directly a Storage() class, because this lead to it's attributes/keys not getting parsed, but instead add it to config.processConfigFile() with the other config groups. --- ooni/config.py | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index c40e569..671f80f 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -6,7 +6,6 @@ from twisted.internet import reactor, threads, defer from ooni import otime from ooni.utils import Storage -reports = Storage() scapyFactory = None stateDict = None state = Storage() @@ -37,6 +36,10 @@ probe_ip = None # This is used to keep track of the state of the sniffer sniffer_running = None +class TestFilenameNotSet(Exception): + pass + + def get_root_path(): this_directory = os.path.dirname(__file__) root = os.path.join(this_directory, '..') @@ -64,7 +67,12 @@ def loadConfigFile(): config_file_contents = '\n'.join(f.readlines()) configuration = yaml.safe_load(config_file_contents) + return configuration +def processConfigFile(configuration): + """ + Process the loaded YAML config file from :func:loadConfigFile. + """ # Process the basic configuration options basic = Storage() for k, v in configuration['basic'].items(): @@ -88,10 +96,14 @@ def loadConfigFile(): except AttributeError: pass - return basic, privacy, advanced, tor + reports = Storage() + try: + for k, v in configuration['reports'].items(): + reports[k] = v + except AttributeError: + pass -class TestFilenameNotSet(Exception): - pass + return basic, privacy, advanced, tor, reports ## This is the raw yaml configuration, and should not be publicly accessible, @@ -100,7 +112,7 @@ _configuration = loadConfigFile() if not basic: # Here we make sure that we instance the config file attributes only once - basic, privacy, advanced, tor = loadConfigFile() + basic, privacy, advanced, tor, reports = processConfigFile(_configuration) if not resume_filename: resume_filename = os.path.join(get_root_path(), 'ooniprobe.resume')

1 0

[ooni-probe/master] Merge branch 'feature/pygeoip'
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 0b843947b56b09d13346c221081ce63f32cdea5f Merge: 091e45e f5ccc32 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 20 13:50:38 2013 -0400 Merge branch 'feature/pygeoip' * feature/pygeoip: Support CPython with patch from lunar https://trac.torproject.org/projects/tor/ticket/8507 ooni/utils/geodata.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)

1 0

[ooni-probe/master] Merge pull request #70 from isislovecruft/fix/director-unknown-cmdlineoptions
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 091e45ec7e4000806fb9877ce0ef681977b83352 Merge: 46f955f 2f76520 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Mar 19 19:51:07 2013 -0700 Merge pull request #70 from isislovecruft/fix/director-unknown-cmdlineoptions Fix/director unknown cmdlineoptions ooni/config.py | 61 ++++++++++++++++++++++++++++++++++-------------- ooni/director.py | 2 +- ooniprobe.conf.sample | 4 ++- 3 files changed, 47 insertions(+), 20 deletions(-)

1 0

[ooni-probe/master] Change None to correct YAML "Null" syntax in ooniprobe.conf.sample.
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 2f765206af6d26e20d1fdce3c1e8f3d0f6b7a579 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 19 17:41:08 2013 +0000 Change None to correct YAML "Null" syntax in ooniprobe.conf.sample. --- ooniprobe.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index 7e497f7..b488216 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -18,7 +18,7 @@ privacy: includepcap: false reports: # This is a packet capture file (.pcap) to load as a test: - pcap: None + pcap: Null advanced: # XXX change this to point to the directory where you have stored the GeoIP # database file. This should be the directory in which OONI is installed

1 0

[ooni-probe/master] Support CPython with patch from lunar https://trac.torproject.org/projects/tor/ticket/8507
by art＠torproject.org 20 Mar '13

20 Mar '13

commit f5ccc326fa9715422bf0029a3f334643e247a9e8 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Mar 19 13:39:18 2013 -0400 Support CPython with patch from lunar https://trac.torproject.org/projects/tor/ticket/8507 --- ooni/utils/geodata.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index d9883ba..5bc55a7 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -8,9 +8,14 @@ from ooni.utils import log, net from ooni import config try: - import pygeoip + from pygeoip import GeoIP except ImportError: - log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements") + try: + import GeoIP as CGeoIP + def GeoIP(database_path, *args, **kwargs): + return CGeoIP.open(database_path) + except ImportError: + log.err("Unable to import pygeoip or GeoIP. We will not be able to run geo IP related measurements") class GeoIPDataFilesNotFound(Exception): pass @@ -22,13 +27,13 @@ def IPToLocation(ipaddr): location = {'city': None, 'countrycode': None, 'asn': None} try: - city_dat = pygeoip.GeoIP(city_file) + city_dat = GeoIP(city_file) location['city'] = city_dat.record_by_addr(ipaddr)['city'] - country_dat = pygeoip.GeoIP(country_file) + country_dat = GeoIP(country_file) location['countrycode'] = country_dat.country_code_by_addr(ipaddr) - asn_dat = pygeoip.GeoIP(asn_file) + asn_dat = GeoIP(asn_file) location['asn'] = asn_dat.org_by_addr(ipaddr) except IOError:

1 0

[ooni-probe/master] Add the 'reports' group to the sample config file.
by art＠torproject.org 20 Mar '13

20 Mar '13

commit 5d6660826a7988e6ec47b72c9610021f0218a0da Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 23:04:59 2013 +0000 Add the 'reports' group to the sample config file. --- ooniprobe.conf.sample | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index 51c60f5..7e497f7 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -16,6 +16,9 @@ privacy: includecity: false # Should we collect a full packet capture on the client? includepcap: false +reports: + # This is a packet capture file (.pcap) to load as a test: + pcap: None advanced: # XXX change this to point to the directory where you have stored the GeoIP # database file. This should be the directory in which OONI is installed @@ -39,4 +42,3 @@ tor: # This should be set to something to avoid having Tor download each time # the descriptors and consensus data. data_dir: ~/.tor/ -

1 0