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

[stem/master] Process renaming requires ASCII bytes
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 2850199fc513fc4a276e16eaa59ccbc2dc69ea23 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 19:21:20 2013 -0800 Process renaming requires ASCII bytes Yet another unicode/ASCII compatability issue... ====================================================================== ERROR: test_set_process_name ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/integ/util/system.py", line 409, in test_set_process_name stem.util.system.set_process_name("stem_integ") File "/home/atagar/Desktop/stem/test/data/python3/stem/util/system.py", line 764, in set_process_name _set_prctl_name(process_name) File "/home/atagar/Desktop/stem/test/data/python3/stem/util/system.py", line 809, in _set_prctl_name name_buffer.value = process_name TypeError: str/bytes expected instead of str instance During handling of the above exception, another exception occurred: Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/integ/util/system.py", line 412, in test_set_process_name stem.util.system.set_process_name(initial_name) File "/home/atagar/Desktop/stem/test/data/python3/stem/util/system.py", line 764, in set_process_name _set_prctl_name(process_name) File "/home/atagar/Desktop/stem/test/data/python3/stem/util/system.py", line 809, in _set_prctl_name name_buffer.value = process_name TypeError: str/bytes expected instead of str instance --- stem/util/system.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index f61c3d8..3a11161 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -33,6 +33,7 @@ import subprocess import time import stem.util.proc +import stem.util.str_tools from stem import UNDEFINED from stem.util import log @@ -806,7 +807,7 @@ def _set_prctl_name(process_name): libc = ctypes.CDLL(ctypes.util.find_library("c")) name_buffer = ctypes.create_string_buffer(len(process_name) + 1) - name_buffer.value = process_name + name_buffer.value = stem.util.str_tools.to_bytes(process_name) libc.prctl(PR_SET_NAME, ctypes.byref(name_buffer), 0, 0, 0)

1 0

[stem/master] Accounting for tarfile.is_tarfile() raising AttributeErrors
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit e99dc2b618cb33d5e23166510d224429b8f67046 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 19:53:32 2013 -0800 Accounting for tarfile.is_tarfile() raising AttributeErrors When we lack read permissions the tarfile.is_tarfile() funcion raises an AttributeError with python 3 (rather than an IOError as it does with python 2). This is most likely a bug... http://bugs.python.org/issue17059 Working around it for now. --- stem/descriptor/reader.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index a6fd229..877d230 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -488,11 +488,16 @@ class DescriptorReader(object): # Checking if it's a tar file may fail due to permissions so failing back # to the mime type... - # IOError: [Errno 13] Permission denied: '/vmlinuz.old' + # + # IOError: [Errno 13] Permission denied: '/vmlinuz.old' + # + # With python 3 insuffient permissions raises an AttributeError instead... + # + # http://bugs.python.org/issue17059 try: is_tar = tarfile.is_tarfile(target) - except IOError: + except (IOError, AttributeError): is_tar = target_type[0] == 'application/x-tar' if target_type[0] in (None, 'text/plain'):

1 0

[stem/master] Normalizing descriptor handling as unicode
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit b4c4835d957463d6a453d9d7f7ad6007627abc96 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 29 09:03:30 2013 -0800 Normalizing descriptor handling as unicode Our python 3 descriptor integration tests were having troubles due to the ASCII/unicode switch. Adding a file interceptor so we always parse descriptors as unicode. Yes, yes, I know. Ewwww. I definitely don't like the _UnicodeReader helper so suggestions welcome for an alternative. --- stem/descriptor/__init__.py | 65 ++++++++++++++++++++++++++++++++++++++ stem/descriptor/networkstatus.py | 4 +- stem/exit_policy.py | 6 ++-- stem/util/connection.py | 4 +- stem/util/tor_tools.py | 6 ++-- test/integ/descriptor/reader.py | 2 +- test/settings.cfg | 2 +- 7 files changed, 77 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 0e4a3e1..fe6c03c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -27,6 +27,8 @@ __all__ = [ import os import re +import stem.prereq + try: # added in python 2.7 from collections import OrderedDict @@ -97,6 +99,10 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = import stem.descriptor.extrainfo_descriptor import stem.descriptor.networkstatus + # attempt to read content as unicode + + descriptor_file = _UnicodeReader(descriptor_file) + # The tor descriptor specifications do not provide a reliable method for # identifying a descriptor file's type and version so we need to guess # based on its filename. Metrics descriptors, however, can be identified @@ -236,6 +242,65 @@ class Descriptor(object): return self._raw_contents +class _UnicodeReader(object): + """ + File-like object that wraps another file. This replaces read ASCII bytes with + unicode content. This only supports read operations. + """ + + def __init__(self, wrapped_file): + self.wrapped_file = wrapped_file + + def close(self): + return self.wrapped_file.close() + + def getvalue(self): + return self.wrapped_file.getvalue() + + def isatty(self): + return self.wrapped_file.isatty() + + def next(self): + return self.wrapped_file.next() + + def read(self, n = -1): + return self._to_unicode(self.wrapped_file.read(n)) + + def readline(self): + return self._to_unicode(self.wrapped_file.readline()) + + def readlines(self, sizehint = 0): + # being careful to do in-place conversion so we don't accidently double our + # memory usage + + results = self.wrapped_file.readlines(sizehint) + + for i in xrange(len(results)): + results[i] = self._to_unicode(results[i]) + + return results + + def seek(self, pos, mode = 0): + return self.wrapped_file.seek(pos, mode) + + def tell(self): + return self.wrapped_file.tell() + + def _to_unicode(self, msg): + if msg is None: + return msg + + if stem.prereq.is_python_3(): + is_unicode = isinstance(msg, str) + else: + is_unicode = isinstance(msg, unicode) + + if is_unicode: + return msg + else: + return msg.decode("utf-8", "replace") + + def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_first = False, skip = False, end_position = None, include_ending_keyword = False): """ Reads from the descriptor file until we get to one of the given keywords or reach the diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index b4bc188..69f1a44 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1343,10 +1343,10 @@ class DocumentSignature(object): if validate: if not stem.util.tor_tools.is_valid_fingerprint(identity): - raise ValueError("Malformed fingerprint (%s) in the document signature" % (identity)) + raise ValueError("Malformed fingerprint (%s) in the document signature" % identity) if not stem.util.tor_tools.is_valid_fingerprint(key_digest): - raise ValueError("Malformed key digest (%s) in the document signature" % (key_digest)) + raise ValueError("Malformed key digest (%s) in the document signature" % key_digest) self.method = method self.identity = identity diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 0ad2c54..e60f121 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -104,7 +104,7 @@ def get_config_policy(rules): :raises: **ValueError** if input isn't a valid tor exit policy """ - if isinstance(rules, str): + if isinstance(rules, (str, unicode)): rules = rules.split(',') result = [] @@ -143,7 +143,7 @@ class ExitPolicy(object): def __init__(self, *rules): # sanity check the types for rule in rules: - if not isinstance(rule, (str, ExitPolicyRule)): + if not isinstance(rule, (str, unicode, ExitPolicyRule)): raise TypeError("Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)" % (type(rule), rules)) self._rules = None # lazily loaded series of ExitPolicyRule @@ -300,7 +300,7 @@ class ExitPolicy(object): is_all_accept, is_all_reject = True, True for rule in self._input_rules: - if isinstance(rule, str): + if isinstance(rule, (str, unicode)): rule = ExitPolicyRule(rule.strip()) if rule.is_accept: diff --git a/stem/util/connection.py b/stem/util/connection.py index d7c0299..86ba49a 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -40,7 +40,7 @@ def is_valid_ip_address(address): :returns: **True** if input is a valid IPv4 address, **False** otherwise """ - if not isinstance(address, str): + if not isinstance(address, (str, unicode)): return False # checks if theres four period separated values @@ -108,7 +108,7 @@ def is_valid_port(entry, allow_zero = False): return False return True - elif isinstance(entry, str): + elif isinstance(entry, (str, unicode)): if not entry.isdigit(): return False elif entry[0] == "0" and len(entry) > 1: diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 2e52cee..e61a96c 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -45,7 +45,7 @@ def is_valid_fingerprint(entry, check_prefix = False): :returns: **True** if the string could be a relay fingerprint, **False** otherwise """ - if not isinstance(entry, str): + if not isinstance(entry, (str, unicode)): return False elif check_prefix: if not entry or entry[0] != "$": @@ -65,7 +65,7 @@ def is_valid_nickname(entry): :returns: **True** if the string could be a nickname, **False** otherwise """ - if not isinstance(entry, str): + if not isinstance(entry, (str, unicode)): return False return bool(NICKNAME_PATTERN.match(entry)) @@ -78,7 +78,7 @@ def is_valid_circuit_id(entry): :returns: **True** if the string could be a circuit id, **False** otherwise """ - if not isinstance(entry, str): + if not isinstance(entry, (str, unicode)): return False return bool(CIRC_ID_PATTERN.match(entry)) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 97ea27c..936cf39 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -64,7 +64,7 @@ def _get_raw_tar_descriptors(): if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) entry.readline() # strip header - raw_descriptors.append(entry.read()) + raw_descriptors.append(entry.read().decode("utf-8", "replace")) entry.close() finally: if tar_file: diff --git a/test/settings.cfg b/test/settings.cfg index 4d99bfe..3de9d00 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -156,7 +156,7 @@ target.torrc RUN_PTRACE => PORT, PTRACE pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 32 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 34 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 53 pyflakes.ignore test/mocking.py => undefined name 'builtins' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names

1 0

[stem/master] Improving error output for test_skip_nondescriptor_contents
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 9d53a2854178d12222480958795876e45ec0f1d6 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 29 08:54:03 2013 -0800 Improving error output for test_skip_nondescriptor_contents The descriptor reader's test_skip_nondescriptor_contents integ test is especially tickle since it can fail whenever there's new non-descriptor content in the test/integ/descriptor/data directory. Improving its error output to say what it expected and got rather than simply saying that the counts mismatch. --- test/integ/descriptor/reader.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 960eaeb..97ea27c 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -363,16 +363,23 @@ class TestDescriptorReader(unittest.TestCase): reader = stem.descriptor.reader.DescriptorReader(DESCRIPTOR_TEST_DATA) reader.register_skip_listener(skip_listener.listener) + expected_skip_files = ("riddle", "tiny.png", "vote", "new_metrics_type") + with reader: list(reader) # iterates over all of the descriptors - self.assertEqual(4, len(skip_listener.results)) + # strip anything with a .swp suffix (vim tmp files) - for skip_path, skip_exception in skip_listener.results: - if skip_path.endswith(".swp"): - continue # skip vim temp files + skip_listener.results = [(path, exc) for (path, exc) in skip_listener.results if not path.endswith(".swp")] + + if len(skip_listener.results) != len(expected_skip_files): + expected_label = ",\n ".join(expected_skip_files) + results_label = ",\n ".join(["%s (%s)" % (path, exc) for (path, exc) in skip_listener.results]) - if not os.path.basename(skip_path) in ("riddle", "tiny.png", "vote", "new_metrics_type"): + self.fail("Skipped files that we should have been able to parse.\n\nExpected:\n %s\n\nResult:\n %s" % (expected_label, results_label)) + + for skip_path, skip_exception in skip_listener.results: + if not os.path.basename(skip_path) in expected_skip_files: self.fail("Unexpected non-descriptor content: %s" % skip_path) self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.UnrecognizedType))

1 0

[stem/master] Adding --python3 to the run_tests.py help output
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit d0f4a0c429b1e3a2bead48403605bb361ec66832 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 30 08:07:50 2013 -0800 Adding --python3 to the run_tests.py help output --- test/settings.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index 3de9d00..e7e659b 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -80,6 +80,7 @@ msg.help | -s, --style runs style checker | -t, --target TARGET comma separated list of extra targets for integ tests | --test TEST_NAME only run tests modules matching the given name prefix +| --python3 runs tests against a 2to3 conversion of the codebase | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against

1 0

r26041: {website} 2006 and 2007 are so, well, 2006 and 2007. (website/trunk/docs/en)
by Roger Dingledine 02 Feb '13

02 Feb '13

Author: arma Date: 2013-02-02 08:20:05 +0000 (Sat, 02 Feb 2013) New Revision: 26041 Modified: website/trunk/docs/en/documentation.wml Log: 2006 and 2007 are so, well, 2006 and 2007. Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2013-02-02 08:18:12 UTC (rev 26040) +++ website/trunk/docs/en/documentation.wml 2013-02-02 08:20:05 UTC (rev 26041) @@ -123,44 +123,6 @@ Look through Tor's <a href="#DesignDoc">Design Documents</a>. Notice that we have RFC-style specs to tell you exactly how Tor is built. - </li> - - <li> - There's a skeletal <a - href="https://svn.torproject.org/svn/projects/roadmaps/2008-12-19-roadmap-full.pdf">list - of items we'd like to tackle in the future</a>. Alas, many of those - items need to be fleshed out more before they'll make sense to people - who aren't Tor developers, but you can still get a general sense of - what issues need to be resolved next. - </li> - - <li> - Download and watch Nick's "Technical changes since 2004" talk from - Defcon in July 2007 (<a - href="http://freehaven.net/~arma/Defcon15-Mathewson-Technical_Changes_since_you_L…">video</a>, <a - href="http://freehaven.net/~nickm/slides/Defcon07/TorChanges.pdf">slides</a>), - Roger's "Current events in 2007" talk from 24C3 in December - 2007 (<a - href="http://freehaven.net/~arma/24c3-2325-en-current_events_in_tor_development.m…">video</a>, - <a href="http://freehaven.net/~arma/slides-24c3.pdf">slides</a>, - <a href="http://events.ccc.de/congress/2007/Fahrplan/events/2325.en.html">abstract</a>), and - Roger's "Vulnerabilities in Tor" talk from 25C3 in December - 2008 (<a - href="https://media.torproject.org/video/25c3-2977-en-security_and_anonymity_vuln…">video</a>, - <a href="http://freehaven.net/~arma/slides-25c3.pdf">slides</a>). - </li> - - <li> - See Mike's "Securing the Tor network" talk from Defcon in July 2007 - (<a href="http://freehaven.net/~arma/Defcon15-Mike_Perry-Securing_the_Tor_Network.mp4">video</a>, - <a href="http://freehaven.net/~arma/SecuringTheTorNetwork.pdf">slides</a>). - It describes common ways to attack networks like Tor and how we try - to defend against them, and it introduces the <a - href="https://svn.torproject.org/svn/torflow/trunk/README">Torflow</a> - script collection. - </li> - - <li> Learn about the <a href="<specblob>proposals/001-process.txt">Tor proposal process for changing our design</a>, and look over the <a

1 0

r26040: {website} tell people about the projects page, and the 29c3 video (website/trunk/docs/en)
by Roger Dingledine 02 Feb '13

02 Feb '13

Author: arma Date: 2013-02-02 08:18:12 +0000 (Sat, 02 Feb 2013) New Revision: 26040 Modified: website/trunk/docs/en/documentation.wml Log: tell people about the projects page, and the 29c3 video Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2013-01-31 18:50:11 UTC (rev 26039) +++ website/trunk/docs/en/documentation.wml 2013-02-02 08:18:12 UTC (rev 26040) @@ -112,8 +112,15 @@ paper</a>). </li> + <li>Learn about the wide diversity of <a + href="<page volunteer>#Projects">projects in + the Tor ecosystem</a> that need your help. Watch the <a + href="https://media.torproject.org/video/29c3-5306-en-the_tor_software_ecosystem_…">29c3 + video on the Tor software ecosystem</a> to learn more. + </li> + <li> - Look through our <a href="#DesignDoc">Design + Look through Tor's <a href="#DesignDoc">Design Documents</a>. Notice that we have RFC-style specs to tell you exactly how Tor is built. </li>

1 0

[tor/master] Document the ?? country code.
by nickm＠torproject.org 01 Feb '13

01 Feb '13

commit ec7ffed79da3f84d4bff7b92434f872dd228102c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 30 10:19:41 2013 -0500 Document the ?? country code. --- doc/tor.1.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3b13a61..9473221 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -679,7 +679,11 @@ The following options are useful only for clients (that is, if Note also that if you are a relay, this (and the other node selection options below) only affects your own circuits that Tor builds for you. Clients can still build circuits through you to any node. Controllers - can tell Tor to build circuits through any node. + can tell Tor to build circuits through any node. + + + + Country codes are case-insensitive. The code "\{??}" refers to nodes whose + country can't be identified. No country code, including \{??}, works if + no GeoIPFile can be loaded. See also the GeoIPExcludeUnknown option below. **ExcludeExitNodes** __node__,__node__,__...__:: @@ -691,8 +695,8 @@ The following options are useful only for clients (that is, if **GeoIPExcludeUnknown** **0**|**1**|**auto**:: If this option is set to 'auto', then whenever any country code is set in - ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (?? and - possibly A1) are treated as excluded as well. If this option is set to + ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (\{??} and + possibly \{A1}) are treated as excluded as well. If this option is set to '1', then all unknown countries are treated as excluded in ExcludeNodes and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't configured or can't be found. (Default: auto)

1 0

[tor/master] When excluding nodes by country, exclude {??} and {A1} too
by nickm＠torproject.org 01 Feb '13

01 Feb '13

commit ff9bdbd56ffdc4d91da377ca5e1624b58aeaab8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 18:07:36 2013 -0500 When excluding nodes by country, exclude {??} and {A1} too This is ticket 7706, reported by "bugcatcher." The rationale here is that if somebody says 'ExcludeNodes {tv}', then they probably don't just want to block definitely Tuvaluan nodes: they also want to block nodes that have unknown country, since for all they know such nodes are also in Tuvalu. This behavior is controlled by a new GeoIPExcludeUnknown autobool option. With the default (auto) setting, we exclude ?? and A1 if any country is excluded. If the option is 1, we add ?? and A1 unconditionally; if the option is 0, we never add them. (Right now our geoip file doesn't actually seem to include A1: I'm including it here in case it comes back.) This feature only takes effect if you have a GeoIP file. Otherwise you'd be excluding every node. --- changes/feature7706 | 9 +++++++++ doc/tor.1.txt | 8 ++++++++ src/or/config.c | 13 +++++++++++++ src/or/or.h | 5 +++++ src/or/routerset.c | 39 +++++++++++++++++++++++++++++++++++++++ src/or/routerset.h | 1 + 6 files changed, 75 insertions(+), 0 deletions(-) diff --git a/changes/feature7706 b/changes/feature7706 new file mode 100644 index 0000000..69b91a6 --- /dev/null +++ b/changes/feature7706 @@ -0,0 +1,9 @@ + o Minor features: + - When any country code is listed in ExcludeNodes or + ExcludeExitNodes, and we have GeoIP information, also exclude + all nodes with unknown countries ({??} and {A1} if + present). This behavior is controlled by the new + GeoIPExcludeUnknown option: you can make such nodes always + excluded with 'GeoIPExcludeUnknown 1', and disable the feature + with 'GeoIPExcludeUnknown 0'. Setting 'GeoIPExcludeUnknown auto' + gets you the default behavior. Implements feature 7706. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 40cf66d..3b13a61 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -689,6 +689,14 @@ The following options are useful only for clients (that is, if node listed in ExcludeNodes is automatically considered to be part of this list too. See also the caveats on the "ExitNodes" option below. +**GeoIPExcludeUnknown** **0**|**1**|**auto**:: + If this option is set to 'auto', then whenever any country code is set in + ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (?? and + possibly A1) are treated as excluded as well. If this option is set to + '1', then all unknown countries are treated as excluded in ExcludeNodes + and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't + configured or can't be found. (Default: auto) + **ExitNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use as exit node---that is, a diff --git a/src/or/config.c b/src/or/config.c index 4349b67..ce75112 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -242,6 +242,7 @@ static config_var_t option_vars_[] = { V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), V(FetchV2Networkstatus, BOOL, "0"), + V(GeoIPExcludeUnknown, AUTOBOOL, "auto"), #ifdef _WIN32 V(GeoIPFile, FILENAME, "<default>"), V(GeoIPv6File, FILENAME, "<default>"), @@ -1567,6 +1568,18 @@ options_act(const or_options_t *old_options) config_maybe_load_geoip_files_(options, old_options); + if (geoip_is_loaded(AF_INET) && options->GeoIPExcludeUnknown) { + /* ExcludeUnknown is true or "auto" */ + const int is_auto = options->GeoIPExcludeUnknown == -1; + int changed; + + changed = routerset_add_unknown_ccs(&options->ExcludeNodes, is_auto); + changed += routerset_add_unknown_ccs(&options->ExcludeExitNodes, is_auto); + + if (changed) + routerset_add_unknown_ccs(&options->ExcludeExitNodesUnion_, is_auto); + } + if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics || options->ConnDirectionStatistics || diff --git a/src/or/or.h b/src/or/or.h index a6f3d3e..328e8df 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3840,6 +3840,11 @@ typedef struct { char *GeoIPFile; char *GeoIPv6File; + /** Autobool: if auto, then any attempt to Exclude{Exit,}Nodes a particular + * country code will exclude all nodes in ?? and A1. If true, all nodes in + * ?? and A1 are excluded. Has no effect if we don't know any GeoIP data. */ + int GeoIPExcludeUnknown; + /** If true, SIGHUP should reload the torrc. Sometimes controllers want * to make this false. */ int ReloadTorrcOnSIGHUP; diff --git a/src/or/routerset.c b/src/or/routerset.c index 5154e28..4b51903 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -226,6 +226,45 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, return 0; } +/** If *setp includes at least one country code, or if + * only_some_cc_set is 0, add the ?? and A1 country codes to + * *setp, creating it as needed. Return true iff *setp changed. + */ +int +routerset_add_unknown_ccs(routerset_t **setp, int only_if_some_cc_set) +{ + routerset_t *set; + int add_unknown, add_a1; + if (only_if_some_cc_set) { + if (!*setp || smartlist_len((*setp)->country_names) == 0) + return 0; + } + if (!*setp) + *setp = routerset_new(); + + set = *setp; + + add_unknown = ! smartlist_contains_string_case(set->country_names, "??") && + geoip_get_country("??") >= 0; + add_a1 = ! smartlist_contains_string_case(set->country_names, "a1") && + geoip_get_country("A1") >= 0; + + if (add_unknown) { + smartlist_add(set->country_names, tor_strdup("??")); + smartlist_add(set->list, tor_strdup("{??}")); + } + if (add_a1) { + smartlist_add(set->country_names, tor_strdup("a1")); + smartlist_add(set->country_names, tor_strdup("{a1}")); + } + + if (add_unknown || add_a1) { + routerset_refresh_countries(set); + return 1; + } + return 0; +} + /** Return true iff we can tell that ei is a member of set. */ int routerset_contains_extendinfo(const routerset_t *set, const extend_info_t *ei) diff --git a/src/or/routerset.h b/src/or/routerset.h index cd4a837..bfa0c59 100644 --- a/src/or/routerset.h +++ b/src/or/routerset.h @@ -31,6 +31,7 @@ int routerset_contains_node(const routerset_t *set, const node_t *node); void routerset_get_all_nodes(smartlist_t *out, const routerset_t *routerset, const routerset_t *excludeset, int running_only); +int routerset_add_unknown_ccs(routerset_t **setp, int only_if_some_cc_set); #if 0 void routersets_get_node_disjunction(smartlist_t *target, const smartlist_t *source,

1 0

[tor/master] Merge remote-tracking branch 'public/feature7706'
by nickm＠torproject.org 01 Feb '13

01 Feb '13

commit acb43c0735af8a7cd9e8eb57bb8835b11a90a1be Merge: c93f66b ec7ffed Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 17:24:08 2013 -0500 Merge remote-tracking branch 'public/feature7706' changes/feature7706 | 9 +++++++++ doc/tor.1.txt | 14 +++++++++++++- src/or/config.c | 13 +++++++++++++ src/or/or.h | 5 +++++ src/or/routerset.c | 39 +++++++++++++++++++++++++++++++++++++++ src/or/routerset.h | 1 + 6 files changed, 80 insertions(+), 1 deletions(-)

1 0