July 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'fix/16273-gitweb-urls' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 82ede52d56571dbafbdd0db7102388267052fe2e Merge: a768c84 bd6bd83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 2 21:06:53 2015 +0000 Merge branch 'fix/16273-gitweb-urls' into develop doc/proposals/XXX-bridgedb-database-improvements.txt | 4 ++-- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/templates/base.html | 2 +- lib/bridgedb/test/deprecated.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)

1 0

[bridgedb/master] Fix typo in bridgedb.bridges.Bridge.__init__() docstring.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit a768c8463f4e359de4122a550daeaca06595cfad Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:52:31 2015 +0000 Fix typo in bridgedb.bridges.Bridge.__init__() docstring. --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index e1c8738..0dfc4b1 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -821,7 +821,7 @@ class Bridge(BridgeBackwardsCompatibility): _checkServerDescriptorSignature = True def __init__(self, *args, **kwargs): - """Create a and store information for a new ``Bridge``. + """Create and store information for a new ``Bridge``. .. info: For backwards compatibility, `nickname`, `ip`, and `orport` must be the first, second, and third arguments, respectively. The

1 0

[bridgedb/master] Update URLs for new gitweb.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit dea3d6c78cc124ae2aa08dc209b1662969c8b7d4 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 2 12:15:34 2015 -0700 Update URLs for new gitweb. --- doc/proposals/XXX-bridgedb-database-improvements.txt | 4 ++-- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/templates/base.html | 2 +- lib/bridgedb/test/deprecated.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/proposals/XXX-bridgedb-database-improvements.txt b/doc/proposals/XXX-bridgedb-database-improvements.txt index 2d25bd2..fcbd579 100644 --- a/doc/proposals/XXX-bridgedb-database-improvements.txt +++ b/doc/proposals/XXX-bridgedb-database-improvements.txt @@ -240,9 +240,9 @@ Status: Open [0]: https://bridges.torproject.org mailto:bridges@bridges.torproject.org [1]: See proposals 199-bridgefinder-integration.txt at - https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/199-bridgefi… + https://gitweb.torproject.org/torspec.git/tree/proposals/199-bridgefinder-i… [2]: See XXX-social-bridge-distribution.txt at - https://gitweb.torproject.org/user/isis/bridgedb.git/blob/refs/heads/featur… + https://gitweb.torproject.org/user/isis/bridgedb.git/tree/doc/proposals/XXX… [3]: https://metrics.torproject.org/formats.html#descriptortypes [4]: https://github.com/couchbase/couchbase-python-client#twisted-api [5]: https://twistedmatrix.com/documents/current/api/twisted.protocols.memcache.… diff --git a/doc/proposals/XXX-bridgedb-social-distribution.txt b/doc/proposals/XXX-bridgedb-social-distribution.txt index cd211c6..e424d34 100644 --- a/doc/proposals/XXX-bridgedb-social-distribution.txt +++ b/doc/proposals/XXX-bridgedb-social-distribution.txt @@ -481,7 +481,7 @@ Status: Draft Proceedings of the twelfth annual ACM-SIAM symposium on Discrete algorithms. Society for Industrial and Applied Mathematics, 2001. http://www.wisdom.weizmann.ac.il/%7Enaor/PAPERS/eotp.ps - https://gitweb.torproject.org/user/isis/bridgedb.git/tree/refs/heads/featur… + https://gitweb.torproject.org/user/isis/bridgedb.git/tree/doc/papers/naor20… [3]: https://crypto.stanford.edu/pbc/ http://repo.or.cz/r/pbc.git [4]: https://www.gitorious.org/pypbc/pages/Documentation diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 191dc08..d4e331e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -63,7 +63,7 @@ class BridgeRingParameters(object): :ivar list needFlags: List of two-tuples of desired flags_ assigned to a Bridge by the Bridge DirAuth. - .. _flags: https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt#l1696 + .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1696 """ def __init__(self, needPorts=[], needFlags=[]): diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 0dfc4b1..5fe3355 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -109,7 +109,7 @@ class Flags(object): | "Valid" if the router has been 'validated'. .. _dir-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/7647f6d4d:/dir-spec.txt#l1603 + https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… :param list flags: A list of strings containing each of the flags parsed from the 's'-line. @@ -223,7 +223,7 @@ class PluggableTransport(BridgeAddressBase): additional specification. .. _pt-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt + https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt :type fingerprint: str :ivar fingerprint: The uppercased, hexadecimal fingerprint of the identity diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index f26837a..4a0b92d 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -91,7 +91,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)} <a href="https://gitweb.torproject.org/bridgedb.git"> <i class="icon icon-large icon-code"> ${_("Source Code")}</i></a>   ·   - <a href="https://gitweb.torproject.org/bridgedb.git/blob/HEAD:/CHANGELOG"> + <a href="https://gitweb.torproject.org/bridgedb.git/tree/CHANGELOG"> <i class="icon icon-large icon-rocket"> ${_("Changelog")}</i></a>   ·   <a href="mailto:help@rt.torproject.org"> diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index df660b6..39920a2 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -332,7 +332,7 @@ class PluggableTransport(object): {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} .. _pt-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt + https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt """ #XXX: assert are disabled with python -O assert isinstance(bridge, Bridge)

1 0

[bridgedb/master] Documentation; import bridgedb.parse modules into Sphinx conf.py.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit e6e7ea12af85f94813d95603043c02294da8eaf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 3 01:00:11 2015 +0000 Documentation; import bridgedb.parse modules into Sphinx conf.py. --- doc/sphinx/source/conf.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 2f01b4c..5cd485f 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -44,6 +44,14 @@ import bridgedb.Filters import bridgedb.geo import bridgedb.HTTPServer import bridgedb.Main +import bridgedb.parse +import bridgedb.parse.addr +import bridgedb.parse.descriptors +import bridgedb.parse.fingerprint +import bridgedb.parse.headers +import bridgedb.parse.nickname +import bridgedb.parse.options +import bridgedb.parse.versions import bridgedb.persistent import bridgedb.proxy import bridgedb.qrcodes

1 0

[bridgedb/master] Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit bd5866b65fa670b41e96672325e8540e32286012 Merge: be58b8f 4e3aa2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:21:17 2015 +0000 Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/parse/addr.py | 8 ++------ lib/bridgedb/test/legacy_Tests.py | 9 ++------- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_parse_addr.py | 2 +- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 15 files changed, 40 insertions(+), 28 deletions(-)

1 0

[bridgedb/master] Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit be58b8f8a70b3e1e4f3cd6d3e10b6fe2a82a7998 Merge: e6e7ea1 d84d884 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:03:28 2015 +0000 Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop lib/bridgedb/bridges.py | 2 +- lib/bridgedb/parse/descriptors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/master] Minor cleanup for htmlify_string() from commits faf48983 and ccb3b8d1.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 0b62526335ed532fee5b2b1b3cba4ea04424333a Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 4 02:58:01 2015 +0000 Minor cleanup for htmlify_string() from commits faf48983 and ccb3b8d1. First, we don't need the bridgedb.util.htmlify_string() function, since Mako provides syntax for "piping" content about to be written to the page through filters [0] and it even provides a HTML-escaping function (by default, it uses markupsafe.escape). Second, we do actually need to remove control characters (at the very least, but since technically we're parsing unicode… removing all escape/control characters isn't actually feasible) from bridge lines. * REMOVE bridgedb.util.htmlify_string(). * CHANGE lib/bridgedb/templates/bridges.html to use Mako's builtin text filtering syntax and functions for replacing HTML token characters with their corresponding HTML special characters. * ADD bridgedb.util.replaceControlChars(). * ADD unittests to ensure that everything is escaped properly. [0]: http://docs.makotemplates.org/en/latest/filtering.html --- lib/bridgedb/HTTPServer.py | 12 ++-- lib/bridgedb/templates/bridges.html | 8 ++- lib/bridgedb/test/test_HTTPServer.py | 109 ++++++++++++++++++++++++++++++++-- lib/bridgedb/util.py | 50 +++++++++------- 4 files changed, 145 insertions(+), 34 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c969908..beff4bd 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -56,7 +56,7 @@ from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely from bridgedb.schedule import Unscheduled from bridgedb.schedule import ScheduledInterval -from bridgedb.util import htmlify_string +from bridgedb.util import replaceControlChars TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') @@ -739,12 +739,11 @@ class WebResourceBridges(resource.Resource): self.nBridgesToGive, countryCode, bridgeFilterRules=rules) - bridgeLines = "".join("%s\n" % b.getConfigLine( + bridgeLines = [replaceControlChars(b.getConfigLine( includeFingerprint=self.includeFingerprints, addressClass=addressClass, transport=transport, - request=bridgedb.Dist.uniformMap(ip) - ) for b in bridges) + request=bridgedb.Dist.uniformMap(ip))) for b in bridges] answer = self.renderAnswer(request, bridgeLines, format) return answer @@ -772,7 +771,7 @@ class WebResourceBridges(resource.Resource): if format == 'plain': request.setHeader("Content-Type", "text/plain") try: - rendered = bytes(bridgeLines) + rendered = bytes('\n'.join(bridgeLines)) except Exception as err: rendered = replaceErrorPage(err) else: @@ -790,8 +789,7 @@ class WebResourceBridges(resource.Resource): rtl=rtl, lang=langs[0], answer=bridgeLines, - qrcode=qrcode, - htmlify_string=htmlify_string) + qrcode=qrcode) except Exception as err: rendered = replaceErrorPage(err) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 0ecf1d4..b5ac544 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -1,8 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<%page args="strings, rtl=False, lang='en', answer=0, qrcode=0, - htmlify_string=None, **kwargs"/> +<%page args="strings, rtl=False, lang='en', answer=0, qrcode=0, **kwargs"/> </div> </div> @@ -67,7 +66,10 @@ <div class="row" id="bridgesrow1"> <div class="col col-lg-12"> <div class="bridge-lines" id="bridgelines"> -${htmlify_string(answer)} +## See http://docs.makotemplates.org/en/latest/filtering.html +% for bridgeline in answer: +${bridgeline | h,trim}<br /> +% endfor </div> </div> </div> diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 68616bf..d597c55 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -422,6 +422,8 @@ class DummyBridge(object): """A mock :class:`bridgedb.Bridges.Bridge` which only supports a mocked ``getConfigLine`` method.""" + ptArgs = {} + def _randORPort(self): return random.randint(9001, 9999) def _randPTPort(self): return random.randint(6001, 6666) def _returnFour(self): return random.randint(2**24, 2**32-1) @@ -457,16 +459,32 @@ class DummyBridge(object): line.append(str(transport)) line.append("%s:%s" % (self.ip, self.orport)) if includeFingerprint is True: line.append(self.fingerprint) + if self.ptArgs: + line.append(','.join(['='.join(x) for x in self.ptArgs.items()])) bridgeLine = " ".join([item for item in line]) #print "Created config line: %r" % bridgeLine return bridgeLine +class DummyMaliciousBridge(DummyBridge): + """A mock :class:`bridgedb.Bridges.Bridge` which only supports a mocked + ``getConfigLine`` method and which maliciously insert an additional fake + bridgeline and some javascript into its PT arguments. + """ + ptArgs = { + "eww": "\rBridge 1.2.3.4:1234", + "bad": "\nBridge 6.6.6.6:6666 0123456789abcdef0123456789abcdef01234567", + "evil": "<script>alert('fuuuu');</script>", + } + + class DummyIPBasedDistributor(object): """A mocked :class:`bridgedb.Dist.IPBasedDistributor` which is used to test :class:`bridgedb.HTTPServer.WebResourceBridges. """ + _bridge_class = DummyBridge + def _dumbAreaMapper(ip): return ip def __init__(self, areaMapper=None, nClusters=None, key=None, @@ -486,7 +504,7 @@ class DummyIPBasedDistributor(object): """Needed because it's called in :meth:`WebResourceBridges.getBridgesForIP`. """ - return [DummyBridge() for _ in xrange(N)] + return [self._bridge_class() for _ in xrange(N)] class DummyRequest(requesthelper.DummyRequest): @@ -520,11 +538,19 @@ class WebResourceBridgesTests(unittest.TestCase): self.dist = DummyIPBasedDistributor() self.sched = ScheduledInterval(1, 'hour') self.nBridgesPerRequest = 2 + + def useBenignBridges(self): + self.dist._bridge_class = DummyBridge self.bridgesResource = HTTPServer.WebResourceBridges( - self.dist, self.sched, N=2, - #useForwardedHeader=True, + self.dist, self.sched, N=self.nBridgesPerRequest, includeFingerprints=True) + self.root.putChild(self.pagename, self.bridgesResource) + def useMaliciousBridges(self): + self.dist._bridge_class = DummyMaliciousBridge + self.bridgesResource = HTTPServer.WebResourceBridges( + self.dist, self.sched, N=self.nBridgesPerRequest, + includeFingerprints=True) self.root.putChild(self.pagename, self.bridgesResource) def parseBridgesFromHTMLPage(self, page): @@ -550,8 +576,76 @@ class WebResourceBridgesTests(unittest.TestCase): return bridges + def test_render_GET_malicious_newlines(self): + """Test rendering a request when the some of the bridges returned have + malicious (HTML, Javascript, etc., in their) PT arguments. + """ + self.useMaliciousBridges() + + request = DummyRequest([self.pagename]) + request.method = b'GET' + request.getClientIP = lambda: '1.1.1.1' + + page = self.bridgesResource.render(request) + self.assertTrue( + 'bad=Bridge 6.6.6.6:6666 0123456789abcdef0123456789abcdef01234567' in str(page), + "Newlines in bridge lines should be removed.") + + def test_render_GET_malicious_returnchar(self): + """Test rendering a request when the some of the bridges returned have + malicious (HTML, Javascript, etc., in their) PT arguments. + """ + self.useMaliciousBridges() + + request = DummyRequest([self.pagename]) + request.method = b'GET' + request.getClientIP = lambda: '1.1.1.1' + + page = self.bridgesResource.render(request) + self.assertTrue( + 'eww=Bridge 1.2.3.4:1234' in str(page), + "Return characters in bridge lines should be removed.") + + def test_render_GET_malicious_javascript(self): + """Test rendering a request when the some of the bridges returned have + malicious (HTML, Javascript, etc., in their) PT arguments. + """ + self.useMaliciousBridges() + + request = DummyRequest([self.pagename]) + request.method = b'GET' + request.getClientIP = lambda: '1.1.1.1' + + page = self.bridgesResource.render(request) + self.assertTrue( + "evil=<script>alert('fuuuu');</script>" in str(page), + ("The characters &, <, >, ', and \" in bridge lines should be " + "replaced with their corresponding HTML special characters.")) + + def test_renderAnswer_GET_textplain_malicious(self): + """If the request format specifies 'plain', we should return content + with mimetype 'text/plain' and ASCII control characters replaced. + """ + self.useMaliciousBridges() + + request = DummyRequest([self.pagename]) + request.args.update({'format': ['plain']}) + request.getClientIP = lambda: '4.4.4.4' + request.method = b'GET' + + page = self.bridgesResource.render(request) + self.assertTrue("html" not in str(page)) + self.assertTrue( + 'eww=Bridge 1.2.3.4:1234' in str(page), + "Return characters in bridge lines should be removed.") + self.assertTrue( + 'bad=Bridge 6.6.6.6:6666' in str(page), + "Newlines in bridge lines should be removed.") + def test_render_GET_vanilla(self): """Test rendering a request for normal, vanilla bridges.""" + self.useBenignBridges() + request = DummyRequest([self.pagename]) request.method = b'GET' request.getClientIP = lambda: '1.1.1.1' @@ -577,6 +671,8 @@ class WebResourceBridgesTests(unittest.TestCase): """The client's IP address should be obtainable from the 'X-Forwarded-For' header in the request. """ + self.useBenignBridges() + self.bridgesResource.useForwardedHeader = True request = DummyRequest([self.pagename]) request.method = b'GET' @@ -594,6 +690,8 @@ class WebResourceBridgesTests(unittest.TestCase): def test_render_GET_RTLlang(self): """Test rendering a request for plain bridges in Arabic.""" + self.useBenignBridges() + request = DummyRequest([b"bridges?transport=obfs3"]) request.method = b'GET' request.getClientIP = lambda: '3.3.3.3' @@ -614,6 +712,8 @@ class WebResourceBridgesTests(unittest.TestCase): def test_render_GET_RTLlang_obfs3(self): """Test rendering a request for obfs3 bridges in Farsi.""" + self.useBenignBridges() + request = DummyRequest([b"bridges?transport=obfs3"]) request.method = b'GET' request.getClientIP = lambda: '3.3.3.3' @@ -643,11 +743,12 @@ class WebResourceBridgesTests(unittest.TestCase): self.assertGreater(int(port), 0) self.assertLessEqual(int(port), 65535) - def test_renderAnswer_textplain(self): """If the request format specifies 'plain', we should return content with mimetype 'text/plain'. """ + self.useBenignBridges() + request = DummyRequest([self.pagename]) request.args.update({'format': ['plain']}) request.getClientIP = lambda: '4.4.4.4' diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 580f31f..7f906d7 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -180,26 +180,6 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, memo[key] = distance return distance -htmlify_string_map = { - '<': '<', - '>': '>', - '&': '&', - '"': '"', - "'": ''', - '\n': '<br/>' - } -def htmlify_string(s): - """Encode HTML special characters, and newlines, in s. - - >>> htmlify_string('<script>alert("badthink");</script>') - '<script>alert("badthink");</script>' - >>> htmlify_string('bridge 1\nbridge 2') - 'bridge 1<br/>bridge 2' - - :param str s: The string to encode. - """ - return ''.join(map((lambda ch: htmlify_string_map.get(ch, ch)), s)) - def isascii(s): """Return True if there are no non-ASCII characters in s, False otherwise. @@ -235,6 +215,36 @@ def isascii_noncontrol(s): """ return all(map((lambda ch: 32 <= ord(ch) < 127), s)) +def replaceControlChars(text, replacement=None, encoding="utf-8"): + """Remove ASCII control characters [0-31, 92, 127]. + + >>> replaceControlChars('foo\n bar\\ baz\r \t\0quux\n') + 'foo bar baz quux' + >>> replaceControlChars("\bI wonder if I'm outside the quotes now") + "I wonder if I'm outside the quotes now" + + :param str text: Some text to remove ASCII control characters from. + :param int replacement: If given, the **replacement** should be an integer + representing the decimal representation of the byte to replace + occurences of ASCII control characters with. For example, if they + should be replaced with the character ``'a'``, then ``97`` should be + used as the **replacement**, because ``ord('a') == 97``. + :param str encoding: The encoding of the **text**. + :rtype: str + :returns: The sanitized **text**. + """ + escaped = bytearray() + + for byte in bytearray(text, encoding): + if byte in range(0, 32) + [92, 127]: + if replacement: + byte = replacement + else: + continue + escaped += bytearray([byte]) + + return str(escaped) + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[bridgedb/master] Merge remote-tracking branch 'rr/2015-04-30-03-security-fixes' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 4fb9962bf80c5693937e83079b3083220431b11d Merge: 9a4cf49 44e3190 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:25:45 2015 +0000 Merge remote-tracking branch 'rr/2015-04-30-03-security-fixes' into develop lib/bridgedb/HTTPServer.py | 4 ++- lib/bridgedb/bridges.py | 45 ++++++++++++++++++++++++++++ lib/bridgedb/templates/bridges.html | 5 ++-- lib/bridgedb/util.py | 55 +++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Remove 'git+' prefix from pip dependency URIs before passing to setup().
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit bca32d2835dd396b756fc3afb30b7e8ce5c98798 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 16 04:20:42 2015 +0000 Remove 'git+' prefix from pip dependency URIs before passing to setup(). In order for Pip to install dependency from git, we need to use a URI like: git+https://git.torproject.org/stem.git@master#egg=stem-1.4.1-py.2.7 However, setuptools will choke on the 'git+' portion of a line like that, so we need to remove that prefix before before adding it to the setuptools dependency_links. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 032aa10..b788a7e 100644 --- a/setup.py +++ b/setup.py @@ -108,7 +108,9 @@ def get_requirements(): line = line.strip() if line.startswith('#'): continue - elif line.startswith( + if line.startswith(('git+', 'hg+', 'svn+')): + line = line[line.index('+') + 1:] + if line.startswith( ('https://', 'git://', 'hg://', 'svn://')): links.append(line) else:

1 0

[bridgedb/master] Remove unused code from test/legacy_Tests.py.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 3ec9dfb50d37f71b8d77e5b106c07cbc2bd397d2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 14 09:36:49 2015 +0000 Remove unused code from test/legacy_Tests.py. --- lib/bridgedb/test/legacy_Tests.py | 48 +------------------------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index bdea142..0d2512c 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -11,7 +11,6 @@ from __future__ import print_function import os import random -import sqlite3 import tempfile import unittest import warnings @@ -48,11 +47,6 @@ from math import log def suppressWarnings(): warnings.filterwarnings('ignore', '.*tmpnam.*') -def random16IP(): - upper = "123.123." # same 16 - lower = ".".join([str(random.randrange(1,256)) for _ in xrange(2)]) - return upper+lower - def randomPort(): return random.randint(1,65535) @@ -66,23 +60,6 @@ def randomPortSpec(): portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)]) return portspec -def randomCountry(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - return random.choice(countries) - -def randomCountrySpec(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - spec = "" - choices = [] - for i in xrange(10): - choices.append(random.choice(countries)) - choices = set(choices) #dedupe - choices = list(choices) - spec += ",".join(choices) - return spec - def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) @@ -160,21 +137,11 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, return b -def fake16Bridge(orport=8080, running=True, stable=True): - nn = "bridge-%s"%random.randrange(0,1000000) - ip = random16IP() - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) - b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) - b.setStatus(running, stable) - return b - simpleDesc = "router Unnamed %s %s 0 9030\n"\ "opt fingerprint DEAD BEEF F00F DEAD BEEF F00F DEAD BEEF F00F DEAD\n"\ "opt @purpose bridge\n" orAddress = "or-address %s:%s\n" -def gettimestamp(): - ts = time.strftime("%Y-%m-%d %H:%M:%S") - return "opt published %s\n" % ts + class RhymesWith255Category: def contains(self, ip): @@ -272,19 +239,6 @@ class IPBridgeDistTests(unittest.TestCase): # self.assertEquals(len(fps), 5) # self.assertTrue(count >= 1) - #def testDistWithFilter16(self): - # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - # for _ in xrange(256): - # d.insert(fake16Bridge()) - # n = d.getBridgesForIP("1.2.3.4", "x", 10) - - # slash16s = dict() - # for bridge in n: - # m = re.match(r'(\d+\.\d+)\.\d+\.\d+', bridge.ip) - # upper16 = m.group(1) - # self.assertTrue(upper16 not in slash16s) - # slash16s[upper16] = True - def testDistWithFilterIP6(self): d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") for _ in xrange(250):

1 0