- tor-commits - lists.torproject.org

[doctor/master] Differentiate between 'no badexit flag' and 'not in consensus'
by atagar＠torproject.org 21 Feb '16

21 Feb '16

commit f1d40c6c736a72f9c607d5b170a0085b5f8053a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 20 17:10:19 2016 -0800 Differentiate between 'no badexit flag' and 'not in consensus' Authorities usually flag bad actors by either BadExit or Rejection. As such when we're out of sync it might be because different authorities chose different methods. Updating our notice to better differentiate this... https://trac.torproject.org/projects/tor/ticket/17441#comment:3 --- consensus_health_checker.py | 21 +++++++++++++++++++-- data/consensus_health.cfg | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index e8de5bf..68fad73 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -662,9 +662,26 @@ def bad_exits_in_sync(latest_consensus, consensuses, votes): for fingerprint in disagreed_bad_exits: with_flag = set([authority for authority, flagged in bad_exits.items() if fingerprint in flagged]) - without_flag = voting_authorities.difference(with_flag) + without_flag = [] + not_in_consensus = [] - issues.append(Issue(Runlevel.NOTICE, 'BADEXIT_OUT_OF_SYNC', fingerprint = fingerprint, with_flag = ', '.join(with_flag), without_flag = ', '.join(without_flag), to = bad_exits.keys())) + for authority in voting_authorities.difference(with_flag): + vote = votes[authority] + + if fingerprint in vote.routers: + without_flag.append(authority) + else: + not_in_consensus.append(authority) + + attr = ['with flag: %s' % ', '.join(with_flag)] + + if without_flag: + attr.append('without flag: %s' % ', '.join(without_flag)) + + if not_in_consensus: + attr.append('not in consensus: %s' % ', '.join(not_in_consensus)) + + issues.append(Issue(Runlevel.NOTICE, 'BADEXIT_OUT_OF_SYNC', fingerprint = fingerprint, counts = ', '.join(attr), to = bad_exits.keys())) return issues diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 2c5652a..6d72cac 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -16,7 +16,7 @@ msg MISSING_AUTHORITIES => The following authorities are missing from the consen msg EXTRA_AUTHORITIES => The following authorities were not expected in the consensus: {authorities} msg FINGERPRINT_MISMATCH => {authority} had a different fingerprint than we expected (expected: {expected}, actual: {actual}) msg TOR_OUT_OF_DATE => The following authorities are an out of date version of tor: {authorities} -msg BADEXIT_OUT_OF_SYNC => Authorities disagree about the BadExit flag for {fingerprint} (with flag: {with_flag}, without flag: {without_flag}) +msg BADEXIT_OUT_OF_SYNC => Authorities disagree about the BadExit flag for {fingerprint} ({counts}) msg BANDWIDTH_AUTHORITIES_OUT_OF_SYNC => Bandwidth authorities have a substantially different number of measured entries: {authorities} msg AUTHORITY_UNAVAILABLE => Unable to retrieve the {fetch_type} from {authority} ({url}): {error}

1 0

[doctor/master] Re-enable check that BadExit flags are in sync
by atagar＠torproject.org 21 Feb '16

21 Feb '16

commit 8ada4e0305b16f6b854dae839db2adb7446b7d37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 20 17:58:05 2016 -0800 Re-enable check that BadExit flags are in sync Roger says these are useful to him and that he's willing to invest effort to keep in sync so re-enabling the checks... https://trac.torproject.org/projects/tor/ticket/17441#comment:3 --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 68fad73..b0efb5c 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -323,7 +323,7 @@ def run_checks(consensuses, votes): #unmeasured_relays, has_authority_flag, is_recommended_versions, - #bad_exits_in_sync, + bad_exits_in_sync, bandwidth_authorities_in_sync, )

1 0

[torspec/master] Update prop264 per discussion
by nickm＠torproject.org 21 Feb '16

21 Feb '16

commit 4b772b32b46eca2cc021b9aab7bde4bdfb1d8498 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 20 20:32:50 2016 -0500 Update prop264 per discussion --- proposals/264-subprotocol-versions.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 20174b9..7d84228 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -125,18 +125,23 @@ Status: Open When a relay lacks a protocol listed in RequiredRelayProtocols, it must not attempt to join the network. + When a relay lacks a protocol listed in RecommendedRelayProtocols, it + should warn its operator that the relay is obsolete.. + When a client lacks a protocol listed in RecommendedClientProtocols, it should warn the user that the client is obsolete. When a client lacks a protocol listed in RequiredClientProtocols, it - must not use the corresponding feature. If the corresponding feature - is required to operate a Tor client, the client must must log an - error message and shut down without connecting to the network, even - if the cached consensus is out-of-date. This implements a "safe + must not connect to the network. This implements a "safe forward shutdown" mechanism for zombie clients. + If a client or relay has a cached consensus telling it that a given + protocol is required, and it does not implement that protocol, it + SHOULD NOT try to fetch a newer consensus. + The above features should be backported to 0.2.4 and later. + 5. Current protocols (See "6. Maintaining the protocol list" below for information about @@ -286,12 +291,12 @@ A.2. Initial required protocols For clients we will Recommend and Require: - DirCache=1 HSDir=1 Desc=1 Cons=ANYOF(9-20) Microdesc=ANYOF(9-20) + DirCache=1 HSDir=1 Desc=1 Cons=9-20 Microdesc=9-20 HSMid=1 Link=4 LinkAuth=1 Relay=2 For relays we will Require: - DirCache=1 HSDir=1 Desc=1 Cons=ANYOF(9-20) Microdesc=ANYOF(9-20) + DirCache=1 HSDir=1 Desc=1 Cons=9-20 Microdesc=9-20 HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2 A.3. Example integration with other open proposals

1 0

[torspec/master] mark 265 accepted, targetting 029.
by nickm＠torproject.org 21 Feb '16

21 Feb '16

commit 1f07de13faaf997d4915e24837280f84a070c740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 20 20:17:23 2016 -0500 mark 265 accepted, targetting 029. --- proposals/000-index.txt | 4 ++-- proposals/265-load-balancing-with-overhead.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index b5e3604..ae65d5a 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -185,7 +185,7 @@ Proposals by number: 262 Re-keying live circuits with new cryptographic material [OPEN] 263 Request to change key exchange protocol for handshake v1.2 [OPEN] 264 Putting version numbers on the Tor subprotocols [OPEN] -265 Load Balancing with Overhead Parameters [DRAFT] +265 Load Balancing with Overhead Parameters [ACCEPTED] 266 Removing current obsolete clients from the Tor network [DRAFT] @@ -212,7 +212,6 @@ Proposals by status: 255 Controller features to allow for load-balancing hidden services 259 New Guard Selection Behaviour 260 Rendezvous Single Onion Services - 265 Load Balancing with Overhead Parameters 266 Removing current obsolete clients from the Tor network NEEDS-REVISION: 190 Bridge Client Authorization Based on a Shared Secret @@ -253,6 +252,7 @@ Proposals by status: 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls 258 Denial-of-service resistance for directory authorities + 265 Load Balancing with Overhead Parameters [for 0.2.9.x] META: 000 Index of Tor Proposals 001 The Tor Proposal Process diff --git a/proposals/265-load-balancing-with-overhead.txt b/proposals/265-load-balancing-with-overhead.txt index b1d5af6..4bf42a6 100644 --- a/proposals/265-load-balancing-with-overhead.txt +++ b/proposals/265-load-balancing-with-overhead.txt @@ -2,7 +2,8 @@ Filename: 265-load-balancing-with-overhead.txt Title: Load Balancing with Overhead Parameters Authors: Mike Perry Created: 01 January 2016 -Status: Draft +Status: Accepted +Target: 0.2.9.x 0. Motivation

1 0

[torspec/master] retitile 257 per discussion
by nickm＠torproject.org 21 Feb '16

21 Feb '16

commit 700c8a6f12cd7538844c21f629bdc74104a0d108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 20 20:16:02 2016 -0500 retitile 257 per discussion --- proposals/000-index.txt | 8 ++++---- proposals/257-hiding-authorities.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 20d6bb7..b5e3604 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -177,13 +177,13 @@ Proposals by number: 254 Padding Negotiation [DRAFT] 255 Controller features to allow for load-balancing hidden services [DRAFT] 256 Key revocation for relays and authorities [OPEN] -257 Refactoring authorities and taking parts offline [META] +257 Refactoring authorities and making them more isolated from the net [META] 258 Denial-of-service resistance for directory authorities [ACCEPTED] 259 New Guard Selection Behaviour [DRAFT] 260 Rendezvous Single Onion Services [DRAFT] 261 AEZ for relay cryptography [OPEN] 262 Re-keying live circuits with new cryptographic material [OPEN] -263 Request to change key exchange protocol for handshake v1.1 [OPEN] +263 Request to change key exchange protocol for handshake v1.2 [OPEN] 264 Putting version numbers on the Tor subprotocols [OPEN] 265 Load Balancing with Overhead Parameters [DRAFT] 266 Removing current obsolete clients from the Tor network [DRAFT] @@ -243,7 +243,7 @@ Proposals by status: 256 Key revocation for relays and authorities 261 AEZ for relay cryptography 262 Re-keying live circuits with new cryptographic material - 263 Request to change key exchange protocol for handshake v1.1 + 263 Request to change key exchange protocol for handshake v1.2 264 Putting version numbers on the Tor subprotocols ACCEPTED: 140 Provide diffs between consensuses @@ -258,7 +258,7 @@ Proposals by status: 001 The Tor Proposal Process 098 Proposals that should be written 099 Miscellaneous proposals - 257 Refactoring authorities and taking parts offline + 257 Refactoring authorities and making them more isolated from the net FINISHED: 121 Hidden Service Authentication [in 0.2.1.x] 151 Improving Tor Path Selection diff --git a/proposals/257-hiding-authorities.txt b/proposals/257-hiding-authorities.txt index cab85ba..9c32f90 100644 --- a/proposals/257-hiding-authorities.txt +++ b/proposals/257-hiding-authorities.txt @@ -1,5 +1,5 @@ Filename: 257-hiding-authorities.txt -Title: Refactoring authorities and taking parts offline +Title: Refactoring authorities and making them more isolated from the net Authors: Nick Mathewson, Andrea Shepard Created: 2015-10-27 Status: Meta

1 0

[doctor/master] Move TEST_RUN to util
by atagar＠torproject.org 20 Feb '16

20 Feb '16

commit 63eb5d36b8ee5f4b23d879482e1214e60c58e65a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Feb 18 08:08:19 2016 -0800 Move TEST_RUN to util To test locally without spamming lists we have a simple TEST_RUN flag that prints results rather than emailing. Moving this into the util so all our scripts can take advantage of this. --- consensus_health_checker.py | 29 +++++++++-------------------- descriptor_checker.py | 2 +- fingerprint_change_checker.py | 2 +- sybil_checker.py | 2 +- util.py | 9 +++++++++ 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 1962d10..e8de5bf 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ @@ -23,10 +23,6 @@ import stem.util.enum from stem import Flag from stem.util.lru_cache import lru_cache -# Set this flag to print results rather than email them. - -TEST_RUN = False - Runlevel = stem.util.enum.UppercaseEnum('NOTICE', 'WARNING', 'ERROR') DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() @@ -276,19 +272,16 @@ def main(): log.debug('Sending notification for issues (%s)' % ', '.join(destination_labels)) - if TEST_RUN: - print('\n'.join(map(str, issues))) - else: - body = '\n'.join(map(str, issues)) - cc = [d.address for d in destinations.values() if d and not d.bcc] - bcc = [d.address for d in destinations.values() if d and d.bcc] + body = '\n'.join(map(str, issues)) + cc = [d.address for d in destinations.values() if d and not d.bcc] + bcc = [d.address for d in destinations.values() if d and d.bcc] - util.send(EMAIL_SUBJECT, body = body, cc = cc, bcc = bcc) + util.send(EMAIL_SUBJECT, body = body, cc = cc, bcc = bcc) - # notification for #tor-bots + # notification for #tor-bots - body = '\n'.join(['[consensus-health] %s' % issue for issue in issues]) - util.send('Announce or', body = body, to = ['tor-misc(a)commit.noreply.org']) + body = '\n'.join(['[consensus-health] %s' % issue for issue in issues]) + util.send('Announce or', body = body, to = ['tor-misc(a)commit.noreply.org']) else: if issues: log.info("All %i issues were suppressed. Not sending a notification." % len(issues)) @@ -795,8 +788,4 @@ if __name__ == '__main__': except: msg = "consensus_health_checker.py failed with:\n\n%s" % traceback.format_exc() log.error(msg) - - if TEST_RUN: - print("Error: %s" % msg) - else: - util.send("Script Error", body = msg, to = [util.ERROR_ADDRESS]) + util.send("Script Error", body = msg, to = [util.ERROR_ADDRESS]) diff --git a/descriptor_checker.py b/descriptor_checker.py index 05a6513..953def1 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py index c6a4b98..493f51c 100755 --- a/fingerprint_change_checker.py +++ b/fingerprint_change_checker.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015, Damian Johnson and The Tor Project +# Copyright 2015-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/sybil_checker.py b/sybil_checker.py index 52fba0c..daaf0bd 100755 --- a/sybil_checker.py +++ b/sybil_checker.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/util.py b/util.py index 9440d4c..483181e 100644 --- a/util.py +++ b/util.py @@ -15,6 +15,8 @@ FROM_ADDRESS = 'atagar(a)torproject.org' TO_ADDRESSES = ['tor-consensus-health(a)lists.torproject.org'] ERROR_ADDRESS = 'atagar(a)torproject.org' +TEST_RUN = False # print script results rather than emailing + def get_path(*comp): """ @@ -88,6 +90,13 @@ def send(subject, body, to = TO_ADDRESSES, cc = None, bcc = None): :raises: **Exception** if the email fails to be sent """ + if TEST_RUN: + print('Email to: %s' % to) + print('Subject: %s' % subject) + print('-' * 60) + print(body) + return + msg = MIMEMultipart('alternative') msg['Subject'] = subject msg['From'] = FROM_ADDRESS

1 0

[doctor/master] Support address ranges for relays we track
by atagar＠torproject.org 20 Feb '16

20 Feb '16

commit 44b3a702b34604d67cfaa0da50e5ae243e5c41c2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 20 12:42:54 2016 -0800 Support address ranges for relays we track Ewww, but Stem's ExitPolicy already supports exactly what we want in a delightfully efficient way so taking advantage of that. --- track_relays.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/track_relays.py b/track_relays.py index a65356d..bc46216 100755 --- a/track_relays.py +++ b/track_relays.py @@ -10,6 +10,7 @@ import datetime import traceback import stem.descriptor.remote +import stem.exit_policy import stem.util.conf import util @@ -111,7 +112,10 @@ def main(): for relay in get_tracked_relays(): if relay.address: if '/' in relay.address: - tracked_address_ranges[relay.address] = relay + # It's a total hack, but taking advantage of exit policies where we + # already support address ranges. + + tracked_address_ranges[stem.exit_policy.ExitPolicyRule('accept %s:*' % relay.address)] = relay else: tracked_addresses[relay.address] = relay @@ -127,7 +131,9 @@ def main(): elif desc.fingerprint in tracked_fingerprints: found_relays[tracked_fingerprints[desc.fingerprint]] = desc else: - pass # TODO: implement for tracked_address_ranges + for addr_entry, relay in tracked_address_ranges.items(): + if addr_entry.is_match(desc.address): + found_relays[relay] = desc if found_relays: log.debug("Sending a notification for %i relay entries..." % len(found_relays))

1 0

[doctor/master] Track when malicious relays return to the network
by atagar＠torproject.org 20 Feb '16

20 Feb '16

commit efa0ed43194bbc833ad91233586c40198070a94f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 20 11:36:42 2016 -0800 Track when malicious relays return to the network When BadExit relays are removed we want to continue to monitor for their return for a time after. This is a script requested by David on... https://trac.torproject.org/projects/tor/ticket/18246 Basic script's done but as the TODO comments show there's still some missing bits. --- data/tracked_relays.cfg | 22 +++++++ fingerprint_change_checker.py | 5 +- track_relays.py | 136 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 4 deletions(-) diff --git a/data/tracked_relays.cfg b/data/tracked_relays.cfg new file mode 100644 index 0000000..e25959e --- /dev/null +++ b/data/tracked_relays.cfg @@ -0,0 +1,22 @@ +# Relays we want notifications for when they reappear. This can be done by +# address (single addresses or ranges) or fingerprints. +# +# Anything in this file is public. All entries *MUST* have a description and an +# expiration date for when it can be removed. The description is particularly +# important so we can puzzle out why we were monitoring for this if it +# reappears. +# +# Few examples... +# +# PrivacyPT.description running sslstrip on 2011-01-05 +# PrivacyPT.expires 2016-01-15 +# PrivacyPT.address 84.90.72.186 +# +# trotsky.description sybil consisting of 383 exit relays on 2010-10-02 +# trotsky.expires 2016-02-01 +# trotsky.address 185.19.80.0/26 +# +# Unnamed001.description harvesting hidden services on 2012-08-12 +# Unnamed001.expires 2016-03-01 +# Unnamed001.fingerprint 05AF83344B3787D0DCCD47DC4A6A4668142A5F8C + diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py index 493f51c..e13f3d0 100755 --- a/fingerprint_change_checker.py +++ b/fingerprint_change_checker.py @@ -89,10 +89,7 @@ def main(): body += "\n" - try: - util.send(EMAIL_SUBJECT, body = body, to = ['bad-relays(a)lists.torproject.org', 'atagar(a)torproject.org']) - except Exception as exc: - log.warn("Unable to send email: %s" % exc) + util.send(EMAIL_SUBJECT, body = body, to = ['bad-relays(a)lists.torproject.org', 'atagar(a)torproject.org']) # register that we've notified for these diff --git a/track_relays.py b/track_relays.py new file mode 100755 index 0000000..e770006 --- /dev/null +++ b/track_relays.py @@ -0,0 +1,136 @@ +#!/usr/bin/env python +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Notifies if specific relays reappear in the network. +""" + +import datetime +import traceback + +import stem.descriptor.remote +import stem.util.conf + +import util + +log = util.get_logger('track_relays') + +EMAIL_SUBJECT = 'Relays Returned' + +EMAIL_BODY = """\ +The following previously BadExit relays have returned to the network... + +""" + + +class TrackedRelay(object): + """ + Represents a relay we're keeping an eye on. + + :var str identifier: brief identifier given to the entry + :var str description: description of why we're tracking it + :var datetime expires: when this entry expires + :var str address: address of the relay we're tracking + :var str fingerprint: fingerprint of the relay we're tracking + """ + + def __init__(self, identifier, config): + self.identifier = identifier + self.description = config.get('%s.description' % identifier, '') + + expires_str = config.get('%s.expires' % identifier, '') + + if not expires_str: + raise ValueError("Our config file is missing a '%s.expires' entry" % identifier) + + try: + self.expires = datetime.datetime.strptime(expires_str, '%Y-%m-%d') + except ValueError: + raise ValueError("'%s.expires' is malformed. We expect it to be in the form 'Year-Month-Day'" % identifier) + + self.address = config.get('%s.address' % identifier, None) + self.fingerprint = config.get('%s.fingerprint' % identifier, None) + + if not self.address and not self.fingerprint: + raise ValueError("We need either a '%s.address' or '%s.fingerprint' to track" % (identifier, identifier)) + + def __str__(self): + attr = [] + + if self.address: + attr.append('address: %s' % self.address) + + if self.fingerprint: + attr.append('fingerprint: %s' % self.fingerprint) + + return '%s (%s)' % (self.identifier, ', '.join(attr)) + + +def get_tracked_relays(): + """ + Provides the relays we're tracking. + + :returns: **list** of **TrackedRelay** we're tracking + + :raises: **ValueError** if our config file is malformed + """ + + config = stem.util.conf.get_config('tracked_relays') + config.load(util.get_path('data', 'tracked_relays.cfg')) + + # TODO: check for expired entries + + identifiers = set([key.split('.')[0] for key in config.keys()]) + return [TrackedRelay(identifier, config) for identifier in identifiers] + + +def main(): + # Map addresses and fingerprints to relays for constant time lookups. Address + # ranges are handled separately cuz... well, they're a pita. + + tracked_addresses = {} + tracked_address_ranges = {} + tracked_fingerprints = {} + + for relay in get_tracked_relays(): + if relay.address: + if '/' in relay.address: + tracked_address_ranges[relay.address] = relay + else: + tracked_addresses[relay.address] = relay + + if relay.fingerprint: + tracked_fingerprints[relay.fingerprint] = relay + + downloader = stem.descriptor.remote.DescriptorDownloader() + found_relays = {} # mapping of TrackedRelay => RouterStatusEntry + + for desc in downloader.get_consensus(): + if desc.address in tracked_addresses: + found_relays[tracked_addresses[desc.address]] = desc + elif desc.fingerprint in tracked_fingerprints: + found_relays[tracked_fingerprints[desc.fingerprint]] = desc + else: + pass # TODO: implement for tracked_address_ranges + + if found_relays: + log.debug("Sending a notification for %i relay entries..." % len(found_relays)) + body = EMAIL_BODY + + for tracked_relay, desc in found_relays.items(): + log.debug('* %s' % tracked_relay) + body += '* %s (%s)\n' % (tracked_relay.identifier, tracked_relay.description) + body += ' address: %s\n' % desc.address + body += ' fingerprint: %s\n\n' % desc.fingerprint + + util.send(EMAIL_SUBJECT, body = body, to = ['bad-relays(a)lists.torproject.org', 'atagar(a)torproject.org']) + + +if __name__ == '__main__': + try: + main() + except: + msg = "track_relays.py failed with:\n\n%s" % traceback.format_exc() + log.error(msg) + util.send("Script Error", body = msg, to = [util.ERROR_ADDRESS])

1 0

[doctor/master] Notify for expired tracked_relays.cfg entries
by atagar＠torproject.org 20 Feb '16

20 Feb '16

commit dc84ea9cf3992b16f938dfb007e153dc85a77392 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 20 12:20:43 2016 -0800 Notify for expired tracked_relays.cfg entries Proper expiring of tracked_relays.cfg entries. When the date passes those entries are ignored and I'm notififed. --- track_relays.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/track_relays.py b/track_relays.py index e770006..a65356d 100755 --- a/track_relays.py +++ b/track_relays.py @@ -19,7 +19,7 @@ log = util.get_logger('track_relays') EMAIL_SUBJECT = 'Relays Returned' EMAIL_BODY = """\ -The following previously BadExit relays have returned to the network... +The following previously BadExited relays have returned to the network... """ @@ -79,10 +79,25 @@ def get_tracked_relays(): config = stem.util.conf.get_config('tracked_relays') config.load(util.get_path('data', 'tracked_relays.cfg')) - # TODO: check for expired entries + results, expired = [], [] - identifiers = set([key.split('.')[0] for key in config.keys()]) - return [TrackedRelay(identifier, config) for identifier in identifiers] + for identifier in set([key.split('.')[0] for key in config.keys()]): + relay = TrackedRelay(identifier, config) + + if relay.expires > datetime.datetime.now(): + results.append(relay) + else: + expired.append(relay) + + if expired: + body = 'The following entries in tracked_relays.cfg have expired...\n\n' + + for relay in expired: + body += '* %s (%s)\n' % (relay.identifier, relay.expires.strftime('%Y-%m-%d')) + + util.send('tracked_relays.cfg entries expired', body = body, to = ['atagar(a)torproject.org']) + + return results def main():

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 20 Feb '16

20 Feb '16

commit 71bf1fc91127fa8417bbe92adffb8a592dda40b5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 20 13:15:36 2016 +0000 Update translations for mat-gui_completed --- ro.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ro.po b/ro.po index 809be69..2ba8568 100644 --- a/ro.po +++ b/ro.po @@ -4,15 +4,16 @@ # # Translators: # Andrei Draga, 2013 +# Jobava <jobaval10n(a)gmail.com>, 2016 # kyx <mihaidiaconu(a)gmail.com>, 2016 # clopotel <yo_sergiu05(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2016-01-30 08:27+0000\n" -"Last-Translator: kyx <mihaidiaconu(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-20 13:02+0000\n" +"Last-Translator: Jobava <jobaval10n(a)gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,12 +76,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Redu mărimea și calitatea PDF-ului produs" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Adaugă file nesuportate în arhive" +msgid "Remove unsupported file from archives" +msgstr "Șterge fișierul nesuportat din arhive" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Adaugă file nesuporatate (deci ne-anonimatizate) la arhiva de ieșire" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Șterge fișierul nesuportat (și prin urmare neanonimizat) din arhiva de ieșire" #: mat-gui:280 msgid "Unknown"

1 0