September 2014 - tor-commits - lists.torproject.org

[tor/master] systemd unit file: only allow tor to write to /var/lib/tor and /var/log/tor (#12751).
by nickm＠torproject.org 03 Sep '14

03 Sep '14

commit c9f30c4512fa6409eaf829c8448c8e086271c94f Author: intrigeri <intrigeri(a)boum.org> Date: Wed Aug 27 03:05:12 2014 +0000 systemd unit file: only allow tor to write to /var/lib/tor and /var/log/tor (#12751). The rest of the filesystem is accessible for reading only. Still, quoting systemd.exec(5): Note that restricting access with these options does not extend to submounts of a directory that are created later on. --- contrib/dist/tor.service.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 2fe51c7..8c70ccc 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -19,6 +19,9 @@ PrivateTmp = yes DeviceAllow = /dev/null rw DeviceAllow = /dev/urandom r InaccessibleDirectories = /home +ReadOnlyDirectories = / +ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor +ReadWriteDirectories = @LOCALSTATEDIR@/log/tor [Install] WantedBy = multi-user.target

1 0

[tor/master] Add changes file for #12939.
by nickm＠torproject.org 03 Sep '14

03 Sep '14

commit a8dd279fa544145fb7ea66131e5f506889197ac6 Author: intrigeri <intrigeri(a)boum.org> Date: Wed Aug 27 03:19:40 2014 +0000 Add changes file for #12939. --- changes/bug12939-systemd-no-new-privileges | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug12939-systemd-no-new-privileges b/changes/bug12939-systemd-no-new-privileges new file mode 100644 index 0000000..d9103b7 --- /dev/null +++ b/changes/bug12939-systemd-no-new-privileges @@ -0,0 +1,4 @@ + o Distribution: + - systemd unit file: ensures that the process and all its children + can never gain new privileges. + Patch by intrigeri; resolves ticket 12939.

1 0

[tor/master] Merge remote-tracking branch 'intrigeri/bug12939-systemd-no-new-privileges'
by nickm＠torproject.org 03 Sep '14

03 Sep '14

commit 54348201f7cce9c0c01e9d4835714a2fec55c67c Merge: f58cdb3 a8dd279 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 3 13:29:43 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12939-systemd-no-new-privileges' Conflicts: contrib/dist/tor.service.in changes/bug12939-systemd-no-new-privileges | 4 ++++ contrib/dist/tor.service.in | 1 + 2 files changed, 5 insertions(+) diff --cc contrib/dist/tor.service.in index 8c70ccc,c4709a7..20ceecf --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@@ -19,9 -19,7 +19,10 @@@ PrivateTmp = ye DeviceAllow = /dev/null rw DeviceAllow = /dev/urandom r InaccessibleDirectories = /home +ReadOnlyDirectories = / +ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor +ReadWriteDirectories = @LOCALSTATEDIR@/log/tor + NoNewPrivileges = yes [Install] WantedBy = multi-user.target

1 0

[obfs4/master] Do the release ritual for obfs4proxy-0.0.1.
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit cedd6a5fa9bbd903cb770cfcb1fb95a80be42035 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 17:12:53 2014 +0000 Do the release ritual for obfs4proxy-0.0.1. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1442903..f7f6419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,2 +1,2 @@ -Changes in version 0.0.1 - NOT YET RELEASED +Changes in version 0.0.1 - 2014-09-03 - Initial release.

1 0

[stem/master] Better handling for 'private' exit policy entries
by atagar＠torproject.org 03 Sep '14

03 Sep '14

commit 0d48b504566c4df7f15991465f19af15a87c0c6b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 3 09:24:02 2014 -0700 Better handling for 'private' exit policy entries Commonly we don't want to take 'private' exit policy entries into account... https://trac.torproject.org/projects/tor/ticket/10107 Adding a method to strip them, and also identify rules that were expanded from the 'private' keyword. --- docs/change_log.rst | 1 + stem/exit_policy.py | 70 +++++++++++++++++++++++++++++++++++++++ test/unit/exit_policy/policy.py | 30 +++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 57ccd88..130b24f 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -44,6 +44,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.control.BaseController.connection_time` to the :class:`~stem.control.BaseController` * Changed :func:`~stem.control.Controller.get_microdescriptor`, :func:`~stem.control.Controller.get_server_descriptor`, and :func:`~stem.control.Controller.get_network_status` to get our own descriptor if no fingerprint or nickname is provided. + * Added an :func:`~stem.exit_policy.ExitPolicy.strip_private` method to :class:`~stem.exit_policy.ExitPolicy` and :func:`~stem.exit_policy.ExitPolicy.is_private` to :class:`~stem.exit_policy.ExitPolicyRule` * **Descriptors** diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 4f622d7..2cade1d 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -30,6 +30,7 @@ exiting to a destination is permissible or not. For instance... |- can_exit_to - check if exiting to this destination is allowed or not |- is_exiting_allowed - check if any exiting is allowed |- summary - provides a short label, similar to a microdescriptor + |- strip_private - provides a copy of the policy without 'private' entries |- __str__ - string representation +- __iter__ - ExitPolicyRule entries that this contains @@ -42,6 +43,7 @@ exiting to a destination is permissible or not. For instance... |- is_match - checks if we match a given destination |- get_mask - provides the address representation of our mask |- get_masked_bits - provides the bit representation of our mask + |- is_private - flag indicating if this was expanded from a 'private' keyword +- __str__ - string representation for this rule get_config_policy - provides the ExitPolicy based on torrc rules @@ -137,6 +139,48 @@ def get_config_policy(rules): return ExitPolicy(*result) +def _flag_private_rules(rules): + """ + Determine if part of our policy was expanded from the 'private' keyword. This + doesn't differentiate if this actually came from the 'private' keyword or a + series of rules exactly matching it. + """ + + matches = [] + + for i, rule in enumerate(rules): + if i + len(PRIVATE_ADDRESSES) > len(rules): + break + + rule_str = '%s/%s' % (rule.address, rule.get_masked_bits()) + + if rule_str == PRIVATE_ADDRESSES[0]: + matches.append(i) + + for start_index in matches: + # To match the private policy the following must all be true... + # + # * series of addresses and bit masks match PRIVATE_ADDRESSES + # * all these rules have the same port range and acceptance + # * all these rules must be either accept or reject entries + + rule_set = rules[start_index:start_index + len(PRIVATE_ADDRESSES)] + min_port, max_port = rule_set[0].min_port, rule_set[0].max_port + is_accept = rule_set[0].is_accept + is_match = True + + for i, rule in enumerate(rule_set): + rule_str = '%s/%s' % (rule.address, rule.get_masked_bits()) + + if rule_str != PRIVATE_ADDRESSES[i] or rule.min_port != min_port or rule.max_port != max_port or rule.is_accept != is_accept: + is_match = False + break + + if is_match: + for rule in rule_set: + rule._is_private = True + + class ExitPolicy(object): """ Policy for the destinations that a relay allows or denies exiting to. This @@ -149,6 +193,7 @@ class ExitPolicy(object): def __init__(self, *rules): # sanity check the types + for rule in rules: if not isinstance(rule, (bytes, unicode, ExitPolicyRule)): raise TypeError('Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)' % (type(rule), rules)) @@ -300,6 +345,15 @@ class ExitPolicy(object): return (label_prefix + ', '.join(display_ranges)).strip() + def strip_private(self): + """ + Provides a copy of this policy without 'private' policy entries. + + :returns: **ExitPolicy** without private rules + """ + + return ExitPolicy(*[rule for rule in self._get_rules() if not rule.is_private()]) + def _get_rules(self): if self._rules is None: rules = [] @@ -346,6 +400,8 @@ class ExitPolicy(object): elif is_all_reject: rules = [ExitPolicyRule('reject *:*')] + _flag_private_rules(rules) + self._rules = rules self._input_rules = None @@ -526,6 +582,12 @@ class ExitPolicyRule(object): self._submask_wildcard = True + # Flags to indicate if this rule seems to be expanded from the 'private' + # keyword or tor's default policy suffix. + + self._is_private = False + self._is_default_suffix = False # TODO: implement + def is_address_wildcard(self): """ **True** if we'll match against any address, **False** otherwise. @@ -570,6 +632,7 @@ class ExitPolicyRule(object): """ # validate our input and check if the argument doesn't match our address type + if address is not None: address_type = self.get_address_type() @@ -660,6 +723,13 @@ class ExitPolicyRule(object): return self._masked_bits + def is_private(self): + """ + True if this rule was expanded from the 'private' keyword, False otherwise. + """ + + return self._is_private + @lru_cache() def __str__(self): """ diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 70d6ac1..d00954d 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -96,6 +96,36 @@ class TestExitPolicy(unittest.TestCase): policy = ExitPolicy('reject *:80-65535', 'accept *:1-65533', 'reject *:*') self.assertEquals('accept 1-79', policy.summary()) + def test_all_private_policy(self): + for port in ('*', '80', '1-1024'): + private_policy = get_config_policy('reject private:%s' % port) + + for rule in private_policy: + self.assertTrue(rule.is_private()) + + self.assertEqual(ExitPolicy(), private_policy.strip_private()) + + # though not commonly done, technically private policies can be accept rules too + + private_policy = get_config_policy('accept private:*') + self.assertEqual(ExitPolicy(), private_policy.strip_private()) + + def test_all_non_private_policy(self): + nonprivate_policy = get_config_policy('reject *:80-65535, accept *:1-65533, reject *:*') + + for rule in nonprivate_policy: + self.assertFalse(rule.is_private()) + + self.assertEqual(nonprivate_policy, nonprivate_policy.strip_private()) + + def test_mixed_private_policy(self): + policy = get_config_policy('accept *:80, reject private:1-65533, accept *:*') + + for rule in policy: + self.assertTrue(rule.is_accept != rule.is_private()) # only reject rules are the private ones + + self.assertEqual(get_config_policy('accept *:80, accept *:*'), policy.strip_private()) + def test_str(self): # sanity test for our __str__ method

1 0

[tor/master] Fix some 'dereference-before-null-check' warnings in test_circuitlist.c
by nickm＠torproject.org 03 Sep '14

03 Sep '14

commit c4d0d30bf3e621d5f7a7b27a7480bcdabe6274c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 3 10:58:11 2014 -0400 Fix some 'dereference-before-null-check' warnings in test_circuitlist.c Found by Coverity Scan. [CID 1234704, 1234705, 1234706] --- src/test/test_circuitlist.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 97c6b98..53dcab3 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -79,6 +79,10 @@ test_clist_maps(void *arg) memset(&cam, 0, sizeof(cam)); memset(&cdm, 0, sizeof(cdm)); + tt_assert(ch1); + tt_assert(ch2); + tt_assert(ch3); + ch1->cmux = tor_malloc(1); ch2->cmux = tor_malloc(1); ch3->cmux = tor_malloc(1); @@ -161,7 +165,7 @@ test_clist_maps(void *arg) if (ch2) tor_free(ch2->cmux); if (ch3) - tor_free(ch3->cmux); + tor_free(ch3->cmux); tor_free(ch1); tor_free(ch2); tor_free(ch3);

1 0

[tor/master] Fix a couple of small memory leaks on failure cases.
by nickm＠torproject.org 03 Sep '14

03 Sep '14

commit ed8f020e205267e6270494634346ab68d830e1d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 3 10:59:39 2014 -0400 Fix a couple of small memory leaks on failure cases. [CID 1234702, 1234703] --- src/or/control.c | 4 ++++ src/or/microdesc.c | 1 + 2 files changed, 5 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index 053c00b..cd2df5a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1201,6 +1201,10 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, tor_free(password); connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n", errstr); connection_mark_for_close(TO_CONN(conn)); + if (sl) { /* clean up */ + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_free(sl); + } return 0; ok: log_info(LD_CONTROL, "Authenticated control connection ("TOR_SOCKET_T_FORMAT diff --git a/src/or/microdesc.c b/src/or/microdesc.c index ed586f3..576fed0 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -576,6 +576,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) microdesc_wipe_body(md); } } + smartlist_free(wrote); return -1; }

1 0

[metrics-lib/master] Remove circular dependencies between packages.
by karsten＠torproject.org 03 Sep '14

03 Sep '14

commit 99d289f98ac2384393fe9d7267f81ded59df1980 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 1 12:25:30 2014 +0200 Remove circular dependencies between packages. - Use properties to build impl classes in DescriptorSourceFactory. - Move DescriptorParseException out of impl package. For extra backward compatibility, keep a copy of that class in impl, but deprecate it. - Tidy up the build file. Patch by iwakeh. Implements #12868. --- build.xml | 22 +++++-- .../descriptor/DescriptorParseException.java | 13 ++++ .../torproject/descriptor/DescriptorParser.java | 1 - .../descriptor/DescriptorSourceFactory.java | 69 ++++++++++++++++---- .../ImplementationNotAccessibleException.java | 14 ++++ .../descriptor/impl/BandwidthHistoryImpl.java | 1 + .../descriptor/impl/BridgeNetworkStatusImpl.java | 1 + .../descriptor/impl/BridgePoolAssignmentImpl.java | 1 + .../torproject/descriptor/impl/DescriptorImpl.java | 1 + .../descriptor/impl/DescriptorParseException.java | 6 +- .../descriptor/impl/DescriptorParserImpl.java | 1 + .../descriptor/impl/DescriptorReaderImpl.java | 1 + .../descriptor/impl/DirSourceEntryImpl.java | 1 + .../impl/DirectoryKeyCertificateImpl.java | 1 + .../descriptor/impl/DirectorySignatureImpl.java | 1 + .../descriptor/impl/ExitListEntryImpl.java | 1 + .../torproject/descriptor/impl/ExitListImpl.java | 1 + .../descriptor/impl/ExtraInfoDescriptorImpl.java | 1 + .../descriptor/impl/MicrodescriptorImpl.java | 1 + .../descriptor/impl/NetworkStatusEntryImpl.java | 1 + .../descriptor/impl/NetworkStatusImpl.java | 1 + .../torproject/descriptor/impl/ParseHelper.java | 1 + .../descriptor/impl/RelayDirectoryImpl.java | 1 + .../impl/RelayNetworkStatusConsensusImpl.java | 1 + .../descriptor/impl/RelayNetworkStatusImpl.java | 1 + .../impl/RelayNetworkStatusVoteImpl.java | 1 + .../descriptor/impl/ServerDescriptorImpl.java | 1 + .../descriptor/impl/TorperfResultImpl.java | 1 + .../descriptor/impl/ConsensusBuilder.java | 1 + .../impl/ExtraInfoDescriptorImplTest.java | 1 + .../impl/RelayNetworkStatusConsensusImplTest.java | 1 + .../impl/RelayNetworkStatusVoteImplTest.java | 1 + .../descriptor/impl/ServerDescriptorImplTest.java | 1 + 33 files changed, 131 insertions(+), 21 deletions(-) diff --git a/build.xml b/build.xml index c1200fe..35a1694 100644 --- a/build.xml +++ b/build.xml @@ -2,6 +2,9 @@ <property name="sources" value="src"/> <property name="classes" value="classes"/> <property name="tests" value="test"/> + <property name="jarfile" value="descriptor.jar" /> + <property name="source-and-target-java-version" value="1.6" /> + <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="/usr/share/java"> @@ -10,15 +13,24 @@ <include name="junit4.jar"/> </fileset> </path> + <target name="init"> <mkdir dir="${classes}"/> </target> + + <target name="clean" > + <delete includeEmptyDirs="true"> + <fileset dir="${classes}" defaultexcludes="false" includes="**" /> + </delete> + <delete file="${jarfile}"/> + </target> + <target name="compile" depends="init"> <javac destdir="${classes}" srcdir="${sources}" - source="1.5" - target="1.5" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" debug="true" deprecation="true" optimize="false" @@ -28,14 +40,14 @@ </javac> </target> <target name="jar" depends="compile"> - <jar destfile="descriptor.jar" + <jar destfile="${jarfile}" basedir="${classes}"/> </target> <target name="test" depends="compile"> <javac destdir="${classes}" srcdir="${tests}" - source="1.5" - target="1.5" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" debug="true" deprecation="true" optimize="false" diff --git a/src/org/torproject/descriptor/DescriptorParseException.java b/src/org/torproject/descriptor/DescriptorParseException.java new file mode 100644 index 0000000..628896e --- /dev/null +++ b/src/org/torproject/descriptor/DescriptorParseException.java @@ -0,0 +1,13 @@ +/* Copyright 2014 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +@SuppressWarnings("deprecation") +public class DescriptorParseException + extends org.torproject.descriptor.impl.DescriptorParseException { + private static final long serialVersionUID = 100L; + public DescriptorParseException(String message) { + super(message); + } +} + diff --git a/src/org/torproject/descriptor/DescriptorParser.java b/src/org/torproject/descriptor/DescriptorParser.java index 09ae593..1a4360b 100644 --- a/src/org/torproject/descriptor/DescriptorParser.java +++ b/src/org/torproject/descriptor/DescriptorParser.java @@ -4,7 +4,6 @@ package org.torproject.descriptor; import java.util.List; -import org.torproject.descriptor.impl.DescriptorParseException; /* Parse descriptors that are already in memory instead of using the * descriptor reader or downloader. */ diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index bcd7d60..6d95649 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -2,26 +2,67 @@ * See LICENSE for licensing information */ package org.torproject.descriptor; -import org.torproject.descriptor.impl.DescriptorDownloaderImpl; -import org.torproject.descriptor.impl.DescriptorParserImpl; -import org.torproject.descriptor.impl.DescriptorReaderImpl; - /* Create descriptor source instances. */ -public class DescriptorSourceFactory { +public final class DescriptorSourceFactory { + + /* default implementations */ + public final static String LOADER_DEFAULT = + "org.torproject.descriptor.impl.DescriptorDownloaderImpl"; + public final static String PARSER_DEFAULT = + "org.torproject.descriptor.impl.DescriptorParserImpl"; + public final static String READER_DEFAULT = + "org.torproject.descriptor.impl.DescriptorReaderImpl"; + + /* property names */ + public final static String PARSER_PROPERTY = "onionoo.parser"; + public final static String READER_PROPERTY = "onionoo.property"; + public final static String LOADER_PROPERTY = "onionoo.downloader"; + + /** + * Create a descriptor parser. + */ + public final static DescriptorParser createDescriptorParser() { + return (DescriptorParser) retrieve(PARSER_PROPERTY); + } - /* Create a descriptor parser. */ - public static DescriptorParser createDescriptorParser() { - return new DescriptorParserImpl(); + /** + * Create a descriptor reader. + */ + public final static DescriptorReader createDescriptorReader() { + return (DescriptorReader) retrieve(READER_PROPERTY); } - /* Create a descriptor reader. */ - public static DescriptorReader createDescriptorReader() { - return new DescriptorReaderImpl(); + /** + * Create a descriptor downloader. + */ + public final static DescriptorDownloader createDescriptorDownloader() { + return (DescriptorDownloader) retrieve(LOADER_PROPERTY); } - /* Create a descriptor downloader. */ - public static DescriptorDownloader createDescriptorDownloader() { - return new DescriptorDownloaderImpl(); + private final static <T> Object retrieve(String type) { + Object object; + String clazzName = null; + try { + if (PARSER_PROPERTY.equals(type)) { + clazzName = System.getProperty(type, PARSER_DEFAULT); + } else if (LOADER_PROPERTY.equals(type)) { + clazzName = System.getProperty(type, LOADER_DEFAULT); + } else if (READER_PROPERTY.equals(type)) { + clazzName = System.getProperty(type, READER_DEFAULT); + } + object = ClassLoader.getSystemClassLoader().loadClass(clazzName). + newInstance(); + } catch (ClassNotFoundException ex) { + throw new ImplementationNotAccessibleException("Cannot load class " + + clazzName + "for type " + type, ex); + } catch (InstantiationException ex) { + throw new ImplementationNotAccessibleException("Cannot load class " + + clazzName + "for type " + type, ex); + } catch (IllegalAccessException ex) { + throw new ImplementationNotAccessibleException("Cannot load class " + + clazzName + "for type " + type, ex); + } + return object; } } diff --git a/src/org/torproject/descriptor/ImplementationNotAccessibleException.java b/src/org/torproject/descriptor/ImplementationNotAccessibleException.java new file mode 100644 index 0000000..3648a4b --- /dev/null +++ b/src/org/torproject/descriptor/ImplementationNotAccessibleException.java @@ -0,0 +1,14 @@ +/* Copyright 2014 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +@SuppressWarnings("serial") +public class ImplementationNotAccessibleException + extends RuntimeException { + + public ImplementationNotAccessibleException(String string, + Throwable ex) { + super(string, ex); + } +} + diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index 1ceae54..f350740 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.SortedMap; import java.util.TreeMap; diff --git a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index a63d52a..d0e4a42 100644 --- a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index c959602..9340245 100644 --- a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index c4113be..6881a09 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/org/torproject/descriptor/impl/DescriptorParseException.java b/src/org/torproject/descriptor/impl/DescriptorParseException.java index 30d3e50..928b7a5 100644 --- a/src/org/torproject/descriptor/impl/DescriptorParseException.java +++ b/src/org/torproject/descriptor/impl/DescriptorParseException.java @@ -2,7 +2,11 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -public class DescriptorParseException extends Exception { +/** + * @deprecated Replaced by + * org.torproject.descriptor.DescriptorParseException + */ +@Deprecated public class DescriptorParseException extends Exception { private static final long serialVersionUID = 100L; protected DescriptorParseException(String message) { super(message); diff --git a/src/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java index c1d2ae7..992afee 100644 --- a/src/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.List; import org.torproject.descriptor.Descriptor; diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index d679154..0811273 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 0156790..08d910e 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.List; import java.util.Scanner; diff --git a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 8ef1bd7..4d8a28f 100644 --- a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java index d8548ec..95a0d6c 100644 --- a/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.List; import java.util.Scanner; diff --git a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java index fc7d286..a8b435d 100644 --- a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.List; import java.util.Scanner; diff --git a/src/org/torproject/descriptor/impl/ExitListImpl.java b/src/org/torproject/descriptor/impl/ExitListImpl.java index 8683cce..5bf1366 100644 --- a/src/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/org/torproject/descriptor/impl/ExitListImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 836551a..5b13234 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 12cbdd5..3972cf7 100644 --- a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index e652a98..000c448 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.BitSet; import java.util.HashMap; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index d57128e..10947f9 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.List; import java.util.SortedMap; diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index caec1bb..9353d3c 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 3a149a8..3a1fd47 100644 --- a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 3eb69b5..4f1da6b 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index ab86327..e1204d9 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index c5c867e..eb91128 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 6a59038..fd60236 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/org/torproject/descriptor/impl/TorperfResultImpl.java index 9045498..91033ec 100644 --- a/src/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/test/org/torproject/descriptor/impl/ConsensusBuilder.java b/test/org/torproject/descriptor/impl/ConsensusBuilder.java index f35864b..928087d 100644 --- a/test/org/torproject/descriptor/impl/ConsensusBuilder.java +++ b/test/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import java.util.ArrayList; import java.util.List; diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 438c700..e194923 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index ca7ea7f..c5ec7a3 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index b3fbcfd..c301bf1 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 85aa761..498c866 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import org.torproject.descriptor.DescriptorParseException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull;

1 0

[doctor/master] Only check relays in consensus for bw auth measurements
by atagar＠torproject.org 03 Sep '14

03 Sep '14

commit 934fa9ae2060b24f3250ea462465832e74272f6d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 3 07:17:41 2014 -0700 Only check relays in consensus for bw auth measurements Request from Sebastian to only count relays that ended up in the consensus when determining how many measured/unmeasured relays there are... https://trac.torproject.org/projects/tor/ticket/13046 --- consensus_health_checker.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index e3cc7bf..a90cde3 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -489,16 +489,20 @@ def unmeasured_relays(latest_consensus, consensuses, votes): "Checks that the bandwidth authorities have all formed an opinion about at least 90% of the relays." issues = [] + consensus_fingerprints = set([desc.fingerprint for desc in latest_consensus.routers.values()]) for authority, vote in votes.items(): if authority in CONFIG['bandwidth_authorities']: - unmeasured = 0 + measured, unmeasured = 0, 0 for desc in vote.routers.values(): - if not desc.measured: - unmeasured += 1 + if desc.fingerprint in consensus_fingerprints: + if desc.measured: + measured += 1 + else: + unmeasured += 1 - total = len(vote.routers) + total = measured + unmeasured percentage = 100 * unmeasured / total if percentage >= 5:

1 0

[oonib/master] Fix indentation problem with http_return_request helper.
by art＠torproject.org 03 Sep '14

03 Sep '14

commit 0127f112e7f54fa3fdc39eff979d4f66d71c5398 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Sep 3 16:08:30 2014 +0200 Fix indentation problem with http_return_request helper. --- oonib/oonibackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index 8af558d..6074d4a 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -90,7 +90,7 @@ if config.helpers['http-return-json-headers'].port: http_return_request_helper = internet.TCPServer( int(config.helpers['http-return-json-headers'].port), http_helpers.HTTPReturnJSONHeadersHelper()) -multiService.addService(http_return_request_helper) + multiService.addService(http_return_request_helper) # add the tor collector service here

1 0