nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revise the generateFallbackDirLine.py script to use descriptors

Browse Source 
Patch by atagar, part of #24706.
This commit is contained in:
teor 2017-12-27 13:18:05 +11:00
parent e244738bbd
commit 2ae33e486e
No known key found for this signature in database
GPG Key ID: 740D9E39025272A2
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/ticket24706
View File

@ -3,4 +3,4 @@
fallback directory mirror lines from relay fingerprints. No more typos! fallback directory mirror lines from relay fingerprints. No more typos!
Add the lookupFallbackDirContact.py script for automatically looking up Add the lookupFallbackDirContact.py script for automatically looking up
operator contact info from relay fingerprints. operator contact info from relay fingerprints.
Implements ticket 24706. Implements ticket 24706, patch by teor and atagar.

47
scripts/maint/generateFallbackDirLine.py
View File

@ -7,35 +7,32 @@
# generateFallbackDirLine.py fingerprint ... # generateFallbackDirLine.py fingerprint ...
import sys import sys
import urllib2
import stem.descriptor.remote as remote import stem.descriptor.remote
import stem.util.tor_tools
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
print "Usage: {} fingerprint ...".format(sys.argv[0]) print('Usage: %s fingerprint ...' % sys.argv[0])
sys.exit(-1) sys.exit(1)
# we need the full consensus, because it has IPv6 ORPorts
# and we want a fingerprint to router mapping in routers
#
# stem returns document_handler='DOCUMENT' as a list of consensuses
# with one entry
consensus = remote.get_consensus(document_handler='DOCUMENT').run()[0]
for fingerprint in sys.argv[1:]: for fingerprint in sys.argv[1:]:
if fingerprint in consensus.routers: if not stem.util.tor_tools.is_valid_fingerprint(fingerprint):
r = consensus.routers[fingerprint] print("'%s' isn't a valid relay fingerprint" % fingerprint)
# Tor clients don't use DirPorts, but old code requires one for fallbacks sys.exit(1)
if r.dir_port is not None:
# IPv4:DirPort orport=ORPort id=Fingerprint ipv6=[IPv6]:IPv6ORPort # nick try:
ipv6_or_ap_list = [ apv for apv in r.or_addresses if apv[2] ] desc = stem.descriptor.remote.get_server_descriptors(fingerprint).run()[0]
ipv6_str = "" except urllib2.HTTPError as exc:
if len(ipv6_or_ap_list) > 0: if exc.code == 404:
ipv6_or_ap = ipv6_or_ap_list[0] print('# %s not found in recent descriptors' % fingerprint)
ipv6_str = " ipv6=[{}]:{}".format(ipv6_or_ap[0], ipv6_or_ap[1]) continue
print ("{}:{} orport={} id={}{} # {}"
.format(r.address, r.dir_port, r.or_port, r.fingerprint,
ipv6_str, r.nickname))
else: else:
print "# {} needs a DirPort".format(fingerprint) raise
if not desc.dir_port:
print("# %s needs a DirPort" % fingerprint)
else: else:
print "# {} not found in current consensus".format(fingerprint) ipv6_addresses = [(address, port) for address, port, is_ipv6 in desc.or_addresses if is_ipv6]
ipv6_field = ' ipv6=[%s]:%s' % ipv6_addresses[0] if ipv6_addresses else ''
print('%s:%s orport=%s id=%s%s # %s' % (desc.address, desc.dir_port, desc.or_port, fingerprint, ipv6_field, desc.nickname))