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

[bridgedb/master] Check that a networkstatus nickname matches tor-spec.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 1c96f4bbf504af86a4254078f0c0cbf01b7124d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:34:14 2013 +0000 Check that a networkstatus nickname matches tor-spec. --- lib/bridgedb/parse/networkstatus.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 9b1bb01..6e2c0d6 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -41,13 +41,32 @@ class InvalidNetworkstatusRouterIdentity(ValueError): class InvalidNetworkstatusDescriptorDigest(ValueError): """Descriptor digest of a networkstatus document 'r'-line is invalid.""" +class InvalidRouterNickname(ValueError): + """Router nickname doesn't follow tor-spec.""" + + +ALPHANUMERIC = string.letters + string.digits + def isValidRouterNickname(nickname): """Determine if a router's given nickname meets the specification. :param string nickname: An OR's nickname. """ - + try: + if not (1 <= len(nickname) <= 19): + raise InvalidRouterNickname( + "Nicknames must be between 1 and 19 characters: %r" % nickname) + for letter in nickname: + if not letter in ALPHANUMERIC: + raise InvalidRouterNickname( + "Nicknames must only use [A-Za-z0-9]: %r" % nickname) + except Exception as error: + logging.exception(error) + else: + return True + + raise InvalidRouterNickname def parseRLine(line): """Parse an 'r'-line from a networkstatus document. @@ -90,6 +109,8 @@ def parseRLine(line): try: nickname, ID = fields[:2] + isValidRouterNickname(nickname) + if ID.endswith('='): raise InvalidNetworkstatusRouterIdentity( "Skipping networkstatus parsing for router with nickname %r:"\ @@ -109,6 +130,9 @@ def parseRLine(line): except IndexError as error: logging.error(error.message) + except InvalidRouterNickname as error: + logging.error(error.message) + nickname = None except InvalidNetworkstatusRouterIdentity as error: logging.error(error.message) ID = None

1 0

[bridgedb/master] Catch Attribute error if object wasn't save in persistent.State.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit b4aa71727b1b939d1a4a6f294689de2a3e64978b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:35:41 2013 +0000 Catch Attribute error if object wasn't save in persistent.State. This happens on first run, if a `Conf` isn't saved as state.config. --- lib/bridgedb/persistent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index 6c9ebea..4429ea4 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -254,7 +254,7 @@ class State(jelly.Jellyable): updated.append(key) logging.debug("Updated %s setting: %r → %r" % (key, self.config.__dict__[key], value)) - except KeyError: + except (KeyError, AttributeError): setattr(self, key, value) new.append(key) logging.debug("New setting: %s = %r" % (key, value))

1 0

[bridgedb/master] Print tracebacks on unhandled exceptions in gen_bridge_descriptors.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit a6aa71efc9d19504eaf8ab958baba23c5f2eb7f4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:38:28 2013 +0000 Print tracebacks on unhandled exceptions in gen_bridge_descriptors. --- scripts/gen_bridge_descriptors | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index 66f07ab..816340b 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -50,6 +50,7 @@ import sys import random import re import time +import traceback from datetime import datetime from codecs import open as open @@ -821,10 +822,17 @@ def create(count): extrainfo_descriptors = list() try: for i in xrange(int(count)): - extrainfo, server, netstatus = generateDescriptors() - server_descriptors.append(server) - netstatus_consensus.append(netstatus) - extrainfo_descriptors.append(extrainfo) + print(".", end='') + try: + extrainfo, server, netstatus = generateDescriptors() + except Exception as error: + err, msg, tb = sys.exc_info() + print(traceback.print_tb(tb)) + print(error) + else: + server_descriptors.append(server) + netstatus_consensus.append(netstatus) + extrainfo_descriptors.append(extrainfo) except KeyboardInterrupt as keyint: print("Received keyboard interrupt.") print("Stopping descriptor creation and exiting.")

1 0

[bridgedb/master] Create the spacey OR fingerprint from the fingerprint, not the idkey digest.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d171a7af43963bdaedac16a274b1c370dbb9e6a1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:46:28 2013 +0000 Create the spacey OR fingerprint from the fingerprint, not the idkey digest. --- scripts/gen_bridge_descriptors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index b2ebf63..8bc2b6d 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -754,7 +754,7 @@ def generateDescriptors(): ident_digest = hashlib.sha1(idkey_public).digest() fingerprint = hashlib.sha1(idkey_public).hexdigest().upper() - fpr = convertToSpaceyFingerprint(ident_digest) + fpr = convertToSpaceyFingerprint(fingerprint) extrainfo_document = generateExtraInfo(fingerprint, timestamp, ipv4, port) extrainfo_digest = hashlib.sha1(extrainfo_document).digest()

1 0

[bridgedb/master] Don't strip fingerprint whitespace in creation of extrainfo descriptor.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ab141ba30c0f62adde2302783fbc91756b072e29 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:40:18 2013 +0000 Don't strip fingerprint whitespace in creation of extrainfo descriptor. It doesn't have whitespace, now that it is retrieved with hashlib.sha1() instead of OpenSSL.crypto.x509.digest(). --- scripts/gen_bridge_descriptors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index 816340b..fdafa75 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -594,7 +594,7 @@ def generateExtraInfo(fingerprint, ts, ipv4, port): :returns: An extra-info document (unsigned). """ extra = [] - extra.append("extra-info Unnamed %s" % fingerprint.replace(' ', '')) + extra.append("extra-info Unnamed %s" % fingerprint) extra.append("published %s" % ts) extra.append("write-history %s (900 s)\n3188736,2226176,2866176" % ts) extra.append("read-history %s (900 s)\n3891200,2483200,2698240" % ts)

1 0

[bridgedb/master] Remove unused base64 encoding of idkey digest in gen_bridge_descriptors.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit faefbb697d818901335bfb489165f7e4048e0854 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:43:23 2013 +0000 Remove unused base64 encoding of idkey digest in gen_bridge_descriptors. The raw digest is passed to the function for making the networkstatus document, where it is then base64-encoded and its trailing '='s are stripped. Remove an extra, unused line from the main makeDescriptors() function where this is done again, but not passed to the networkstatus creation function. --- scripts/gen_bridge_descriptors | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index fdafa75..b2ebf63 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -756,9 +756,6 @@ def generateDescriptors(): fingerprint = hashlib.sha1(idkey_public).hexdigest().upper() fpr = convertToSpaceyFingerprint(ident_digest) - identity = binascii.b2a_base64( - hashlib.sha1(idkey_public).digest()).strip().strip('=======') - extrainfo_document = generateExtraInfo(fingerprint, timestamp, ipv4, port) extrainfo_digest = hashlib.sha1(extrainfo_document).digest() extrainfo_hexdigest = hashlib.sha1(extrainfo_document).hexdigest().upper()

1 0

[bridgedb/master] Call raise SystemExit, not sys.exit, and tweak the format on a print statement.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9d5d9567da562cb67e57219b791542c752542969 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:48:21 2013 +0000 Call raise SystemExit, not sys.exit, and tweak the format on a print statement. --- scripts/gen_bridge_descriptors | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index 39f137a..a0b4085 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -835,7 +835,7 @@ def create(count): print("Stopping descriptor creation and exiting.") code = 1515 finally: - print("Writing descriptors to files...", end="") + print("\nWriting descriptors to files...", end="") cached = "cached-extrainfo.new" descriptor_files = { @@ -868,7 +868,7 @@ if __name__ == "__main__": if options.descriptors and (options.descriptors > 0): create(options.descriptors) else: - sys.exit(parser.format_help()) + raise SystemExit(parser.format_help()) except Exception as error: - sys.exit(error) + raise SystemExit(error)

1 0

[bridgedb/master] Sign generated descriptors with the secret OR server IDkey.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d3582ec6f6f7c6edcfbc058a8f13847bbb10093a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 00:47:24 2013 +0000 Sign generated descriptors with the secret OR server IDkey. --- scripts/gen_bridge_descriptors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index 8bc2b6d..39f137a 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -759,7 +759,7 @@ def generateDescriptors(): extrainfo_document = generateExtraInfo(fingerprint, timestamp, ipv4, port) extrainfo_digest = hashlib.sha1(extrainfo_document).digest() extrainfo_hexdigest = hashlib.sha1(extrainfo_document).hexdigest().upper() - extrainfo_sig = signDescriptorDigest(idkey, extrainfo_digest) + extrainfo_sig = signDescriptorDigest(SIDSKey, extrainfo_digest) extrainfo_desc = extrainfo_document + extrainfo_sig server = [] @@ -783,7 +783,7 @@ def generateDescriptors(): netstatus_desc = generateNetstatus(ident_digest, server_desc_digest, timestamp, ipv4, port, ipv6=ipv6, bandwidth_line=bandwidth) - server_desc += signDescriptorDigest(idkey, server_desc_digest) + server_desc += signDescriptorDigest(SIDSKey, server_desc_digest) return extrainfo_desc, server_desc, netstatus_desc def writeDescToFile(filename, descriptors):

1 0

[bridgedb/master] Change setup.py/requirements.txt to allow URI/VCS resources.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9f36a33f67311cb4e39b48a7536e37253f16d1c9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 09:07:44 2013 +0000 Change setup.py/requirements.txt to allow URI/VCS resources. The maintainer of ipaddr has ceased uploading to PyPI, and so to get pip to download it, we need to add its URI and hash to requirements.txt. The get_requirements function in setup.py must be refactored to handle parse these URIs correctly, and return dependency_links in addition to install_requires. --- requirements.txt | 2 +- setup.py | 34 ++++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index e4cd59b..eeab36f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ Mako==0.8.1 MarkupSafe==0.18 Twisted==13.1.0 coverage==3.6 -ipaddr==2.1.10 +https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7 pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 diff --git a/setup.py b/setup.py index f73347f..d07e51a 100644 --- a/setup.py +++ b/setup.py @@ -90,19 +90,33 @@ def get_cmdclass(): return cmdclass def get_requirements(): - """Extract the list of requirements from our requirements.txt.""" + """Extract the list of requirements from our requirements.txt. + + :rtype: 2-tuple + :returns: Two lists, the first is a list of requirements in the form of + pkgname==version. The second is a list of URIs or VCS checkout strings + which specify the dependency links for obtaining a copy of the + requirement. + """ requirements_file = os.path.join(os.getcwd(), 'requirements.txt') requirements = [] + links=[] try: with open(requirements_file) as reqfile: for line in reqfile.readlines(): line = line.strip() - if not line.startswith('#'): + if line.startswith('#'): + continue + elif line.startswith( + ('https://', 'git://', 'hg://', 'svn://')): + links.append(line) + else: requirements.append(line) - except OSError as oserr: - print(oserr) - return requirements + except (IOError, OSError) as error: + print(error) + + return requirements, links def get_supported_langs(): """Get the paths for all compiled translation files. @@ -243,6 +257,13 @@ class runTests(setuptools.Command): sys.path = old_path +requires, deplinks = get_requirements() +print('Found requirements:') +[print('\t%s' % name) for name in requires] + +print('Found dependency links:') +[print('\t%s' % uri) for uri in deplinks] + setuptools.setup( name='bridgedb', version=versioneer.get_version(), @@ -264,7 +285,8 @@ setuptools.setup( zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True, - install_requires=get_requirements(), + install_requires=requires, + dependency_links=deplinks, package_data={'bridgedb': get_data_files(filesonly=True)}, exclude_package_data={'bridgedb': ['*.po', '*.pot']}, message_extractors={pkgpath: [

1 0

[bridgedb/master] Fix make-ssl-cert script to output private key and cert in top-level dir.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 3f8641e9d16a54dbf806e97e77c5a279434fd3a0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Nov 16 11:28:06 2013 +0000 Fix make-ssl-cert script to output private key and cert in top-level dir. --- scripts/make-ssl-cert | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/make-ssl-cert b/scripts/make-ssl-cert index c055fa7..77fd728 100755 --- a/scripts/make-ssl-cert +++ b/scripts/make-ssl-cert @@ -31,7 +31,7 @@ while [ -h "$THIS_FILE" ]; do done THIS_PATH="$( cd -P "$( dirname "$THIS_FILE" )" && pwd )" -REPO_PATH=${THIS_PATH%%/maint} +REPO_PATH=${THIS_PATH%%/scripts} function usage () { printf "Usage: %s\n\n" $NAME @@ -54,4 +54,6 @@ openssl x509 -req -days 365 -in server.csr -signkey privkey.pem -out cert test -f "privkey.nopasswd" && rm -f privkey.nopasswd test -f "privkey" && rm -f privkey test -f "server.csr" && rm -f server.csr -echo "Done. Please retrieve the files from $REPO_PATH" + +printf "Done. Your private key was saved in ${REPO_PATH}/privkey.pem \n" +printf "and your certificate is in ${REPO_PATH}/cert \n"

1 0