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

[bridgedb/master] Fix the crunchbang in scripts/bridgedb to respect the environment.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 8a6e4edd86dcf9ee4a58ec8b0d6f1e115d09c292 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 3 06:27:10 2013 +0000 Fix the crunchbang in scripts/bridgedb to respect the environment. * This should also help save the whales. --- scripts/bridgedb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bridgedb b/scripts/bridgedb index 3739254..069cccd 100644 --- a/scripts/bridgedb +++ b/scripts/bridgedb @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import bridgedb.Main bridgedb.Main.run()

1 0

[bridgedb/master] Merge branch 'feature/9937-desc-gen-r1' into develop.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 64ff94fe6364fa9d22c9e9eda6faf04dcb9a8756 Merge: c9dc17e 686c3c0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 00:48:21 2013 +0000 Merge branch 'feature/9937-desc-gen-r1' into develop. The 'feature/9937-desc-gen-r1' branch is actually the entirety of a separate repo, https://github.com/sysrqb/tdgen from the master branch. It was merged by doing: $ git clone https://github.com/sysrqb/tdgen && cd tdgen $ cd ../bridgedb $ git checkout -b feature/9937-desc-gen develop $ git remote add tdgen ../tdgen $ git fetch tdgen $ git merge -S --no-ff tdgen/master generatedescriptors.py | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+)

1 0

[bridgedb/master] Cleanup explanations of options in bridgedb.conf.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 5f26b667d3a30a48c0f8582f88e2ef6b78ccdaf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Oct 6 05:39:22 2013 +0000 Cleanup explanations of options in bridgedb.conf. --- bridgedb.conf | 268 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 185 insertions(+), 83 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 88aa231..a0a1f57 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -1,13 +1,101 @@ +# -*- mode: python ; coding: utf-8 -*- +# +# +---------------+ +# | bridgedb.conf | +# +---------------+ +# +# This file uses Python syntax, and is sourced as if it were a .py file. Just +# pretend you're writing Python, and everything will be peachy keen. +#______________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all sentient entities within the AUTHORS file +# :license: see LICENSE for licensing information +#______________________________________________________________________________ -#========== -# General-purpose options. +#===========================# +# General-purpose options # +#___________________________# -# Either a file in which to write our pid, or None -PIDFILE = "bridgedb.pid" +#---------------- +# Required Files \ You'll want to make sure that these ones exist! +#------------------------------------------------------------------------------ +# +# All filenames are taken as relative to the RUNTIME directory, which is the +# current working directory when you call the ``bridgedb`` script, or you may +# specify a particular RUNTIME directory by doing: +# +# $ bridgedb -r /path/to/some/nice/place +# +# Obviously, this config file should live in that directory, so that BridgeDB +# can read it. +#------------------------------------------------------------------------------ + +# List of filenames from which we read ``@type bridge-server-descriptor``s, on +# startup and on SIGHUP. +BRIDGE_FILES = ["bridge-descriptors"] + +# List of filenames from which we read ``@type bridge-extra-info`` +# descriptors, for learning about a bridge's pluggable transports: +EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"] + +# Filename from which we read ``@type bridge-network-status`` entries, for +# learning which current bridges are Running, as well as their IPv6 addresses. +STATUS_FILE = "networkstatus-bridges" + +# Certificate file and private key for the HTTPS Distributor. To create a +# self-signed cert, run ``scripts/make-ssl-cert`` it will create these files +# in your current directory. +HTTPS_CERT_FILE="cert" +HTTPS_KEY_FILE="privkey.pem" + +#---------------- +# Output Files \ Where to store created data +#------------------------------------------------------------------------------ +# +# These will get automatically created for you, just specify where they should +# go. +#------------------------------------------------------------------------------ # Either a file to log to, or None if we should log to the console. LOGFILE = "bridgedb.log" +# File to which we dump bridge pool assignments for statistics. +ASSIGNMENTS_FILE = "assignments.log" + +# File in which to write our pid +PIDFILE = "bridgedb.pid" + +# Filename of the database to store persistent info in. +DB_FILE = "bridgedist.db" + +# Filename to log changes to persistent info in. For debugging and bugfixing. +DB_LOG_FILE = "bridgedist.log" + +# Filename where we store our secret HMAC root key. This file and the key +# inside are automatically created for you if they do not exist. +MASTER_KEY_FILE = "secret_key" + +# Filename that contains blocked bridges list. Comment out to disable. +#COUNTRY_BLOCK_FILE = "blocked-bridges" + +# A list of filenames that contain IP addresses (one per line) of proxies. +# All IP-based distributors that see an incoming connection from a proxy +# will treat them specially. +PROXY_LIST_FILES = [] + +#------------------ +# Logging Options \ +#------------------------------------------------------------------------------ +# +# Be sure to also see the LOGFILE option above! +#------------------------------------------------------------------------------ + +# One of "DEBUG", "INFO", "WARNING", "ERROR"... +LOGLEVEL = "DEBUG" + # If true, we scrub all potentially identifying information before we log it SAFELOGGING = True @@ -15,34 +103,9 @@ SAFELOGGING = True LOGFILE_COUNT = 5 LOGFILE_ROTATE_SIZE = 10000000 -# One of "DEBUG", "INFO", "WARNING", "ERROR"... -LOGLEVEL = "WARNING" - -# Files from which we read bridge descriptors, on start and on SIGHUP. -BRIDGE_FILES = [ "./bridge-descriptors" ] - -# File from which we read routerstatus entries, for learning which -# current bridges are Running. -STATUS_FILE = "networkstatus-bridges" - -# Either a file that contains blocked bridges list or None -#COUNTRY_BLOCK_FILE = "./blocked-bridges" - -# File from which we read extra-info entries, for learning pluggable -# transports -EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"] # Only consider routers whose purpose matches this string. BRIDGE_PURPOSE = "bridge" -# File to store persistent info in. -DB_FILE = "bridgedist.db" -# File to log changes to persistent info in. For debugging and bugfixing. -DB_LOG_FILE = "bridgedist.log" -# File in which we store our secret HMAC root key. -MASTER_KEY_FILE = "secret_key" - -# File to which we dump bridge pool assignments for statistics. -ASSIGNMENTS_FILE = "assignments.log" # How many clusters do we group IPs in when distributing bridges based on IP? # Note that if PROXY_LIST_FILES is set (below), what we actually do here @@ -51,60 +114,72 @@ ASSIGNMENTS_FILE = "assignments.log" N_IP_CLUSTERS = 4 # If possible, always give a certain number of answers with a given ORPort. -# This is a list of (port,minimum) tuples. -FORCE_PORTS = [ (443, 1) ] +# This is a list of ``(port, minimum)`` tuples. +FORCE_PORTS = [(443, 1)] # If possible, always give a certain number of answers with a given flag. # Only "stable" is now supported. This is a list of (flag,minimum) tuples. -FORCE_FLAGS = [ ("Stable", 1) ] +FORCE_FLAGS = [("Stable", 1)] -# A list of filenames that contain IP addresses (one per line) of proxies. -# All IP-based distributors that see an incoming connection from a proxy -# will treat them specially. -PROXY_LIST_FILES = [ ] - -#========== -# Options related to HTTPS +#------------------------------- +# HTTP(S) Distribution Options \ +#------------------------------------------------------------------------------ +# +# These options configure the behaviour of the web interface bridge +# distribution mechanism. If HTTPS_DIST is enabled, make sure that the above +# HTTPS_CERT_FILE and HTTPS_KEY_FILE options point to the correct location of +# your SSL certificate and key! +#------------------------------------------------------------------------------ -# True if we are enabling distribution via HTTP or HTTPS; False otherwise. +# Set to ``True`` to enable distribution via HTTP or HTTPS; False otherwise. HTTPS_DIST = True -# What proportion of bridges do we allocate to HTTP distribution? See -# EMAIL_SHARE and RESERVED_SHARE. -HTTPS_SHARE=10 -# An IP address (form "1.2.3.4") where we listen for HTTPS connections. -# "None" to listen on the default interface. -HTTPS_BIND_IP='127.0.0.1' -# Port to listen on for incoming HTTPS connections -HTTPS_PORT=6789 -# Certificate file -HTTPS_CERT_FILE="cert" -# Private key file. -HTTPS_KEY_FILE="privkey.pem" + +# (string or None) The IP address where we listen for HTTPS connections. If +# ``None``, listen on the default interface. +HTTPS_BIND_IP = '127.0.0.1' + +# (integer or None) The port to listen on for incoming HTTPS connections. +HTTPS_PORT = 6789 + +# How many bridges do we give back in an answer? +HTTPS_N_BRIDGES_PER_ANSWER = 3 + +# Should we tell http users about the bridge fingerprints? Turn this on +# once we have the vidalia/tor interaction fixed for everbody. +HTTPS_INCLUDE_FINGERPRINTS = True + # If true, there is a trusted proxy relaying incoming messages to us: take # the *last* entry from its X-Forwarded-For header as the client's IP. HTTPS_USE_IP_FROM_FORWARDED_HEADER = False -# IP and port to listen on for unencrypted HTTP connections. -HTTP_UNENCRYPTED_BIND_IP=None -HTTP_UNENCRYPTED_PORT=None -# As HTTPS_USE_IP_FROM_FORWARDED_HEADER, but for unencrypted connections. +# (string or None) The IP address to listen on for unencrypted HTTP +# connections. Set to ``None`` to disable unencrypted connections to the web +# interface. +HTTP_UNENCRYPTED_BIND_IP = None + +# (integer or None) The port to listen on for incoming HTTP connections. +HTTP_UNENCRYPTED_PORT = None + +# Same as the ``HTTPS_USE_IP_FROM_FORWARDED_HEADER`` option, but for +# unencrypted connections. HTTP_USE_IP_FROM_FORWARDED_HEADER = False -# How many bridges do we give back in an answer? -HTTPS_N_BRIDGES_PER_ANSWER=3 -HTTP_N_BRIDGES_PER_ANSWER=3 -# Should we tell http users about the bridge fingerprints? Turn this on -# once we have the vidalia/tor interaction fixed for everbody. -HTTPS_INCLUDE_FINGERPRINTS=True +# The number of bridges to hand out per response by the unencrypted HTTP +# distributor +HTTP_N_BRIDGES_PER_ANSWER = 3 -#========== -# Options related to Email +#------------------------------- +# Email Distribution Options \ +#------------------------------------------------------------------------------ +# +# These options configure the behaviour of the email bridge distribution +# mechanism. If EMAIL_DIST is enabled, make sure that the above +# HTTPS_CERT_FILE and HTTPS_KEY_FILE options point to the correct location of +# your SSL certificate and key! +# ------------------------------------------------------------------------------ # True if we are enabling distribution via Email; false otherwise. EMAIL_DIST = True -# What proportion of bridges do we allocate to Email distribution? See -# HTTPS_SHARE and RESERVED_SHARE. -EMAIL_SHARE=10 # What email addresses do we use for outgoing email? EMAIL_FROM_ADDR goes # in the From: line in outgoing headers, and EMAIL_SMTP_FROM_ADDR goes in @@ -118,11 +193,12 @@ EMAIL_SMTP_PORT = 25 EMAIL_USERNAME = "bridges" # Canonical versions of domains that we will reply to. -EMAIL_DOMAINS = [ "gmail.com", "yahoo.com" ] +EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] + # Map from unofficial domain to canonical domain. EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com", - } + "googlemail.com" : "gmail.com"} + # Map from canonical domain to list of options for that domain. Recognized # options are: # "ignore_dots" -- the service ignores "." characters in email addresses. @@ -131,14 +207,16 @@ EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", # # Note that unrecognized options are ignored; be sure to spell them right! EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"] - } + 'yahoo.com' : ["dkim"]} + # If there are any IPs in this list, only allow incoming connections from # those IPs. -EMAIL_RESTRICT_IPS=[] +EMAIL_RESTRICT_IPS = [] + # IP and port to listen on for email connections. Debugging only. EMAIL_BIND_IP="127.0.0.1" EMAIL_PORT=6725 + # How many bridges do we give back in an answer? EMAIL_N_BRIDGES_PER_ANSWER=3 @@ -150,22 +228,46 @@ EMAIL_INCLUDE_FINGERPRINTS = True EMAIL_GPG_SIGNING_ENABLED = True EMAIL_GPG_SIGNING_KEY = 'gnupghome/TESTING.subkeys.sec' -#========== -# Options related to unallocated bridges. +#------------------------------- +# Hashring Allocation Options \ +#------------------------------------------------------------------------------ +# +# These options determine the proportions of bridges per hashring. When +# BridgeDB receives a descriptor for a new bridge, that bridge is assigned to +# a hashring. For example, if ``HTTPS_DIST`` and ``EMAIL_DIST`` are both +# enabled, there is a hashring for bridges allocated to the HTTP(S) +# Distributor, and another for the Email Distributor. In addition, an +# "Unallocated" hashring is always created, in order to reserve some portion +# of bridges for manual distribution, or as backup in the case of a major +# blocking event. Once a bridge is assigned to one of these allocation groups, +# it stays there; there is currently no mechanism for changing a bridge's +# hashring allocation. +# +# The bridges are allocated to these groups with the following proportions: +# +# ``HTTPS_SHARE`` : ``EMAIL_SHARE`` : ``RESERVED_SHARE`` +# ------------------------------------------------------------------------------ + +# The proportion of bridges to allocate to HTTP distribution. +HTTPS_SHARE = 10 -# We split bridges into a group accessible by HTTPS queries; a group -# accessible by email queries; and a group that we don't assign to any -# query mechanism. Once a bridge is assigned to either of the first -# two groups, it stays there persistently. The bridges are allocated -# to these groups in a proportion of -# HTTPS_SHARE : EMAIL_SHARE : RESERVED_SHARE -RESERVED_SHARE=2 +# The proportion of bridges to allocate to Email distribution. +EMAIL_SHARE = 10 +# An integer specifying the proportion of bridges which should remain +# unallocated, for backup usage and manual distribution. +RESERVED_SHARE = 2 + +# A dictionary of {FILENAME: NUMBER} where FILENAME is a string specifying the +# filename to store a certain NUMBER (an integer) of bridges in. The number of +# bridges here is *not* a share/proportion, as above; instead it's literally +# the number of bridges. FILE_BUCKETS = {} # Options related to recaptcha support. # Enable/Disable recaptcha RECAPTCHA_ENABLED = False + # Recaptcha API keys RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = '' +RECAPTCHA_PRIV_KEY = ''

1 0

[bridgedb/master] Add 'reinstall' directive to the Makefile.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ae97c3e16324c3693b132d408d3dbd0e0870e979 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 01:02:27 2013 +0000 Add 'reinstall' directive to the Makefile. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 19225c5..0735f41 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,11 @@ test: install: python setup.py install --record installed-files.txt +force-install: + python setup.py install --force --record installed-files.txt 2>&1 >/dev/null + uninstall: touch installed-files.txt cat installed-files.txt | xargs rm -rf + +reinstall: uninstall force-install

1 0

[bridgedb/master] Move generatedescriptors.py → scripts/gen_bridge_descriptors.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e2b94720b634f99ca0ae8c0be08edf369b667224 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 01:08:56 2013 +0000 Move generatedescriptors.py → scripts/gen_bridge_descriptors. * ADD scripts/gen_bridge_descriptors to setup.py so that the crunchbang is appropriately rewritten upon installation. --- generatedescriptors.py | 107 ---------------------------------------- scripts/gen_bridge_descriptors | 107 ++++++++++++++++++++++++++++++++++++++++ setup.py | 3 +- 3 files changed, 109 insertions(+), 108 deletions(-) diff --git a/generatedescriptors.py b/generatedescriptors.py deleted file mode 100644 index 6f64ca0..0000000 --- a/generatedescriptors.py +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/sbin/env python -tt - -import sys -import random -import time -import ipaddr -from datetime import datetime -import binascii - - -def usage(): - print "syntax: generatedescriptors.py <count>\n"\ - " count: number of descriptors to generate\n" - -def randomIP(): - return randomIP4() - -def randomIP4(): - return ipaddr.IPAddress(random.getrandbits(32)) - -def randomPort(): - return random.randint(1,65535) - -def gettimestamp(): - return time.strftime("%Y-%m-%d %H:%M:%S") - -def getHexString(size): - s = "" - for i in xrange(size): - s+= random.choice("ABCDEF0123456789") - return s - -def generateDesc(): - - baseDesc = "router Unnamed %s %s 0 %s\n"\ - "opt fingerprint %s\n"\ - "opt @purpose bridge\n"\ - "opt published %s\n"\ - "router-signature\n" - fp = "DEAD BEEF F00F DEAD BEEF F00F " + \ - getHexString(4) + " " + getHexString(4) + " " + \ - getHexString(4) + " " + getHexString(4) - ip = randomIP() - orport = randomPort() - dirport = randomPort() - ID = binascii.a2b_hex(fp.replace(" ", "")) - df = baseDesc % (ip, orport, dirport, fp, gettimestamp()) - return (df, (ID, ip, orport, dirport)) - -def generateStatus(info, ID=None, ip=None, orport=None, dirport=None): - baseStatus = "r %s %s %s %s %s %d %d\n"\ - "s Running Stable\n" - - if info and len(info) == 4: - ID = info[0] - ip = info[1] - orport = info[2] - dirport = info[3] - return "".join(baseStatus % ("namedontmattah", binascii.b2a_base64(ID)[:-2], - "randomstring", gettimestamp(), ip, - orport, dirport)) - -def generateExtraInfo(fp, ip=None): - baseExtraInfo = "extra-info %s %s\n"\ - "transport %s %s:%d\n"\ - "router-signature\n" - if not ip: - ip = randomIP() - return "".join(baseExtraInfo % ("namedontmattah", fp, - random.choice(["obfs2", "obfs3", "obfs2"]), - ip, randomPort())) -if __name__ == "__main__": - if len(sys.argv) != 2: - usage() - sys.exit(0) - - df = '' - sf = '' - ei = '' - count = int(sys.argv[1]) - for i in xrange(count): - desc, info = generateDesc() - df += desc - - sf += generateStatus(info) - ei += generateExtraInfo(binascii.b2a_hex(info[0])) - - try: - f = open("networkstatus-bridges", 'w') - f.write(sf) - f.close() - except: - print "Failed to open or write to status file" - - try: - f = open("bridge-descriptors", 'w') - f.write(df) - f.close() - except: - print "Failed to open or write to descriptor file" - - try: - f = open("extra-infos", 'w') - f.write(ei) - f.close() - except: - print "Failed to open or write to extra-info file" diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors new file mode 100644 index 0000000..6f64ca0 --- /dev/null +++ b/scripts/gen_bridge_descriptors @@ -0,0 +1,107 @@ +#!/usr/sbin/env python -tt + +import sys +import random +import time +import ipaddr +from datetime import datetime +import binascii + + +def usage(): + print "syntax: generatedescriptors.py <count>\n"\ + " count: number of descriptors to generate\n" + +def randomIP(): + return randomIP4() + +def randomIP4(): + return ipaddr.IPAddress(random.getrandbits(32)) + +def randomPort(): + return random.randint(1,65535) + +def gettimestamp(): + return time.strftime("%Y-%m-%d %H:%M:%S") + +def getHexString(size): + s = "" + for i in xrange(size): + s+= random.choice("ABCDEF0123456789") + return s + +def generateDesc(): + + baseDesc = "router Unnamed %s %s 0 %s\n"\ + "opt fingerprint %s\n"\ + "opt @purpose bridge\n"\ + "opt published %s\n"\ + "router-signature\n" + fp = "DEAD BEEF F00F DEAD BEEF F00F " + \ + getHexString(4) + " " + getHexString(4) + " " + \ + getHexString(4) + " " + getHexString(4) + ip = randomIP() + orport = randomPort() + dirport = randomPort() + ID = binascii.a2b_hex(fp.replace(" ", "")) + df = baseDesc % (ip, orport, dirport, fp, gettimestamp()) + return (df, (ID, ip, orport, dirport)) + +def generateStatus(info, ID=None, ip=None, orport=None, dirport=None): + baseStatus = "r %s %s %s %s %s %d %d\n"\ + "s Running Stable\n" + + if info and len(info) == 4: + ID = info[0] + ip = info[1] + orport = info[2] + dirport = info[3] + return "".join(baseStatus % ("namedontmattah", binascii.b2a_base64(ID)[:-2], + "randomstring", gettimestamp(), ip, + orport, dirport)) + +def generateExtraInfo(fp, ip=None): + baseExtraInfo = "extra-info %s %s\n"\ + "transport %s %s:%d\n"\ + "router-signature\n" + if not ip: + ip = randomIP() + return "".join(baseExtraInfo % ("namedontmattah", fp, + random.choice(["obfs2", "obfs3", "obfs2"]), + ip, randomPort())) +if __name__ == "__main__": + if len(sys.argv) != 2: + usage() + sys.exit(0) + + df = '' + sf = '' + ei = '' + count = int(sys.argv[1]) + for i in xrange(count): + desc, info = generateDesc() + df += desc + + sf += generateStatus(info) + ei += generateExtraInfo(binascii.b2a_hex(info[0])) + + try: + f = open("networkstatus-bridges", 'w') + f.write(sf) + f.close() + except: + print "Failed to open or write to status file" + + try: + f = open("bridge-descriptors", 'w') + f.write(df) + f.close() + except: + print "Failed to open or write to descriptor file" + + try: + f = open("extra-infos", 'w') + f.write(ei) + f.close() + except: + print "Failed to open or write to extra-info file" diff --git a/setup.py b/setup.py index 0e3dba4..d7ef9f5 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,8 @@ setuptools.setup( url='https://www.torproject.org', package_dir= {'' : 'lib'}, packages=['bridgedb'], - scripts=['scripts/bridgedb',], + scripts=['scripts/bridgedb', + 'scripts/gen_bridge_descriptors'], extras_require={'test': ["sure>=0.4.5", "trialcoverage>=0.3.12"]}, zip_safe=False,

1 0

[bridgedb/master] Rewrite/refactor descriptor generator code
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 686c3c026e292623ca1f528ecec2d7a70505e7d8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 16 02:16:41 2013 +0000 Rewrite/refactor descriptor generator code It should be better this way. --- generatedescriptors.py | 131 ++++++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 54 deletions(-) diff --git a/generatedescriptors.py b/generatedescriptors.py index d507401..6f64ca0 100644 --- a/generatedescriptors.py +++ b/generatedescriptors.py @@ -8,6 +8,10 @@ from datetime import datetime import binascii +def usage(): + print "syntax: generatedescriptors.py <count>\n"\ + " count: number of descriptors to generate\n" + def randomIP(): return randomIP4() @@ -18,8 +22,7 @@ def randomPort(): return random.randint(1,65535) def gettimestamp(): - ts = time.strftime("%Y-%m-%d %H:%M:%S") - return "opt published %s\n" % ts + return time.strftime("%Y-%m-%d %H:%M:%S") def getHexString(size): s = "" @@ -27,58 +30,78 @@ def getHexString(size): s+= random.choice("ABCDEF0123456789") return s +def generateDesc(): -baseDesc = "router Unnamed %s %s 0 9030\n"\ -"opt fingerprint %s\n"\ -"opt @purpose bridge\n" - -baseStatus = "r %s %s %s %s %s %d %d\n"\ -"s Running Stable\n" - -baseExtraInfo = "extra-info %s %s\n"\ -"transport %s %s:%d\n" - -ei = "" -df = "" -sf = "" -for i in xrange(500): + baseDesc = "router Unnamed %s %s 0 %s\n"\ + "opt fingerprint %s\n"\ + "opt @purpose bridge\n"\ + "opt published %s\n"\ + "router-signature\n" fp = "DEAD BEEF F00F DEAD BEEF F00F " + \ - getHexString(4) + " " + getHexString(4) + " " + \ - getHexString(4) + " " + getHexString(4) + getHexString(4) + " " + getHexString(4) + " " + \ + getHexString(4) + " " + getHexString(4) + ip = randomIP() + orport = randomPort() + dirport = randomPort() ID = binascii.a2b_hex(fp.replace(" ", "")) - - sf += "".join(baseStatus % ("namedontmattah", binascii.b2a_base64(ID)[:-2], - "randomstring", time.strftime("%Y-%m-%d %H:%M:%S"), randomIP(), - randomPort(), randomPort())) - - df += "".join(baseDesc % (randomIP(), randomPort(), fp)) - df += gettimestamp() - df += "router-signature\n" - - if i % 4 == 0: - ei += "".join(baseExtraInfo % ("namedontmattah", fp.replace(" ", ""), - random.choice(["obfs2", "obfs3", "obfs2"]), - randomIP(), randomPort())) - -ei += "router-signature\n" - -try: - f = open("networkstatus-bridges", 'w') - f.write(sf) - f.close() -except: - print "Failed to open status file" - -try: - f = open("bridge-descriptors", 'w') - f.write(df) - f.close() -except: - print "Failed to open df file" - -try: - f = open("extra-infos", 'w') - f.write(ei) - f.close() -except: - print "Failed to open ei file" + df = baseDesc % (ip, orport, dirport, fp, gettimestamp()) + return (df, (ID, ip, orport, dirport)) + +def generateStatus(info, ID=None, ip=None, orport=None, dirport=None): + baseStatus = "r %s %s %s %s %s %d %d\n"\ + "s Running Stable\n" + + if info and len(info) == 4: + ID = info[0] + ip = info[1] + orport = info[2] + dirport = info[3] + return "".join(baseStatus % ("namedontmattah", binascii.b2a_base64(ID)[:-2], + "randomstring", gettimestamp(), ip, + orport, dirport)) + +def generateExtraInfo(fp, ip=None): + baseExtraInfo = "extra-info %s %s\n"\ + "transport %s %s:%d\n"\ + "router-signature\n" + if not ip: + ip = randomIP() + return "".join(baseExtraInfo % ("namedontmattah", fp, + random.choice(["obfs2", "obfs3", "obfs2"]), + ip, randomPort())) +if __name__ == "__main__": + if len(sys.argv) != 2: + usage() + sys.exit(0) + + df = '' + sf = '' + ei = '' + count = int(sys.argv[1]) + for i in xrange(count): + desc, info = generateDesc() + df += desc + + sf += generateStatus(info) + ei += generateExtraInfo(binascii.b2a_hex(info[0])) + + try: + f = open("networkstatus-bridges", 'w') + f.write(sf) + f.close() + except: + print "Failed to open or write to status file" + + try: + f = open("bridge-descriptors", 'w') + f.write(df) + f.close() + except: + print "Failed to open or write to descriptor file" + + try: + f = open("extra-infos", 'w') + f.write(ei) + f.close() + except: + print "Failed to open or write to extra-info file"

1 0

[bridgedb/master] Update setup.py to exclude .po files from installs; update crunchbang.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 239e9da374429011b3981c73f5797052c93f7839 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 03:12:23 2013 +0000 Update setup.py to exclude .po files from installs; update crunchbang. * ADD exclude_package_data directive to setuptools.setup() call, to exclude all .po files from being installed. * FIX the crunchbang in setup.py to respect the environment and save the whales and all that. * UPDATE the copyright/authors/license header. I hear it's not 2007 anymore. --- setup.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d7ef9f5..8a6175c 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,16 @@ -#!/usr/bin/python -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2009, The Tor Project, Inc. -# See LICENSE for licensing information +#!/usr/bin/env python +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> +# Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ from __future__ import print_function @@ -143,6 +152,7 @@ setuptools.setup( package_data={'bridgedb': ['i18n/*/LC_MESSAGES/*.mo', 'templates/*.html', 'templates/assets/*']}, + exclude_package_data={'': ['*.po']}, message_extractors = {'lib/bridgedb': [ ('**.py', 'python', None), ('templates/**.html', 'mako', None),

1 0

[bridgedb/master] Add a .DEFAULT to the Makefile.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9b11bccef291d252dba7faa0d29e4f47de54c0b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 01:00:58 2013 +0000 Add a .DEFAULT to the Makefile. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6812422..19225c5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ .PHONY: install test +.DEFAULT: install test all: python setup.py build

1 0

[bridgedb/master] Add completed hu/…/.po translation file from translations repo.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c717ae0bf6b7ba67945d5d9342c3c55cd907e7f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 03:33:46 2013 +0000 Add completed hu/…/.po translation file from translations repo. --- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..7fa4bde --- /dev/null +++ b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# vargaviktor <viktor.varga(a)gmail.com>, 2013 +# vargaviktor <viktor.varga(a)gmail.com>, 2011 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-10-01 16:28+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Mik is a Hidak?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Híd kapcsolók %s Tor kapcsolók, amelyek a cenzorálás megkerülésére használhatók." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Szükségem van egy alternatív módra a Hidak beszerzéséhez!" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Másik lehetőség publikus hidak beszerzésére, ha küld egy emailt (a %s vagy %s címről) a %s címree, a 'get bridges' sorral a levél törzsében." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "A Hídjaim nem működnek! Segítségre van szükségem!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Ha a Tor nem működik írnia kell a %s címre. Próbáljon meg amennyi információt csak lehet belefoglalni, beleértve a használt hidak listáját is, a csomag fájlnevét/verzióját amit használt, az üzenetet amit a Tor adott ki, stb." + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "A fenti sorok használatához menjen a Vidalia Hálózati beállítások oldalára, majd kattintson \"Az internetszolgáltatóm blokkolja a Tor hálózathoz kapcsolódást\" opcióra. Utána egyesével adja hozzá a hídcímeket." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Nincsen elérhető híd." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Frissítse a böngészőjét Firefox-ra" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Írja be a két szót" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "1. lépés" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Szerezzen %s Tor böngésző csomagot %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "2. lépés" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Szerezzen be %s hidat %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "3. lépés" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Most %s hozzáadja a hidakat a Tor %s-hez."

1 0

[bridgedb/master] Update completed fr/…/.po translation file from translations repo.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit eeb871a72121edbf2566fa792e1b5ae7e0f3544e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 11 03:32:11 2013 +0000 Update completed fr/…/.po translation file from translations repo. --- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 1b29b05..0dc56bf 100644 --- a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: # lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 @@ -11,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-30 15:07+0000\n" +"PO-Revision-Date: 2013-10-06 18:20+0000\n" "Last-Translator: lunar <lunar(a)torproject.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -23,17 +24,17 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "Que sont les passerelles ?" +msgstr "Que sont les « bridges » ?" #: lib/bridgedb/templates/base.html:34 #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Les passerelles %s sont des relais Tor qui vous aident à contourner la censure." +msgstr "%s Les bridges %s sont des relais Tor qui vous aident à contourner la censure." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "J'ai besoin d'une alternative pour obtenir des passerelles !" +msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -41,11 +42,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "Une autre manière de découvrir des adresses de passerelles publiques est d'envoyer un e-mail (à partir d'un %s ou de l'adresse d'un %s) à %s avec la ligne 'get bridges' dans le corps de l'e-mail." +msgstr "Une autre manière de découvrir des adresses de bridge est d'envoyer un email (à partir d'une adresse en %s ou en %s) à %s avec la ligne « get bridges » dans le corps du message." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "Mes passerelles ne fonctionnent pas, j'ai besoin d'aide !" +msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -53,18 +54,18 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Si votre logiciel Tor ne fonctionne pas, vous devriez envoyer un e-mail à %s. Essayez d'inclure autant d'informations que possible concernant votre cas, incluant la liste des passerelles que vous avez utilisées, le nom / la version du paquetage, les messages que Tor a renvoyé, etc." +msgstr "Si Tor ne fonctionne pas, envoyez un email à %s. Essayez d'inclure autant d'informations que possible concernant votre cas, incluant la liste des bridges que vous avez utilisées, le nom et la version du bundle, les messages que Tor a renvoyé, etc." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "Pour utiliser les lignes ci-dessus, allez dans la configuration Réseau de Vidalia et cochez \"Mon FAI bloque les connexions au réseau Tor\". Puis ajoutez une à une les adresses de passerelles." +msgstr "Pour utiliser les lignes ci-dessus, allez dans l'onglet Réseau de Vidalia et cochez « Mon FAI bloque les connexions au réseau Tor ». Puis ajoutez une à une les adresses des bridges." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "Aucune passerelle actuellement disponible." +msgstr "Aucune bridge n'est actuellement disponible." #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" @@ -76,7 +77,7 @@ msgstr "Entrez les deux mots" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "Etape 1" +msgstr "Étape 1" #: lib/bridgedb/templates/index.html:8 #, python-format @@ -85,18 +86,18 @@ msgstr "Récupérez le %s Tor Browser Bundle %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "Etape 2" +msgstr "Étape 2" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "Récupérez les %s passerelles %s" +msgstr "Récupérez les %s addresses de bridge %s" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "Etape 3" +msgstr "Étape 3" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "Maintenant %s ajoutez les passerelles dans Tor %s" +msgstr "Maintenant %s ajoutez les adresses de bridge dans Tor %s"

1 0