- tor-commits - lists.torproject.org

[tor/master] Add an option to weight down authorities when choosing a fallback
by nickm＠torproject.org 13 Dec '12

13 Dec '12

commit a8d491a8fdfafe6e56924a19b5169c2eb9d3a66a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 13:56:36 2012 -0400 Add an option to weight down authorities when choosing a fallback --- doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/or.h | 4 ++++ src/or/routerlist.c | 9 +++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e79d21e..231ac52 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -322,6 +322,12 @@ GENERAL OPTIONS distinguishable from other users, because you won't believe the same authorities they do. +**DirAuthorityFallbackRate** __NUM__:: + When configured to use both directory authorities and fallback + directories, the directory authorities also work as fallbacks. They are + chosen with their regular weights, multiplied by this number, which + should be 1.0 or less. (Default: 1.0) + **DynamicDHGroups** **0**|**1**:: If this option is set to 1, when running as a server, generate our own Diffie-Hellman group instead of using the one from Apache's mod_ssl. diff --git a/src/or/config.c b/src/or/config.c index af699d9..17b5b79 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -208,6 +208,7 @@ static config_var_t option_vars_[] = { OBSOLETE("DirRecordUsageSaveInterval"), V(DirReqStatistics, BOOL, "1"), VAR("DirAuthority", LINELIST, DirAuthorities, NULL), + V(DirAuthorityFallbackRate, DOUBLE, "1.0"), V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"), diff --git a/src/or/or.h b/src/or/or.h index cbb437e..9f9316b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3431,6 +3431,10 @@ typedef struct { /** List of fallback directory servers */ config_line_t *FallbackDir; + /** Weight to apply to all directory authority rates if considering them + * along with fallbackdirs */ + double DirAuthorityFallbackRate; + /** If set, use these main (currently v3) directory authorities and * not the default ones. */ config_line_t *AlternateDirAuthority; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a5dd9c4..5536d1c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1252,7 +1252,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) /** Pick a random element from a list of dir_server_t, weighting by their * <b>weight</b> field. */ static const dir_server_t * -dirserver_choose_by_weight(const smartlist_t *servers) +dirserver_choose_by_weight(const smartlist_t *servers, double authority_weight) { int n = smartlist_len(servers); int i; @@ -1263,6 +1263,8 @@ dirserver_choose_by_weight(const smartlist_t *servers) for (i = 0; i < n; ++i) { ds = smartlist_get(servers, i); weights[i].dbl = ds->weight; + if (ds->is_authority) + weights[i].dbl *= authority_weight; } scale_array_elements_to_u64(weights, n, NULL); @@ -1290,6 +1292,8 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, const int prefer_tunnel = (flags & PDS_PREFER_TUNNELED_DIR_CONNS_); const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH); const int no_microdesc_fetching =(flags & PDS_NO_EXISTING_MICRODESC_FETCH); + const double auth_weight = (sourcelist == fallback_dir_servers) ? + options->DirAuthorityFallbackRate : 1.0; smartlist_t *pick_from; int n_busy = 0; int try_excluding = 1, n_excluded = 0; @@ -1368,7 +1372,8 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, } { - const dir_server_t *selection = dirserver_choose_by_weight(pick_from); + const dir_server_t *selection = + dirserver_choose_by_weight(pick_from, auth_weight); if (selection) result = &selection->fake_status;

1 0

[tor/master] Merge branch 'fallback_dirsource_v3'
by nickm＠torproject.org 13 Dec '12

13 Dec '12

commit 01ac961ca1fc46efeec141ea275c6ea9971c3ee7 Merge: 21b5d76 f742b33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 12:42:29 2012 -0500 Merge branch 'fallback_dirsource_v3' changes/fallback_dirsource | 13 ++ changes/rename_dirserver | 3 + doc/tor.1.txt | 29 +++-- src/or/config.c | 231 +++++++++++++++++++++++------- src/or/directory.c | 30 ++-- src/or/dirserv.c | 7 +- src/or/dirvote.c | 6 +- src/or/networkstatus.c | 36 +---- src/or/nodelist.c | 7 +- src/or/or.h | 25 +++- src/or/router.c | 7 +- src/or/routerlist.c | 342 ++++++++++++++++++++++++++++++++------------ src/or/routerlist.h | 28 +++-- 13 files changed, 537 insertions(+), 227 deletions(-)

1 0

[tor/master] Fix two wide lines in config.c
by nickm＠torproject.org 13 Dec '12

13 Dec '12

commit 6a468a1722b074807eba7a0065ca6df8e2125745 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 12:44:17 2012 -0500 Fix two wide lines in config.c --- src/or/config.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 59b4abd..acfe2c4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -829,7 +829,8 @@ validate_dir_servers(or_options_t *options, or_options_t *old_options) /* do we want to complain to the user about being partitionable? */ if ((options->DirAuthorities && (!old_options || - !config_lines_eq(options->DirAuthorities, old_options->DirAuthorities))) || + !config_lines_eq(options->DirAuthorities, + old_options->DirAuthorities))) || (options->AlternateDirAuthority && (!old_options || !config_lines_eq(options->AlternateDirAuthority, @@ -1955,8 +1956,8 @@ resolve_my_address(int warn_severity, const or_options_t *options, * always. */ log_fn(warn_severity, LD_CONFIG, "Address '%s' resolves to private IP address '%s'. " - "Tor servers that use the default DirAuthorities must have public " - "IP addresses.", hostname, addr_string); + "Tor servers that use the default DirAuthorities must have " + "public IP addresses.", hostname, addr_string); tor_free(addr_string); return -1; }

1 0

r25940: {website} Adding Txtorcon to the volunteer project table As per meejah (website/trunk/getinvolved/en)
by Damian Johnson 13 Dec '12

13 Dec '12

Author: atagar Date: 2012-12-13 17:18:33 +0000 (Thu, 13 Dec 2012) New Revision: 25940 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Txtorcon to the volunteer project table As per meejah's request on... https://trac.torproject.org/7716 Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-12-12 21:06:06 UTC (rev 25939) +++ website/trunk/getinvolved/en/volunteer.wml 2012-12-13 17:18:33 UTC (rev 25940) @@ -261,6 +261,14 @@ </tr> <tr> + <td><a href="#project-txtorcon">Txtorcon</a></td> + <td>Library</td> + <td>Python, Twisted</td> + <td>Moderate</td> + <td>meejah</td> + </tr> + + <tr class="alt"> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> @@ -268,7 +276,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -276,7 +284,7 @@ <td>karsten</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -284,7 +292,7 @@ <td>hellais</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -292,7 +300,7 @@ <td></td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -300,7 +308,7 @@ <td>gsathya, karsten</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -308,7 +316,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -316,7 +324,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -324,7 +332,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -332,7 +340,7 @@ <td>karsten, gsathya</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -340,7 +348,7 @@ <td>kaner, nickm</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -348,7 +356,7 @@ <td>aagbsn</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -649,6 +657,17 @@ <i><a href="#stemUsability">Stem Usability Improvements</a></i> </p> + <a id="project-txtorcon"></a> + <h3>Txtorcon (<a + href="https://github.com/meejah/txtorcon">code</a>, <a + href="https://txtorcon.readthedocs.org">docs</a>)</h3> + + <p> + Twisted-based asynchronous Tor control protocol implementation. Includes + unit-tests, examples, state-tracking code and configuration abstraction. + Used by OONI and APAF. + </p> + <a id="project-tlsdate"></a> <h3>Tlsdate (<a href="https://github.com/ioerror/tlsdate">code</a>)</h3>

1 0

[torspec/master] Clarify the point-at-infinity check we actually used.
by nickm＠torproject.org 13 Dec '12

13 Dec '12

commit feaa2da97b8c3871fe9aa609498fc5f73de8b30d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 11:45:27 2012 -0500 Clarify the point-at-infinity check we actually used. --- proposals/216-ntor-handshake.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/proposals/216-ntor-handshake.txt b/proposals/216-ntor-handshake.txt index cb36ea1..fe727b1 100644 --- a/proposals/216-ntor-handshake.txt +++ b/proposals/216-ntor-handshake.txt @@ -91,8 +91,9 @@ Protocol: The client verifies that AUTH == H(auth_input, t_mac). - [NOTE: It may be adequate to check that EXP(Y,x) is not the point at - infinity. See tor-dev thread.] + Both parties check that none of the EXP() operations produced the point at + infinity. [NOTE: This is an adequate replacement for checking Y for group + membership, if the group is curve25519.] Both parties now have a shared value for KEY_SEED. They expand this into the keys needed for the Tor relay protocol.

1 0

[stem/master] Default ignored when geoip was unavailable
by atagar＠torproject.org 13 Dec '12

13 Dec '12

commit 92a7c6f8224ce9e69caab7c52b027b77e77dc1e5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 11 19:38:10 2012 -0800 Default ignored when geoip was unavailable We ignored the default argument and always raised a ProtocolError if the geoip database was unavalable - oops. --- stem/control.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index d538a65..5c3863a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -778,7 +778,9 @@ class Controller(BaseController): params.remove(param) elif param.startswith('ip-to-country/') and self.is_geoip_unavailable(): # the geoip database already looks to be unavailable - abort the request - raise stem.ProtocolError("Tor geoip database is unavailable") + if default == UNDEFINED: + raise stem.ProtocolError("Tor geoip database is unavailable") + else: return default # if everything was cached then short circuit making the query if not params:

1 0

[stem/master] Logging a warning when the geoip db is unavailable
by atagar＠torproject.org 13 Dec '12

13 Dec '12

commit 872af06dc1a5770fb57e0af72e2412aa879f7e1f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 11 19:30:45 2012 -0800 Logging a warning when the geoip db is unavailable Issuing a warning when we've made enough failed geoip queries to conclude that the database is unavailable. This is partly for parity with arm which issues a warning in this situation (and that seems appropriate for other callers too). --- stem/control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4b41e1c..d538a65 100644 --- a/stem/control.py +++ b/stem/control.py @@ -820,6 +820,9 @@ class Controller(BaseController): if is_geoip_request and self.is_caching_enabled() and self._geoip_failure_count != -1: self._geoip_failure_count += 1 + + if self.is_geoip_unavailable(): + log.warn("Tor's geoip database is unavailable.") log.debug("GETINFO %s (failed: %s)" % (" ".join(params), exc))

1 0

[stem/master] log_to_stdout() only printed at TRACE level
by atagar＠torproject.org 13 Dec '12

13 Dec '12

commit a7b275a3d64301da4d23137dbadd4842cc7a041f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 12 08:13:39 2012 -0800 log_to_stdout() only printed at TRACE level Ok, the logging module is *trying* to make me hate it. I haven't a clue what's wrong with the basicConfig() function, but when I try to use it the 'level' argument is ignored and it always spews its output at the TRACE runlevel. This is worthless (trace is often too noisy to be helpful) so making my own StdoutLogger. Tested by running this on a separate system, then copying the change over by hand. --- stem/util/log.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stem/util/log.py b/stem/util/log.py index d7a64ea..0def83b 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -183,6 +183,17 @@ class LogBuffer(logging.Handler): def emit(self, record): self._buffer.append(record) +class _StdoutLogger(logging.Handler): + def __init__(self, runlevel): + logging.Handler.__init__(self, level = logging_level(runlevel)) + + self.formatter = logging.Formatter( + fmt = '%(asctime)s [%(levelname)s] %(message)s', + datefmt = '%m/%d/%Y %H:%M:%S') + + def emit(self, record): + print self.formatter.format(record) + def log_to_stdout(runlevel): """ Logs further events to stdout. @@ -190,9 +201,5 @@ def log_to_stdout(runlevel): :param stem.util.log.Runlevel runlevel: minimum runlevel a message needs to be to be logged """ - logging.basicConfig( - level = logging_level(runlevel), - format = '%(asctime)s [%(levelname)s] %(message)s', - datefmt = '%m/%d/%Y %H:%M:%S', - ) + get_logger().addHandler(_StdoutLogger(runlevel))

1 0

[stem/master] Lowering cache hits to the TRACE runlevel
by atagar＠torproject.org 13 Dec '12

13 Dec '12

commit 9b5ff19be35ebbf8c75772a63406ba23762b37de Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 12 09:32:02 2012 -0800 Lowering cache hits to the TRACE runlevel In practice logging GETINFO and GETCONF cache hits can be very noisy (within a minute of running it with arm there were around a hundred duplicates). Lowering the visability of those events. --- stem/control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5c3863a..d615689 100644 --- a/stem/control.py +++ b/stem/control.py @@ -784,7 +784,7 @@ class Controller(BaseController): # if everything was cached then short circuit making the query if not params: - log.debug("GETINFO %s (cache fetch)" % " ".join(reply.keys())) + log.trace("GETINFO %s (cache fetch)" % " ".join(reply.keys())) if is_multiple: return reply else: return reply.values()[0] @@ -1085,7 +1085,7 @@ class Controller(BaseController): # if everything was cached then short circuit making the query if not lookup_params: - log.debug("GETCONF %s (cache fetch)" % " ".join(reply.keys())) + log.trace("GETCONF %s (cache fetch)" % " ".join(reply.keys())) if multiple: return reply

1 0

[stem/master] Circuit and stream ids are strings
by atagar＠torproject.org 13 Dec '12

13 Dec '12

commit 6711458be83b2050b058b7528bccb4e15c2c6a25 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 08:39:18 2012 -0800 Circuit and stream ids are strings Ids for streams and circuits presently look like ints, but stem should handle them as strings as per the control-spec... ; Unique identifiers for streams or circuits. Currently, Tor only ; uses digits, but this may change StreamID = 1*16 IDChar CircuitID = 1*16 IDChar IDChar = ALPHA / DIGIT Issue caught by Lunar^. This should be invisible to callers (they can probably still provide us with ints), the only noticeable difference being that new_circuit() and extend_circuit() now provides a str rather than int. --- stem/control.py | 27 +++++++++++++++------------ test/integ/control/controller.py | 6 +++--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/stem/control.py b/stem/control.py index d615689..b8bbf15 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1375,13 +1375,13 @@ class Controller(BaseController): * general * controller - :param int circuit_id: id of the circuit whose purpose is to be changed + :param str circuit_id: id of the circuit whose purpose is to be changed :param str purpose: purpose (either "general" or "controller") :raises: :class:`stem.InvalidArguments` if the circuit doesn't exist or if the purpose was invalid """ - response = self.msg("SETCIRCUITPURPOSE %s purpose=%s" % (str(circuit_id), purpose)) + response = self.msg("SETCIRCUITPURPOSE %s purpose=%s" % (circuit_id, purpose)) stem.response.convert("SINGLELINE", response) if not response.is_ok(): @@ -1403,7 +1403,7 @@ class Controller(BaseController): return self.extend_circuit(0, path, purpose) - def extend_circuit(self, circuit = 0, path = None, purpose = "general"): + def extend_circuit(self, circuit = "0", path = None, purpose = "general"): """ Either requests the creation of a new circuit or extends an existing one. @@ -1415,31 +1415,34 @@ class Controller(BaseController): :: - >>> control.extend_circuit(0, ["718BCEA286B531757ACAFF93AE04910EA73DE617", "30BAB8EE7606CBD12F3CC269AE976E0153E7A58D", "2765D8A8C4BBA3F89585A9FFE0E8575615880BEB"]) + >>> control.extend_circuit('0', ["718BCEA286B531757ACAFF93AE04910EA73DE617", "30BAB8EE7606CBD12F3CC269AE976E0153E7A58D", "2765D8A8C4BBA3F89585A9FFE0E8575615880BEB"]) 19 - >>> control.extend_circuit(0) + >>> control.extend_circuit('0') 20 >>> print control.get_info('circuit-status') 20 EXTENDED $718BCEA286B531757ACAFF93AE04910EA73DE617=KsmoinOK,$649F2D0ACF418F7CFC6539AB2257EB2D5297BAFA=Eskimo BUILD_FLAGS=NEED_CAPACITY PURPOSE=GENERAL TIME_CREATED=2012-12-06T13:51:11.433755 19 BUILT $718BCEA286B531757ACAFF93AE04910EA73DE617=KsmoinOK,$30BAB8EE7606CBD12F3CC269AE976E0153E7A58D=Pascal1,$2765D8A8C4BBA3F89585A9FFE0E8575615880BEB=Anthracite PURPOSE=GENERAL TIME_CREATED=2012-12-06T13:50:56.969938 - :param int circuit: id of a circuit to be extended + :param str circuit: id of a circuit to be extended :param list,str path: one or more relays to make a circuit through, this is required if the circuit id is non-zero :param str purpose: "general" or "controller" - :returns: int of the circuit id of the created or extended circuit + :returns: str of the circuit id of the created or extended circuit :raises: :class:`stem.InvalidRequest` if one of the parameters were invalid """ - if path is None and circuit == 0: + # we might accidently get integer circuit ids + circuit = str(circuit) + + if path is None and circuit == '0': path_opt_version = stem.version.Requirement.EXTENDCIRCUIT_PATH_OPTIONAL if not self.get_version().meets_requirements(path_opt_version): raise stem.InvalidRequest(512, "EXTENDCIRCUIT requires the path prior to version %s" % path_opt_version) - args = [str(circuit)] + args = [circuit] if type(path) == str: path = [path] if path: args.append(",".join(path)) if purpose: args.append("purpose=%s" % purpose) @@ -1458,13 +1461,13 @@ class Controller(BaseController): else: raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) - return int(new_circuit) + return new_circuit def close_circuit(self, circuit_id, flag = ''): """ Closes the specified circuit. - :param int circuit_id: id of the circuit to be closed + :param str circuit_id: id of the circuit to be closed :param str flag: optional value to modify closing, the only flag available is "IfUnused" which will not close the circuit unless it is unused @@ -1487,7 +1490,7 @@ class Controller(BaseController): """ Closes the specified stream. - :param int stream_id: id of the stream to be closed + :param str stream_id: id of the stream to be closed :param stem.RelayEndReason reason: reason the stream is closing :param str flag: not currently used diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b2a9ffd..9af3cae 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -459,15 +459,15 @@ class TestController(unittest.TestCase): elif test.runner.require_online(self): return with test.runner.get_runner().get_tor_controller() as controller: - circ_id = controller.extend_circuit(0) + circ_id = controller.extend_circuit('0') # check if our circuit was created self.assertTrue(filter(lambda x: int(x.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())) circ_id = controller.new_circuit() self.assertTrue(filter(lambda x: int(x.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())) self.assertRaises(stem.InvalidRequest, controller.extend_circuit, "foo") - self.assertRaises(stem.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#") - self.assertRaises(stem.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#", "foo") + self.assertRaises(stem.InvalidRequest, controller.extend_circuit, '0', "thisroutershouldntexistbecausestemexists!@##$%#") + self.assertRaises(stem.InvalidRequest, controller.extend_circuit, '0', "thisroutershouldntexistbecausestemexists!@##$%#", "foo") def test_repurpose_circuit(self): """

1 0