tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

[doctor/master] Stop sending notifications about turtles
by atagar＠torproject.org 18 Jun '14

18 Jun '14

commit aa4c67ae4d1f3e5b422969c84bf636bf54ae2711 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 18 09:50:10 2014 -0700 Stop sending notifications about turtles Turtles has been is an unhappy place for quite some time since Mike lacks the bandwidth to maintain it, and hasn't found someone to take it over. There's little point in continuing to issue notifications for it. Turtles constitutes the vast majority of DocTor's alerts, drowning out outher more correctable issues. --- data/consensus_health.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index d7ea5f1..f42ab30 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -31,6 +31,10 @@ suppression BADEXIT_OUT_OF_SYNC => 24 # 1 day suppression BANDWIDTH_AUTHORITIES_OUT_OF_SYNC => 24 # 1 day suppression AUTHORITY_UNAVAILABLE => 24 # 1 day +# directory authorities for which to not provide notifications + +ignored_authorities turtles + # directory authorities that run bandwidth scanners bandwidth_authorities moria1

1 0

[doctor/master] Adding support for ignored authorities
by atagar＠torproject.org 18 Jun '14

18 Jun '14

commit 3fcbb971d84dc634846fb7808e95b25c471c8e25 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 18 09:49:16 2014 -0700 Adding support for ignored authorities Adding a config option to the consensus health checker to exclude particular authorities from notifications. --- consensus_health_checker.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index cc2b4ab..18ea748 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -29,9 +29,10 @@ Runlevel = stem.util.enum.UppercaseEnum("NOTICE", "WARNING", "ERROR") DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() EMAIL_SUBJECT = 'Consensus issues' -CONFIG = stem.util.conf.config_dict("consensus_health", { +CONFIG = stem.util.conf.config_dict('consensus_health', { 'msg': {}, 'suppression': {}, + 'ignored_authorities': [], 'bandwidth_authorities': [], 'known_params': [], }) @@ -121,7 +122,7 @@ def rate_limit_notice(key, hours = 0, days = 0): if hours == 0 and days == 0: return True - config = stem.util.conf.get_config("last_notified") + config = stem.util.conf.get_config('last_notified') config_path = util.get_path('data', 'last_notified.cfg') try: @@ -145,6 +146,11 @@ def rate_limit_notice(key, hours = 0, days = 0): return False +@lru_cache() +def directory_authorities(): + return dict((k, v) for (k, v) in DIRECTORY_AUTHORITIES.items() if k not in CONFIG['ignored_authorities']) + + def main(): start_time = time.time() @@ -416,7 +422,7 @@ def has_all_signatures(latest_consensus, consensuses, votes): missing_authority = missing_signature - for authority in DIRECTORY_AUTHORITIES.values(): + for authority in directory_authorities().values(): if authority.v3ident == missing_signature: missing_authority = authority.nickname break @@ -466,9 +472,9 @@ def has_authority_flag(latest_consensus, consensuses, votes): if Flag.AUTHORITY in desc.flags: seen_authorities.add(desc.nickname) - known_authorities = set(DIRECTORY_AUTHORITIES.keys()) + known_authorities = set(directory_authorities().keys()) missing_authorities = known_authorities.difference(seen_authorities) - extra_authorities = seen_authorities.difference(known_authorities) + extra_authorities = seen_authorities.difference(known_authorities - set(CONFIG['ignored_authorities'])) issues = [] @@ -486,8 +492,8 @@ def has_expected_fingerprints(latest_consensus, consensuses, votes): issues = [] for desc in latest_consensus.routers.values(): - if desc.nickname in DIRECTORY_AUTHORITIES and Flag.NAMED in desc.flags: - expected_fingerprint = DIRECTORY_AUTHORITIES[desc.nickname].fingerprint + if desc.nickname in directory_authorities() and Flag.NAMED in desc.flags: + expected_fingerprint = directory_authorities()[desc.nickname].fingerprint if desc.fingerprint != expected_fingerprint: issues.append(Issue(Runlevel.ERROR, 'FINGERPRINT_MISMATCH', authority = desc.nickname, expected = desc.fingerprint, actual = expected_fingerprint)) @@ -501,7 +507,7 @@ def is_recommended_versions(latest_consensus, consensuses, votes): outdated_authorities = {} min_version = min(latest_consensus.server_versions) - for authority in DIRECTORY_AUTHORITIES.values(): + for authority in directory_authorities().values(): desc = latest_consensus.routers.get(authority.fingerprint) if desc and desc.version and desc.version < min_version: @@ -582,7 +588,7 @@ def get_votes(): def _get_documents(label, resource): queries, documents, issues = {}, {}, [] - for authority in DIRECTORY_AUTHORITIES.values(): + for authority in directory_authorities().values(): if authority.v3ident is None: continue # not a voting authority @@ -599,7 +605,7 @@ def _get_documents(label, resource): if label == 'vote': # try to download the vote via the other authorities - v3ident = DIRECTORY_AUTHORITIES[authority].v3ident + v3ident = directory_authorities()[authority].v3ident query = downloader.query( '/tor/status-vote/current/%s' % v3ident,

1 0

[tor/master] Re-wrap the 0.2.5.5-alpha changelog
by nickm＠torproject.org 18 Jun '14

18 Jun '14

commit a94a39ffc14f5516983b6c8f896088b9b6adda59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 18 11:51:27 2014 -0400 Re-wrap the 0.2.5.5-alpha changelog --- ChangeLog | 101 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index a206724..503e890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22 +1,24 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? Tor 0.2.5.5-alpha fixes a wide variety of remaining issues in the Tor - 0.2.5.x release series, including a couple of DoS issues, some performance - regressions, and a large number of bugs affecting the Linux - seccomp2 sandbox code, and various other bugfixes. It also adds diagnostic - bugfixes for a few tricky issues that we're trying to track down. + 0.2.5.x release series, including a couple of DoS issues, some + performance regressions, and a large number of bugs affecting the + Linux seccomp2 sandbox code, and various other bugfixes. It also adds + diagnostic bugfixes for a few tricky issues that we're trying to + track down. o Major features (security, traffic analysis resistance): - - Several major improvements to the algorithm used to decide - when to close TLS connections. Previous versions of Tor closed connections - at a fixed interval after the last time a non-padding cell was sent - over the connection, regardless of the target of the connection. Now, - we randomize the intervals by adding up to 50% of their base value, - we measure the length of time since connection last had at least one - circuit, and we we allow connections to known ORs to remain open a - little longer (15 minutes instead of 3 minutes minimum). These changes - should improve Tor's resistance against some kinds of traffic analysis, - and lower some overhead from needlessly closed connections. Fixes - ticket 6799. Incidentally fixes ticket 12023; bugfix on 0.2.5.1-alpha. + - Several major improvements to the algorithm used to decide when to + close TLS connections. Previous versions of Tor closed connections + at a fixed interval after the last time a non-padding cell was + sent over the connection, regardless of the target of the + connection. Now, we randomize the intervals by adding up to 50% of + their base value, we measure the length of time since connection + last had at least one circuit, and we we allow connections to + known ORs to remain open a little longer (15 minutes instead of 3 + minutes minimum). These changes should improve Tor's resistance + against some kinds of traffic analysis, and lower some overhead + from needlessly closed connections. Fixes ticket 6799. + Incidentally fixes ticket 12023; bugfix on 0.2.5.1-alpha. o Major bugfixes (security, OOM, new since 0.2.5.4-alpha, also in 0.2.4.22): - Fix a memory leak that could occur if a microdescriptor parse @@ -41,15 +43,16 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? router's identity is not forgeable. o Major bugfixes (relay): - - Use a direct dirport connection when uploading non-anonymous descriptors to the directory authorities. - object. Previously, relays would incorrectly use tunnel connections - under a fairly wide variety of circumstances. Fixes bug 11469; bugfix + - Use a direct dirport connection when uploading non-anonymous + descriptors to the directory authorities. object. Previously, + relays would incorrectly use tunnel connections under a fairly + wide variety of circumstances. Fixes bug 11469; bugfix on 0.2.4.3-alpha. - When a circuit accidentally has the same circuit ID for its forward and reverse direction, correctly detect the direction of - cells using that circuit. Previously, this bug made roughly - one circuit in a million non-functional. Fixes bug 12195; this is - a bugfix on every version of Tor. + cells using that circuit. Previously, this bug made roughly one + circuit in a million non-functional. Fixes bug 12195; this is a + bugfix on every version of Tor. o Major bugfixes (client, pluggable transports): - When managing pluggable transports, use OS notification facilities @@ -58,17 +61,17 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? on 0.2.3.6-alpha. o Minor features (diagnostic): - - When logging a warning because of bug 7164, additionally check - the hash table for consistency (as proposed on ticket 11737). - This may help diagnose bug 7164. + - When logging a warning because of bug 7164, additionally check the + hash table for consistency (as proposed on ticket 11737). This may + help diagnose bug 7164. - When we log a heartbeat, log how many one-hop circuits we have that are at least 30 minutes old, and log status information about a few of them. This is an attempt to track down bug 8387. - - When encountering an unexpected CR while writing text to a - file on Windows, log the name of the file. Should help - diagnosing bug 11233. - - Give more specific warnings when a client notices that - an onion handshake has failed. Fixes ticket 9635. + - When encountering an unexpected CR while writing text to a file on + Windows, log the name of the file. Should help diagnosing + bug 11233. + - Give more specific warnings when a client notices that an onion + handshake has failed. Fixes ticket 9635. - Add significant new logging code to attempt to diagnose bug 12184, where relays seem to run out of available circuit IDs. - Improve the diagnostic log message for bug 8387 even further to @@ -76,13 +79,12 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? circuits sometimes do not get closed. o Minor features (security, memory management): - - Memory allocation tricks (mempools and buffer freelists) - are now disabled by default. You can turn them back on with - --enable-mempools and --enable-buf-freelists respectively. - We're disabling these features because malloc performance is good - enough on most platforms, and a - similar feature in OpenSSL exacerbated exploitation of the Heartbleed - attack. Resolves ticket 11476. + - Memory allocation tricks (mempools and buffer freelists) are now + disabled by default. You can turn them back on with + --enable-mempools and --enable-buf-freelists respectively. We're + disabling these features because malloc performance is good enough + on most platforms, and a similar feature in OpenSSL exacerbated + exploitation of the Heartbleed attack. Resolves ticket 11476. o Minor features (security): - Apply the secure SipHash-2-4 function to the hash table mapping @@ -106,15 +108,14 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? bugfix on 0.2.1.1-alpha. o Minor bugfixes (performance): - - Avoid a bug where every successful connection made us recompute the - flag telling us whether we have sufficient information to build - circuits. Previously, - we would forget our cached value + - Avoid a bug where every successful connection made us recompute + the flag telling us whether we have sufficient information to + build circuits. Previously, we would forget our cached value successfully opened a channel (or marked a router as running or not running for any other reason), regardless of whether we had previously believed the router to be running. This forced us to - run an expensive update operation far too often. - Fixes bug 12170; bugfix on 0.1.2.1-alpha. + run an expensive update operation far too often. Fixes bug 12170; + bugfix on 0.1.2.1-alpha. - Avoid using tor_memeq() for checking relay cell integrity. This removes a possible performance bottleneck. Fixes part of bug 12169; bugfix on 0.2.1.31. @@ -179,9 +180,9 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? - Avoid warnings when running with sandboxing enabled at the same time as cookie authentication, hidden services or directory authority voting. Fixes part of 12064; bugfix on 0.2.5.1-alpha. - - Do not allow options that require calls to exec to be - enabled alongside the seccomp2 sandbox: they will inevitably - crash. Fixes bug 12043; bugfix on 0.2.5.1-alpha. + - Do not allow options that require calls to exec to be enabled + alongside the seccomp2 sandbox: they will inevitably crash. Fixes + bug 12043; bugfix on 0.2.5.1-alpha. - Handle failures in getpwnam()/getpwuid() when running with the User option set and the Linux syscall sandbox enabled. Fixes bug 11946; bugfix on 0.2.5.1-alpha. @@ -255,8 +256,8 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? v2 link handshake. Fixes bug 12227; bugfix on 0.2.4.8-alpha. Found by "starlight". - When rejecting DATA cells for stream_id zero, still count them - against the circuit's deliver window so that we don't fail to - send a SENDME. Fixes bug 11246; bugfix on 0.2.4.10-alpha. + against the circuit's deliver window so that we don't fail to send + a SENDME. Fixes bug 11246; bugfix on 0.2.4.10-alpha. o Minor bugfixes (logging): - Fix a misformatted log message about delayed directory fetches. @@ -285,9 +286,9 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? caches don't get confused. o Package cleanup: - - The contrib directory has been sorted and tidied. Before, it was an - unsorted dumping ground for useful and not-so-useful things. Now, - it is divided based on functionality, and the items which + - The contrib directory has been sorted and tidied. Before, it was + an unsorted dumping ground for useful and not-so-useful things. + Now, it is divided based on functionality, and the items which seemed to be nonfunctional or useless have been removed. Resolves ticket 8966; based on patches from "rl1987".

1 0

[tor/master] Edit 0.2.5.5-alpha changelog for terseness and grammar.
by nickm＠torproject.org 18 Jun '14

18 Jun '14

commit 565c9d436f52467d004c351eacfab5db8c17ac83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 18 11:49:50 2014 -0400 Edit 0.2.5.5-alpha changelog for terseness and grammar. --- ChangeLog | 135 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index cddd5ad..a206724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,23 +1,22 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? - Write a blurb here. + Tor 0.2.5.5-alpha fixes a wide variety of remaining issues in the Tor + 0.2.5.x release series, including a couple of DoS issues, some performance + regressions, and a large number of bugs affecting the Linux + seccomp2 sandbox code, and various other bugfixes. It also adds diagnostic + bugfixes for a few tricky issues that we're trying to track down. o Major features (security, traffic analysis resistance): - - Increase the base amount of time that a canonical connection (one - that we have made to a known OR) is allowed to stay idle from 3 - minutes to 15 minutes. This leaks less information about when - circuits have closed, and avoids unnecessary overhead from - renegotiating connections. Part of a fix for ticket 6799. - - Instead of closing connections after they have been idle for a - fixed interval, randomly add up to 50% to each connection's - maximum timeout. This makes it harder to tell when the last - circuit closed by looking at when a connection closes. Part of a - fix for ticket 6799. - - Base connection idleness tests on the actual time elapsed since - the connection last had circuits, not on the time when we last - added non-padding. This change also makes it harder for an - observer to tell when the last circuit closed by looking at when a - connection closes. Part of a fix for ticket 6799. Incidentally - fixes bug 12023; bugfix on 0.2.5.1-alpha. + - Several major improvements to the algorithm used to decide + when to close TLS connections. Previous versions of Tor closed connections + at a fixed interval after the last time a non-padding cell was sent + over the connection, regardless of the target of the connection. Now, + we randomize the intervals by adding up to 50% of their base value, + we measure the length of time since connection last had at least one + circuit, and we we allow connections to known ORs to remain open a + little longer (15 minutes instead of 3 minutes minimum). These changes + should improve Tor's resistance against some kinds of traffic analysis, + and lower some overhead from needlessly closed connections. Fixes + ticket 6799. Incidentally fixes ticket 12023; bugfix on 0.2.5.1-alpha. o Major bugfixes (security, OOM, new since 0.2.5.4-alpha, also in 0.2.4.22): - Fix a memory leak that could occur if a microdescriptor parse @@ -25,23 +24,11 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? exhaustion attack by directory servers. Fixes bug 11649; bugfix on 0.2.2.6-alpha. - o Major bugfixes (relay): - - When uploading to the directory authorities, use a direct dirport - connection if we are a uploading an ordinary, non-anonymous - directory object. Previously, relays would used tunnel connections - under a fairly wide variety of circumstances. Fixes bug 11469; - bugfix on 0.2.4.3-alpha. - - When a circuit accidentally has the same circuit ID for its - forward and reverse direction, correctly detect the direction of - cells using that circuit. Previously, this would have made roughly - one circuit in a million non-functional. Fixes bug 12195; this is - a bugfix on every version of Tor. - o Major bugfixes (security, directory authorities): - Directory authorities now include a digest of each relay's identity key as a part of its microdescriptor. - This is a workaround for bug #11743 (reported by "cypherpunks"), + This is a workaround for bug 11743 (reported by "cypherpunks"), where Tor clients do not support receiving multiple microdescriptors with the same SHA256 digest in the same consensus. When clients receive a consensus like this, they only @@ -53,36 +40,49 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? attacker from causing a microdescriptor collision, because the router's identity is not forgeable. + o Major bugfixes (relay): + - Use a direct dirport connection when uploading non-anonymous descriptors to the directory authorities. + object. Previously, relays would incorrectly use tunnel connections + under a fairly wide variety of circumstances. Fixes bug 11469; bugfix + on 0.2.4.3-alpha. + - When a circuit accidentally has the same circuit ID for its + forward and reverse direction, correctly detect the direction of + cells using that circuit. Previously, this bug made roughly + one circuit in a million non-functional. Fixes bug 12195; this is + a bugfix on every version of Tor. + o Major bugfixes (client, pluggable transports): - When managing pluggable transports, use OS notification facilities - to learn if they have crashed, and do not attempt to kill any - process that has already exited. Fix for bug 8746; bugfix + to learn if they have crashed, and don't attempt to kill any + process that has already exited. Fixes bug 8746; bugfix on 0.2.3.6-alpha. o Minor features (diagnostic): - - When logging a warning because of bug #7164, additionally check - the hash table for consistency (as proposed on ticket #11737). - This may help diagnose bug #7164. + - When logging a warning because of bug 7164, additionally check + the hash table for consistency (as proposed on ticket 11737). + This may help diagnose bug 7164. - When we log a heartbeat, log how many one-hop circuits we have that are at least 30 minutes old, and log status information about a few of them. This is an attempt to track down bug 8387. - - When we encounter an unexpected CR in text that we're trying to - write to a file on Windows, log the name of the file. Should help + - When encountering an unexpected CR while writing text to a + file on Windows, log the name of the file. Should help diagnosing bug 11233. - - Give more specific warnings when we notice at the client side that + - Give more specific warnings when a client notices that an onion handshake has failed. Fixes ticket 9635. - Add significant new logging code to attempt to diagnose bug 12184, where relays seem to run out of available circuit IDs. - - Improve the diagnostic log message for bug #8387 even further to + - Improve the diagnostic log message for bug 8387 even further to try to improve our odds of figuring out why one-hop directory circuits sometimes do not get closed. o Minor features (security, memory management): - - Add configure options controlling allocator tricks like mempools - and freelists, and turn them off by default; on most platforms - malloc is reasonable enough for this not to be necessary, and a - similar feature in OpenSSL exacerbated Heartbleed. Fixes - bug #11476. + - Memory allocation tricks (mempools and buffer freelists) + are now disabled by default. You can turn them back on with + --enable-mempools and --enable-buf-freelists respectively. + We're disabling these features because malloc performance is good + enough on most platforms, and a + similar feature in OpenSSL exacerbated exploitation of the Heartbleed + attack. Resolves ticket 11476. o Minor features (security): - Apply the secure SipHash-2-4 function to the hash table mapping @@ -99,21 +99,22 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? - Update geoip and geoip6 to the June 4 2014 Maxmind GeoLite2 Country database. - o Minor bugfixes (configuration, security, new since 0.2.5.4-alpha, also in 0.2.4.22): + o Minor bugfixes (security, new since 0.2.5.4-alpha, also in 0.2.4.22): - When running a hidden service, do not allow TunneledDirConns 0; this will keep the hidden service from running, and also make it publish its descriptors directly over HTTP. Fixes bug 10849; bugfix on 0.2.1.1-alpha. o Minor bugfixes (performance): - - Do not recompute whether we have sufficient information to build - circuits every time we make a successful connection. Previously, - we would forget our cached value for this flag every time we + - Avoid a bug where every successful connection made us recompute the + flag telling us whether we have sufficient information to build + circuits. Previously, + we would forget our cached value successfully opened a channel (or marked a router as running or not running for any other reason), regardless of whether we had previously believed the router to be running. This forced us to - run a fairly expensive update operation with relatively high - frequency. Fixes bug 12170; bugfix on 0.1.2.1-alpha. + run an expensive update operation far too often. + Fixes bug 12170; bugfix on 0.1.2.1-alpha. - Avoid using tor_memeq() for checking relay cell integrity. This removes a possible performance bottleneck. Fixes part of bug 12169; bugfix on 0.2.1.31. @@ -135,6 +136,8 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? 0.2.4.8-alpha. Patch from "conradev". - Fix compilation when DNS_CACHE_DEBUG is enabled. Fixes bug 11761; bugfix on 0.2.3.13-alpha. Found by "cypherpunks". + - Fix compilation with dmalloc. Fixes bug 11605; bugfix + on 0.2.4.10-alpha. o Minor bugfixes (Directory server): - When sending a compressed set of descriptors or microdescriptors, @@ -144,17 +147,8 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? finished. This caused problems for decompression tools. Fixes bug 11648; bugfix on 0.1.1.23. - o Minor bugfixes (dmalloc): - - Fix compilation with dmalloc. Fixes bug 11605; bugfix - on 0.2.4.10-alpha. - - o Minor bugfixes (documentation): - - Correct the documenation so that it lists the correct directories - for the stats files. (They are in a subdirectory called "stats", - not "status".) - o Minor bugfixes (Linux seccomp sandbox): - - Make the seccomp sandbox code compile with ARM linux. Fixes bug + - Make the seccomp sandbox code compile under ARM linux. Fixes bug 11622; bugfix on 0.2.5.1-alpha. - Avoid crashing when re-opening listener ports with the seccomp sandbox active. Fixes bug 12115; bugfix on 0.2.5.1-alpha. @@ -185,9 +179,9 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? - Avoid warnings when running with sandboxing enabled at the same time as cookie authentication, hidden services or directory authority voting. Fixes part of 12064; bugfix on 0.2.5.1-alpha. - - Do not allow options which would require us to call exec to be - enabled along with the seccomp2 sandbox: they will inevitably - crash. Fix for bug 12043; bugfix on 0.2.5.1-alpha. + - Do not allow options that require calls to exec to be + enabled alongside the seccomp2 sandbox: they will inevitably + crash. Fixes bug 12043; bugfix on 0.2.5.1-alpha. - Handle failures in getpwnam()/getpwuid() when running with the User option set and the Linux syscall sandbox enabled. Fixes bug 11946; bugfix on 0.2.5.1-alpha. @@ -213,7 +207,7 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? - Avoid "Tried to open a socket with DisableNetwork set" warnings when starting a client with bridges configured and DisableNetwork set. (Tor launcher starts Tor with DisableNetwork set the first - time.) Fixes bug 10405; bugfix on 0.2.3.9-alpha. + time it runs.) Fixes bug 10405; bugfix on 0.2.3.9-alpha. o Minor bugfixes (testing): - The Python parts of the test scripts now work on Python 3 as well @@ -261,15 +255,15 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? v2 link handshake. Fixes bug 12227; bugfix on 0.2.4.8-alpha. Found by "starlight". - When rejecting DATA cells for stream_id zero, still count them - against the circuit's deliver window so that we don't get fail to - send a SENDME. Fix for bug 11246; bugfix on 0.2.4.10-alpha. + against the circuit's deliver window so that we don't fail to + send a SENDME. Fixes bug 11246; bugfix on 0.2.4.10-alpha. o Minor bugfixes (logging): - Fix a misformatted log message about delayed directory fetches. Fixes bug 11654; bugfix on 0.2.5.3-alpha. - Squelch a spurious LD_BUG message "No origin circuit for successful SOCKS stream" in certain hidden service failure cases; - fixes bug #10616. + fixes bug 10616. o Distribution: - Include a tor.service file in contrib/dist for use with systemd. @@ -283,14 +277,17 @@ Changes in version 0.2.5.5-alpha - 2014-06-1? directory authority options, remove the documentation for a V2-directory fetching option that no longer exists. Resolves ticket 11634. + - Correct the documenation so that it lists the correct directory + for the stats files. (They are in a subdirectory called "stats", + not "status".) - In the manpage, move more authority-only options into the directory authority section so that operators of regular directory caches don't get confused. o Package cleanup: - - The contrib directory has been sorted and tidy. Before, it was an + - The contrib directory has been sorted and tidied. Before, it was an unsorted dumping ground for useful and not-so-useful things. Now, - it has been divided based on functionality, and the items which + it is divided based on functionality, and the items which seemed to be nonfunctional or useless have been removed. Resolves ticket 8966; based on patches from "rl1987".

1 0

[onionoo/master] Don't break if there are no fingerprint listeners.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit 0dc641ea466c1388e5fca5921850f40b44dd9823 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 17 22:35:53 2014 +0200 Don't break if there are no fingerprint listeners. --- src/org/torproject/onionoo/DescriptorSource.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index f3f88a3..a9b6175 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -559,6 +559,9 @@ public class DescriptorSource { for (DescriptorListener descriptorListener : descriptorListeners) { descriptorListener.processDescriptor(descriptor, relay); } + if (fingerprintListeners == null) { + continue; + } SortedSet<String> fingerprints = new TreeSet<String>(); if (descriptorType == DescriptorType.RELAY_CONSENSUSES && descriptor instanceof RelayNetworkStatusConsensus) {

1 0

[onionoo/master] Keep at most one parsed descriptor in the queue.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit 6ba913c513eb771e9ba446dcc978df9ce36b82ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 18 10:06:46 2014 +0200 Keep at most one parsed descriptor in the queue. When we switched to parsing concatenated server and extra-info descriptors we limited the descriptor queue to at most one parsed descriptor file. Actually, this also makes sense for large descriptors like consensuses. There's no need to keep up to 100 of them in the queue, because it takes much longer to process them than to parse them. A quick look at the logs confirms that, with setting the max queue length to 1, we almost never have to wait for a descriptor provided by metrics-lib. --- src/org/torproject/onionoo/DescriptorSource.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index a9b6175..8246bba 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -277,29 +277,24 @@ class DescriptorQueue { public void addDirectory(DescriptorType descriptorType) { String directoryName = null; - int maxDescriptorFilesInQueue = -1; switch (descriptorType) { case RELAY_CONSENSUSES: directoryName = "relay-descriptors/consensuses"; break; case RELAY_SERVER_DESCRIPTORS: directoryName = "relay-descriptors/server-descriptors"; - maxDescriptorFilesInQueue = 1; break; case RELAY_EXTRA_INFOS: directoryName = "relay-descriptors/extra-infos"; - maxDescriptorFilesInQueue = 1; break; case BRIDGE_STATUSES: directoryName = "bridge-descriptors/statuses"; break; case BRIDGE_SERVER_DESCRIPTORS: directoryName = "bridge-descriptors/server-descriptors"; - maxDescriptorFilesInQueue = 1; break; case BRIDGE_EXTRA_INFOS: directoryName = "bridge-descriptors/extra-infos"; - maxDescriptorFilesInQueue = 1; break; case BRIDGE_POOL_ASSIGNMENTS: directoryName = "bridge-pool-assignments"; @@ -315,10 +310,7 @@ class DescriptorQueue { File directory = new File(this.inDir, directoryName); if (directory.exists() && directory.isDirectory()) { this.descriptorReader.addDirectory(directory); - if (maxDescriptorFilesInQueue >= 1) { - this.descriptorReader.setMaxDescriptorFilesInQueue( - maxDescriptorFilesInQueue); - } + this.descriptorReader.setMaxDescriptorFilesInQueue(1); } else { System.err.println("Directory " + directory.getAbsolutePath() + " either does not exist or is not a directory. Not adding "

1 0

[onionoo/master] Update to latest metrics-lib.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit 957c64ed2033418f66d2680ac2079137426c3a73 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 18 17:08:03 2014 +0200 Update to latest metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index 2351cea..73e5a69 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 2351cead7a693c53f3ec8329e84ca15add55c945 +Subproject commit 73e5a6989df19923775978428cd9bb21e0a96dc4

1 0

[metrics-lib/master] Store relay flags more efficiently.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit be359c873a456f6e6de34f9bb94ba97a545d3568 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 17 22:09:57 2014 +0200 Store relay flags more efficiently. --- .../descriptor/impl/NetworkStatusEntryImpl.java | 26 +++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index d8aa5f0..e652a98 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -3,8 +3,11 @@ package org.torproject.descriptor.impl; import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Scanner; import java.util.Set; import java.util.SortedMap; @@ -136,10 +139,24 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.orAddresses.add(parts[1]); } + private static Map<String, Integer> flagIndexes = + new HashMap<String, Integer>(); + private static Map<Integer, String> flagStrings = + new HashMap<Integer, String>(); + private void parseSLine(String line, String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKeyword("s"); - this.flags = parts; + BitSet flags = new BitSet(flagIndexes.size()); + for (int i = 1; i < parts.length; i++) { + String flag = parts[i]; + if (!flagIndexes.containsKey(flag)) { + flagStrings.put(flagIndexes.size(), flag); + flagIndexes.put(flag, flagIndexes.size()); + } + flags.set(flagIndexes.get(flag)); + } + this.flags = flags; } private void parseVLine(String line, String[] parts) @@ -269,12 +286,13 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return new ArrayList<String>(this.orAddresses); } - private String[] flags; + private BitSet flags; public SortedSet<String> getFlags() { SortedSet<String> result = new TreeSet<String>(); if (this.flags != null) { - for (int i = 1; i < this.flags.length; i++) { - result.add(this.flags[i]); + for (int i = this.flags.nextSetBit(0); i >= 0; + i = this.flags.nextSetBit(i + 1)) { + result.add(flagStrings.get(i)); } } return result;

1 0

[metrics-lib/master] Always accept [SP|TAB]+ as delimiter instead of just SP.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit 557c2ccfd7e09d9deef836cc993a6db92a5c2ae7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 17 13:57:15 2014 +0200 Always accept [SP|TAB]+ as delimiter instead of just SP. Better fix for #12403. --- .../descriptor/impl/BandwidthHistoryImpl.java | 5 ----- .../descriptor/impl/BridgeNetworkStatusImpl.java | 2 +- .../descriptor/impl/BridgePoolAssignmentImpl.java | 4 ++-- .../torproject/descriptor/impl/DirSourceEntryImpl.java | 4 ++-- .../descriptor/impl/DirectoryKeyCertificateImpl.java | 2 +- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 15 +++------------ .../torproject/descriptor/impl/MicrodescriptorImpl.java | 2 +- .../descriptor/impl/NetworkStatusEntryImpl.java | 6 +++--- .../torproject/descriptor/impl/RelayDirectoryImpl.java | 11 ++++++----- .../impl/RelayNetworkStatusConsensusImpl.java | 4 ++-- .../descriptor/impl/RelayNetworkStatusImpl.java | 4 ++-- .../descriptor/impl/RelayNetworkStatusVoteImpl.java | 2 +- .../descriptor/impl/ServerDescriptorImpl.java | 15 +++------------ .../descriptor/impl/ExtraInfoDescriptorImplTest.java | 4 ++-- 14 files changed, 29 insertions(+), 51 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index 00953c0..1ceae54 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -13,11 +13,6 @@ public class BandwidthHistoryImpl implements BandwidthHistory { String[] partsNoOpt) throws DescriptorParseException { boolean isValid = false; this.line = line; - if (lineNoOpt.startsWith("read-history ")) { - lineNoOpt = "read-history " - + lineNoOpt.substring("read-history ".length()); - partsNoOpt = lineNoOpt.split(" "); - } if (partsNoOpt.length == 5 || partsNoOpt.length == 6) { try { this.historyEndMillis = ParseHelper.parseTimestampAtIndex(line, diff --git a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index 581c6e5..a63d52a 100644 --- a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -54,7 +54,7 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("published")) { this.parsePublishedLine(line, parts); diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index 8ca4ea6..c959602 100644 --- a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -62,7 +62,7 @@ public class BridgePoolAssignmentImpl extends DescriptorImpl private void parseBridgePoolAssignmentLine(String line) throws DescriptorParseException { - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); if (parts.length != 3) { throw new DescriptorParseException("Illegal line '" + line + "' in bridge pool assignment."); @@ -73,7 +73,7 @@ public class BridgePoolAssignmentImpl extends DescriptorImpl private void parseBridgeLine(String line) throws DescriptorParseException { - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); if (parts.length < 2) { throw new DescriptorParseException("Illegal line '" + line + "' in bridge pool assignment."); diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index be915f9..bd97948 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -104,7 +104,7 @@ public class DirSourceEntryImpl implements DirSourceEntry { private void parseDirSourceLine(String line) throws DescriptorParseException { this.parsedExactlyOnceKeyword("dir-source"); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); if (parts.length != 7) { throw new DescriptorParseException("Invalid line '" + line + "'."); } @@ -135,7 +135,7 @@ public class DirSourceEntryImpl implements DirSourceEntry { private void parseVoteDigestLine(String line) throws DescriptorParseException { this.parsedExactlyOnceKeyword("vote-digest"); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); if (parts.length != 2) { throw new DescriptorParseException("Invalid line '" + line + "'."); } diff --git a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 59846df..8ef1bd7 100644 --- a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -61,7 +61,7 @@ public class DirectoryKeyCertificateImpl extends DescriptorImpl StringBuilder crypto = null; while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("dir-key-certificate-version")) { this.parseDirKeyCertificateVersionLine(line, parts); diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 5951da0..68cb850 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -93,7 +93,7 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl String line = s.next(); String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; - String[] partsNoOpt = lineNoOpt.split(" "); + String[] partsNoOpt = lineNoOpt.split("[ \t]+"); String keyword = partsNoOpt[0]; if (keyword.equals("extra-info")) { this.parseExtraInfoLine(line, lineNoOpt, partsNoOpt); @@ -201,17 +201,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl private void parseExtraInfoLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 3) { - /* Also accept [SP|TAB]+ where we'd previously only accept SP as - * delimiter. This is a hotfix for #12403, because we're currently - * not storing valid descriptors. A better place to implement this - * would probably be in DescriptorImpl. */ - partsNoOpt = line.startsWith("opt ") ? - line.substring("opt ".length()).split("[ \t]+") : - line.split("[ \t]+"); - if (partsNoOpt.length != 3) { - throw new DescriptorParseException("Illegal line '" + line - + "' in extra-info descriptor."); - } + throw new DescriptorParseException("Illegal line '" + line + + "' in extra-info descriptor."); } this.nickname = ParseHelper.parseNickname(line, partsNoOpt[1]); this.fingerprint = ParseHelper.parseTwentyByteHexString(line, diff --git a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 30db583..c27e946 100644 --- a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -61,7 +61,7 @@ public class MicrodescriptorImpl extends DescriptorImpl if (line.startsWith("@")) { continue; } - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("onion-key")) { this.parseOnionKeyLine(line, parts); diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 7bfcb29..3962009 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -67,12 +67,12 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { throw new DescriptorParseException("Status entry must start with " + "an r line."); } - String[] rLineParts = line.split(" "); + String[] rLineParts = line.split("[ \t]+"); this.parseRLine(line, rLineParts); while (s.hasNext()) { line = s.next(); - String[] parts = !line.startsWith("opt ") ? line.split(" ") : - line.substring("opt ".length()).split(" "); + String[] parts = !line.startsWith("opt ") ? line.split("[ \t]+") : + line.substring("opt ".length()).split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("a")) { this.parseALine(line, parts); diff --git a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 2426023..3a149a8 100644 --- a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -192,7 +192,7 @@ public class RelayDirectoryImpl extends DescriptorImpl } String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; - String[] partsNoOpt = lineNoOpt.split(" "); + String[] partsNoOpt = lineNoOpt.split("[ \t]+"); String keyword = partsNoOpt[0]; if (keyword.equals("signed-directory")) { this.parseSignedDirectoryLine(line, lineNoOpt, partsNoOpt); @@ -248,14 +248,15 @@ public class RelayDirectoryImpl extends DescriptorImpl } else { String publishedLineNoOpt = publishedLine.startsWith("opt ") ? publishedLine.substring("opt ".length()) : publishedLine; - String[] publishedPartsNoOpt = publishedLineNoOpt.split(" "); + String[] publishedPartsNoOpt = publishedLineNoOpt.split("[ \t]+"); this.parsePublishedLine(publishedLine, publishedLineNoOpt, publishedPartsNoOpt); } if (routerStatusLine != null) { String routerStatusLineNoOpt = routerStatusLine.startsWith("opt ") ? routerStatusLine.substring("opt ".length()) : routerStatusLine; - String[] routerStatusPartsNoOpt = routerStatusLineNoOpt.split(" "); + String[] routerStatusPartsNoOpt = + routerStatusLineNoOpt.split("[ \t]+"); this.parseRouterStatusLine(routerStatusLine, routerStatusLineNoOpt, routerStatusPartsNoOpt); } else if (runningRoutersLine != null) { @@ -264,7 +265,7 @@ public class RelayDirectoryImpl extends DescriptorImpl runningRoutersLine.substring("opt ".length()) : runningRoutersLine; String[] runningRoutersPartsNoOpt = - runningRoutersLineNoOpt.split(" "); + runningRoutersLineNoOpt.split("[ \t]+"); this.parseRunningRoutersLine(runningRoutersLine, runningRoutersLineNoOpt, runningRoutersPartsNoOpt); } else { @@ -293,7 +294,7 @@ public class RelayDirectoryImpl extends DescriptorImpl String line = s.next(); String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; - String[] partsNoOpt = lineNoOpt.split(" "); + String[] partsNoOpt = lineNoOpt.split("[ \t]+"); String keyword = partsNoOpt[0]; if (keyword.equals("directory-signature")) { this.parseDirectorySignatureLine(line, lineNoOpt, partsNoOpt); diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index ff963e6..faad733 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -85,7 +85,7 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("network-status-version")) { this.parseNetworkStatusVersionLine(line, parts); @@ -143,7 +143,7 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl Scanner s = new Scanner(new String(footerBytes)).useDelimiter("\n"); while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("directory-footer")) { } else if (keyword.equals("bandwidth-weights")) { diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 6089fc7..8f0d984 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -88,7 +88,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl if (line.isEmpty()) { continue; } - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("network-status-version")) { this.parseNetworkStatusVersionLine(line, parts); @@ -151,7 +151,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl StringBuilder crypto = null; while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("directory-signature")) { this.parseDirectorySignatureLine(line, parts); diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index d0d09f7..9dbc1f0 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -76,7 +76,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl boolean skipCrypto = false; /* TODO Parse crypto parts. */ while (s.hasNext()) { String line = s.next(); - String[] parts = line.split(" "); + String[] parts = line.split("[ \t]+"); String keyword = parts[0]; if (keyword.equals("network-status-version")) { this.parseNetworkStatusVersionLine(line, parts); diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 69ffcd8..6adc689 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -73,7 +73,7 @@ public class ServerDescriptorImpl extends DescriptorImpl } String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; - String[] partsNoOpt = lineNoOpt.split(" "); + String[] partsNoOpt = lineNoOpt.split("[ \t]+"); String keyword = partsNoOpt[0]; if (keyword.equals("router")) { this.parseRouterLine(line, lineNoOpt, partsNoOpt); @@ -170,17 +170,8 @@ public class ServerDescriptorImpl extends DescriptorImpl private void parseRouterLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 6) { - /* Also accept [SP|TAB]+ where we'd previously only accept SP as - * delimiter. This is a hotfix for #12403, because we're currently - * not storing valid descriptors. A better place to implement this - * would probably be in DescriptorImpl. */ - partsNoOpt = line.startsWith("opt ") ? - line.substring("opt ".length()).split("[ \t]+") : - line.split("[ \t]+"); - if (partsNoOpt.length != 6) { - throw new DescriptorParseException("Illegal line '" + line - + "' in server descriptor."); - } + throw new DescriptorParseException("Illegal line '" + line + + "' in server descriptor."); } this.nickname = ParseHelper.parseNickname(line, partsNoOpt[1]); this.address = ParseHelper.parseIpv4Address(line, partsNoOpt[2]); diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index f73b4a1..12484e5 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -830,7 +830,7 @@ public class ExtraInfoDescriptorImplTest { + "-4713350144,-4723824640,-4710717440,-4572675072"); } - @Test(expected = DescriptorParseException.class) + @Test() public void testReadHistoryTabInterval() throws DescriptorParseException { DescriptorBuilder.createWithReadHistoryLine("read-history " @@ -838,7 +838,7 @@ public class ExtraInfoDescriptorImplTest { + "4707695616,4699666432,4650004480,4489718784"); } - @Test(expected = DescriptorParseException.class) + @Test() public void testReadHistoryTabIntervalBytes() throws DescriptorParseException { DescriptorBuilder.createWithReadHistoryLine("read-history "

1 0

[metrics-lib/master] Clear sets used to validate at-most-once/exactly-once keywords.
by karsten＠torproject.org 18 Jun '14

18 Jun '14

commit f3a170fb74e753d71d6c2513f4c09fc789286ad4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 17 20:32:55 2014 +0200 Clear sets used to validate at-most-once/exactly-once keywords. Related to 5caa384. Similarly, keeping these sets around just wastes heap space. --- src/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 6 ++++-- src/org/torproject/descriptor/impl/ExitListEntryImpl.java | 5 +++-- src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index bd97948..0156790 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -33,7 +33,7 @@ public class DirSourceEntryImpl implements DirSourceEntry { failUnrecognizedDescriptorLines; this.initializeKeywords(); this.parseDirSourceEntryBytes(); - this.checkKeywords(); + this.checkAndClearKeywords(); } private SortedSet<String> exactlyOnceKeywords, atMostOnceKeywords; @@ -63,11 +63,13 @@ public class DirSourceEntryImpl implements DirSourceEntry { this.atMostOnceKeywords.remove(keyword); } - private void checkKeywords() throws DescriptorParseException { + private void checkAndClearKeywords() throws DescriptorParseException { if (!this.exactlyOnceKeywords.isEmpty()) { throw new DescriptorParseException("dir-source does not contain a '" + this.exactlyOnceKeywords.first() + "' line."); } + this.exactlyOnceKeywords = null; + this.atMostOnceKeywords = null; } private void parseDirSourceEntryBytes() diff --git a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java index 958fd68..fc7d286 100644 --- a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -33,7 +33,7 @@ public class ExitListEntryImpl implements ExitListEntry { failUnrecognizedDescriptorLines; this.initializeKeywords(); this.parseExitListEntryBytes(); - this.checkKeywords(); + this.checkAndClearKeywords(); } private SortedSet<String> exactlyOnceKeywords; @@ -54,11 +54,12 @@ public class ExitListEntryImpl implements ExitListEntry { this.exactlyOnceKeywords.remove(keyword); } - private void checkKeywords() throws DescriptorParseException { + private void checkAndClearKeywords() throws DescriptorParseException { for (String missingKeyword : this.exactlyOnceKeywords) { throw new DescriptorParseException("Missing '" + missingKeyword + "' line in exit list entry."); } + this.exactlyOnceKeywords = null; } private void parseExitListEntryBytes() diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 3962009..d8aa5f0 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -39,6 +39,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { failUnrecognizedDescriptorLines; this.initializeKeywords(); this.parseStatusEntryBytes(); + this.clearAtMostOnceKeywords(); } private SortedSet<String> atMostOnceKeywords; @@ -218,6 +219,10 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { } } + private void clearAtMostOnceKeywords() { + this.atMostOnceKeywords = null; + } + private String nickname; public String getNickname() { return this.nickname;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014