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

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 Feb '15

22 Feb '15

commit 8f1a8b1d73c08bceefba55ae6fbb2f3d06fd17c3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 22 08:15:48 2015 +0000 Update translations for torbutton-torbuttondtd --- sq/torbutton.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index ecf6a6d..ba7567d 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -47,10 +47,10 @@ <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klikoni që ta nisni Torbutton-in"> <!ENTITY torbutton.prefs.privacy_security_settings "Konfigurimi i Privatësisë dhe Sigurisë"> -<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> -<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> -<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> +<!ENTITY torbutton.prefs.block_thread "Pengoni leximin e historisë gjatë Tor-it (thelbësore)"> +<!ENTITY torbutton.prefs.block_thwrite "Pengoni shkrimin e historisë gjatë Tor-it (rekomandohet)"> +<!ENTITY torbutton.prefs.block_nthread "Pengoni leximin e historisë gjatë mosfunksionimit të Tor-it (me zgjedhje)"> +<!ENTITY torbutton.prefs.block_nthwrite "Pengoni shkrimin e historisë gjatë mosfunksionimit të Tor-it (me zgjedhje)"> <!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">

1 0

[meek/master] Use "let" instead of "var" in the Firefox helper.
by dcf＠torproject.org 22 Feb '15

22 Feb '15

commit 8b4bb35a4513c62baed17f047f11ee3b8a280693 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 21 21:21:51 2015 -0800 Use "let" instead of "var" in the Firefox helper. let is block scope, which is what I always want. --- firefox/components/main.js | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index f9303d8..e135d64 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -66,7 +66,7 @@ MeekHTTPHelper.prototype = { return; try { - var prefs = Components.classes["@mozilla.org/preferences-service;1"] + let prefs = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); // Allow unproxied DNS, working around a Tor Browser patch: // https://trac.torproject.org/projects/tor/ticket/11183#comment:6. @@ -75,7 +75,7 @@ MeekHTTPHelper.prototype = { prefs.setBoolPref("network.proxy.socks_remote_dns", false); // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIServe… - var serverSocket = Components.classes["@mozilla.org/network/server-socket;1"] + let serverSocket = Components.classes["@mozilla.org/network/server-socket;1"] .createInstance(Components.interfaces.nsIServerSocket); // Listen on an ephemeral port, loopback only, with default backlog. serverSocket.init(-1, true, -1); @@ -87,11 +87,11 @@ MeekHTTPHelper.prototype = { // Block forever. // https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Threads#Waiting_f… - var thread = Components.classes["@mozilla.org/thread-manager;1"].getService().currentThread; + let thread = Components.classes["@mozilla.org/thread-manager;1"].getService().currentThread; while (true) thread.processNextEvent(true); } finally { - var app = Components.classes["@mozilla.org/toolkit/app-startup;1"] + let app = Components.classes["@mozilla.org/toolkit/app-startup;1"] .getService(Components.interfaces.nsIAppStartup); app.quit(app.eForceQuit); } @@ -126,7 +126,7 @@ MeekHTTPHelper.httpProtocolHandler = MeekHTTPHelper.ioService.getProtocolHandler // Set the transport to time out at the given absolute deadline. MeekHTTPHelper.refreshDeadline = function(transport, deadline) { - var timeout; + let timeout; if (deadline === null) timeout = 0xffffffff; else @@ -136,7 +136,7 @@ MeekHTTPHelper.refreshDeadline = function(transport, deadline) { // Reverse-index the Components.results table. MeekHTTPHelper.lookupStatus = function(status) { - for (var name in Components.results) { + for (let name in Components.results) { if (Components.results[name] === status) return name; } @@ -153,7 +153,7 @@ MeekHTTPHelper.lookupStatus = function(status) { // {"type": "socks4a", "host": "example.com", "port": 1080} MeekHTTPHelper.buildProxyInfo = function(spec) { // https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Inter… - var flags = Components.interfaces.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; + let flags = Components.interfaces.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; if (spec === undefined) { // "direct"; i.e., no proxy. This is the default. return MeekHTTPHelper.proxyProtocolService.newProxyInfo("direct", "", 0, flags, 0xffffffff, null); @@ -202,7 +202,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { // Check what proxy to use, if any. // dump("using proxy " + JSON.stringify(req.proxy) + "\n"); - var proxyInfo = MeekHTTPHelper.buildProxyInfo(req.proxy); + let proxyInfo = MeekHTTPHelper.buildProxyInfo(req.proxy); if (proxyInfo === null) { this.returnResponse({"error": "can't create nsIProxyInfo from " + JSON.stringify(req.proxy)}); return; @@ -210,21 +210,21 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { // Construct an HTTP channel with the given nsIProxyInfo. // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… - var uri = MeekHTTPHelper.ioService.newURI(req.url, null, null); + let uri = MeekHTTPHelper.ioService.newURI(req.url, null, null); this.channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, proxyInfo, 0, null) .QueryInterface(Components.interfaces.nsIHttpChannel); // Remove pre-set headers. Firefox's AddStandardRequestHeaders adds // User-Agent, Accept, Accept-Language, and Accept-Encoding, and perhaps // others. Just remove all of them. - var headers = []; + let headers = []; // https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Inter… // https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Inter… this.channel.visitRequestHeaders({visitHeader: function(key, value) { headers.push(key); }}) - for (var i = 0; i < headers.length; i++) + for (let i = 0; i < headers.length; i++) this.channel.setRequestHeader(headers[i], "", false); // Set our own headers. if (req.header !== undefined) { - for (var key in req.header) { + for (let key in req.header) { this.channel.setRequestHeader(key, req.header[key], false); } } @@ -247,18 +247,18 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { returnResponse: function(resp) { // dump("returnResponse " + JSON.stringify(resp) + "\n"); - outputStream = this.transport.openOutputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); - var output = Components.classes["@mozilla.org/binaryoutputstream;1"] + let outputStream = this.transport.openOutputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); + let output = Components.classes["@mozilla.org/binaryoutputstream;1"] .createInstance(Components.interfaces.nsIBinaryOutputStream); output.setOutputStream(outputStream); - var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + let converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); converter.charset = "UTF-8"; - var s = JSON.stringify(resp); - var data = converter.convertToByteArray(s); + let s = JSON.stringify(resp); + let data = converter.convertToByteArray(s); - var deadline = Date.now() + MeekHTTPHelper.LOCAL_WRITE_TIMEOUT * 1000; + let deadline = Date.now() + MeekHTTPHelper.LOCAL_WRITE_TIMEOUT * 1000; try { MeekHTTPHelper.refreshDeadline(this.transport, deadline); output.write32(data.length); @@ -328,7 +328,7 @@ MeekHTTPHelper.RequestReader.prototype = { // nsIInputStreamCallback implementation. onInputStreamReady: function(inputStream) { - var input = Components.classes["@mozilla.org/binaryinputstream;1"] + let input = Components.classes["@mozilla.org/binaryinputstream;1"] .createInstance(Components.interfaces.nsIBinaryInputStream); input.setInputStream(inputStream); try { @@ -352,8 +352,8 @@ MeekHTTPHelper.RequestReader.prototype = { // Read into this.buf (up to its capacity) and decrement this.bytesToRead. readIntoBuf: function(input) { - var n = Math.min(input.available(), this.bytesToRead); - var data = input.readByteArray(n); + let n = Math.min(input.available(), this.bytesToRead); + let data = input.readByteArray(n); this.buf.subarray(this.buf.length - this.bytesToRead).set(data); this.bytesToRead -= n; }, @@ -364,7 +364,7 @@ MeekHTTPHelper.RequestReader.prototype = { return; this.state = this.STATE_READING_OBJECT; - var b = this.buf; + let b = this.buf; this.bytesToRead = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]; if (this.bytesToRead > 1000000) { dump("Object length is too long (" + this.bytesToRead + "), ignoring.\n"); @@ -379,11 +379,11 @@ MeekHTTPHelper.RequestReader.prototype = { return; this.state = this.STATE_DONE; - var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + let converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); converter.charset = "UTF-8"; - var s = converter.convertFromByteArray(this.buf, this.buf.length); - var req = JSON.parse(s); + let s = converter.convertFromByteArray(this.buf, this.buf.length); + let req = JSON.parse(s); MeekHTTPHelper.refreshDeadline(this.transport, null); this.callback(req); }, @@ -406,7 +406,7 @@ MeekHTTPHelper.HttpStreamListener.prototype = { }, onStopRequest: function(req, context, status) { // dump("onStopRequest " + status + "\n"); - var resp = { + let resp = { status: context.responseStatus, }; if (Components.isSuccessCode(status)) { @@ -429,11 +429,11 @@ MeekHTTPHelper.HttpStreamListener.prototype = { return; } this.length += length; - var input = Components.classes["@mozilla.org/binaryinputstream;1"] + let input = Components.classes["@mozilla.org/binaryinputstream;1"] .createInstance(Components.interfaces.nsIBinaryInputStream); input.setInputStream(stream); this.body.push(String.fromCharCode.apply(null, input.readByteArray(length))); }, }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([MeekHTTPHelper]); +let NSGetFactory = XPCOMUtils.generateNSGetFactory([MeekHTTPHelper]);

1 0

[arm/master] Balk if there's unrecognized arguments
by atagar＠torproject.org 22 Feb '15

22 Feb '15

commit cc342a8accfebd44dc6256ab29946744fe9b2cd7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 21 18:33:00 2015 -0800 Balk if there's unrecognized arguments Similar to a fix for stem: https://gitweb.torproject.org/stem.git/commit/?id=7753976dc7477a86fa8bc9232… --- arm/arguments.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arm/arguments.py b/arm/arguments.py index d7820dd..b404486 100644 --- a/arm/arguments.py +++ b/arm/arguments.py @@ -78,11 +78,15 @@ def parse(argv): args = dict(DEFAULT_ARGS) try: - getopt_results = getopt.getopt(argv, OPT, OPT_EXPANDED)[0] + recognized_args, unrecognized_args = getopt.getopt(argv, OPT, OPT_EXPANDED) + + if unrecognized_args: + error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" + raise getopt.GetoptError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) except getopt.GetoptError as exc: raise ValueError(msg('usage.invalid_arguments', error = exc)) - for opt, arg in getopt_results: + for opt, arg in recognized_args: if opt in ('-i', '--interface'): if ':' in arg: address, port = arg.split(':', 1)

1 0

[stem/master] Unrecognized arguments didn't suggest using --help
by atagar＠torproject.org 22 Feb '15

22 Feb '15

commit d270e36d2fa88bd4c835a494b7a00c33003651de Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 21 18:31:50 2015 -0800 Unrecognized arguments didn't suggest using --help Oops, didn't mean to bypass the catch here. Switching to getopt.GetoptError so we'll include that in the message. --- run_tests.py | 2 +- stem/interpreter/arguments.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index d1c8828..bfdd101 100755 --- a/run_tests.py +++ b/run_tests.py @@ -348,7 +348,7 @@ def _get_args(argv): if unrecognized_args: error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" - raise ValueError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) + raise getopt.GetoptError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) except getopt.GetoptError as exc: raise ValueError('%s (for usage provide --help)' % exc) diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index 557d29f..d177b83 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -49,7 +49,7 @@ def parse(argv): if unrecognized_args: error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" - raise ValueError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) + raise getopt.GetoptError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) except getopt.GetoptError as exc: raise ValueError('%s (for usage provide --help)' % exc)

1 0

[stem/master] Use PROXYTYPE_SOCKS5_HOSTNAME for tutorial example
by atagar＠torproject.org 22 Feb '15

22 Feb '15

commit 9d869c4f6e2fe9056f95b693092bb6d11a8a5b02 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 21 18:18:22 2015 -0800 Use PROXYTYPE_SOCKS5_HOSTNAME for tutorial example Michael points out that we leaked our DNS requests in this example. By using PROXYTYPE_SOCKS5_HOSTNAME which was added to pycurl v7.19.5.1 on 2015-01-06 uses the socks proxy for them... https://github.com/pycurl/pycurl/issues/206 --- docs/tutorials/to_russia_with_love.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index 33c04d3..75f9735 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -107,7 +107,7 @@ Besides SocksiPy, you can also use `PycURL <http://pycurl.sourceforge.net/>`_ to query.setopt(pycurl.URL, url) query.setopt(pycurl.PROXY, 'localhost') query.setopt(pycurl.PROXYPORT, SOCKS_PORT) - query.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5) + query.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5_HOSTNAME) query.setopt(pycurl.WRITEFUNCTION, output.write) try:

1 0

[bridgedb/develop] Add NO_DISTRIBUTION_COUNTRIES option to config.
by isis＠torproject.org 22 Feb '15

22 Feb '15

commit a92cf111584c296a5e589f7412bf5ea27bae5dcd Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:16:47 2014 +0000 Add NO_DISTRIBUTION_COUNTRIES option to config. This option contains a list of CCs for which, if a bridge is detected to be running on an IP address in one of these countries, it will not be distributed to clients. * FIXES part of #12843. --- bridgedb.conf | 11 ++++++++++- lib/bridgedb/configure.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1fe61ab..f8b126c 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,15 @@ # for details. # :copyright: (c) 2007-2014 The Tor Project, Inc. # (c) 2007-2014, all sentient entities within the AUTHORS file -# :version: 0.0.10 +# :version: 0.0.13 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.13 - 2015-02-20 +# * ADD NO_DISTRIBUTION_COUNRIES option for refusing to distribute bridges +# whose primary ORAddress is geolocated to any of some certain countries. +# # Changes in version 0.0.12 - 2015-02-06 # * ADD a dictionary of TASKS to be run and the intervals at which they # should be repeated. @@ -187,6 +191,11 @@ COLLECT_TIMESTAMPS = False # Filename that contains blocked bridges list. Comment out to disable. #COUNTRY_BLOCK_FILE = "blocked-bridges" +# (list of two-character, uppercased strings for country codes) Don't +# distribute bridges whose main ORPort IP address is geolocated to any of the +# following countries: +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] + # 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. diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index e67a252..83b53d6 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -111,7 +111,7 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) - for attr in ["FORCE_PORTS", "FORCE_FLAGS"]: + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting)

1 0

[bridgedb/develop] Don't insert bridges in NO_DISTRIBUTION_COUNTRIES into the hashrings.
by isis＠torproject.org 22 Feb '15

22 Feb '15

commit f80033f8496b8cda8f032932c0200a7c8f7fe825 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 23:05:32 2015 +0000 Don't insert bridges in NO_DISTRIBUTION_COUNTRIES into the hashrings. When two-letter country codes are given in the bridgedb.conf option NO_DISTRIBUTION_COUNTRIES, e.g.: NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] and a Bridge parsed from the descriptor files is found to be geolocated in one of these countries, we skip adding that Bridge to the hashrings entirely. * FIXES #12843 https://bugs.torproject.org/12843 * TODO We could add these blacklisted Bridges to their own hashring of Undistributables which are never to be distributed to real clients. Potentially, we could distribute these Undistributables to adversaries which are definitely not real clients, as a form of supplying adversaries with decoys (see #12537). By doing so, we would be handing an adversary which is probably some intelligence agency's bridge enumeration program (e.g. part of the NSA and GCHQ's HOMING TROLL and XKEYSCORE programmes) bridges which are run by another intelligence agency (presumedly واجا (VAJA) and/or إدارة الأمن العام) in order to gather information about the clients connecting to them (presumedly hoping that someone from their jurisdiction would use the bridge). Thus, in the best case scenario, feeding each agency false (albeit trivially discoverable as false) information on the other and — in the worst case scenario — simply being an annoyance by breaking things for both parties. However, the current organisation of the hashring structures is not really amenable to adding hashrings for Undistributables — at least not in any way that safely guarantees that they wouldn't end up in some bucket or such intended for real clients (which would defeat the whole purpose of this patch). Because of this concern, using Undistributables as decoys is not yet feasible. --- lib/bridgedb/Main.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 9317760..d0698c0 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -198,10 +198,17 @@ def load(state, splitter, clear=False): inserted = 0 logging.info("Inserting %d bridges into splitter..." % len(bridges)) for fingerprint, bridge in bridges.items(): - # We attempt to insert all bridges. If the bridge is not running, then - # it is skipped during the insertion process. - splitter.insert(bridge) - inserted += 1 + # Skip insertion of bridges which are geolocated to be in one of the + # NO_DISTRIBUTION_COUNTRIES, a.k.a. the countries we don't distribute + # bridges from: + if bridge.country in state.NO_DISTRIBUTION_COUNTRIES: + logging.warn("Not distributing Bridge %s %s:%s in country %s!" % + (bridge, bridge.address, bridge.orPort, bridge.country)) + else: + # If the bridge is not running, then it is skipped during the + # insertion process. + splitter.insert(bridge) + inserted += 1 logging.info("Done inserting %d bridges into splitter." % inserted) if state.COLLECT_TIMESTAMPS:

1 0

[bridgedb/develop] Add unittests for bridgedb.Main module.
by isis＠torproject.org 22 Feb '15

22 Feb '15

commit 2033d83393460d92c8315a9fd8b8b24a534456a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 00:18:08 2015 +0000 Add unittests for bridgedb.Main module. --- lib/bridgedb/test/test_Main.py | 429 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 429 insertions(+) diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py new file mode 100644 index 0000000..7525b72 --- /dev/null +++ b/lib/bridgedb/test/test_Main.py @@ -0,0 +1,429 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# :license: see included LICENSE for information + +"""Tests for :mod:`bridgedb.Main`.""" + +from __future__ import print_function + +import base64 +import logging +import os +import random +import shutil +import sys + +from datetime import datetime +from time import sleep + +from twisted.internet.threads import deferToThread +from twisted.trial import unittest + +from bridgedb import Main +from bridgedb.Bridges import BridgeHolder +from bridgedb.parse.options import parseOptions + + +logging.getLogger().disabled = True + + +HERE = os.getcwd() +TOPDIR = HERE.rstrip('_trial_temp') +CI_RUNDIR = os.path.join(TOPDIR, 'run') + +# A networkstatus descriptor with two invalid ORAddress (127.0.0.1 and ::1) +# and an invalid port number (70000). +NETWORKSTATUS_MALFORMED = '''\ +r OracleLunacy LBXW03FIKvo9aXCEYbDdq1BbNtM E0yN8ofiBpg6JHW0iPX5gJ1gKFI 2014-09-05 21:39:24 127.0.0.1 70000 0 +a [::1]:70000 +s Fast Guard Running Stable Valid +w Bandwidth=2094050 +p reject 1-65535 +''' + +def mockAddOrUpdateBridgeHistory(bridge, timestamp): + """A mocked version of :func:`bridgedb.Stability.addOrUpdateBridgeHistory` + which doesn't access the database (so that we can test functions which + call it, like :func:`bridgedb.Main.updateBridgeHistory`). + """ + print("Pretending to update Bridge %s with timestamp %s..." % + (bridge.fingerprint, timestamp)) + + +class MockBridgeHolder(BridgeHolder): + def __init__(self): + self._bridges = {} + def __len__(self): + return len(self._bridges.keys()) + def insert(self, bridge): + self._bridges[bridge.fingerprint] = bridge + + +class MainTests(unittest.TestCase): + """Integration tests for :func:`bridgedb.Main.load`.""" + + def _appendToFile(self, file, data): + """Append **data** to **file**.""" + fh = open(file, 'a') + fh.write(data) + fh.flush() + fh.close() + + def _copyDescFilesHere(self, files): + """Copy all the **files** to the _trial_tmp/ directory. + + :param list files: A list of strings representing the paths to + descriptor files. This should probably be taken from a + ``bridgedb.persistent.Conf`` object which has parsed the + ``bridgedb.conf`` file in the top-level directory of this repo. + :rtype: list + :returns: A list of the new paths (in the ``_trial_tmp`` directory) to + the copied descriptor files. This should be used to update the + ``bridgedb.persistent.Conf`` object. + """ + updatedPaths = [] + + for f in files: + base = os.path.basename(f) + src = os.path.join(CI_RUNDIR, base) + if os.path.isfile(src): + dst = os.path.join(HERE, base) + shutil.copy(src, dst) + updatedPaths.append(dst) + else: + self.skip = True + raise unittest.SkipTest( + "Can't find mock descriptor files in %s directory" % + CI_RUNDIR) + + return updatedPaths + + def _cbAssertFingerprints(self, d): + """Assert that there are some bridges in the splitter.""" + self.assertGreater(len(self.splitter), 0) + return d + + def _cbCallUpdateBridgeHistory(self, d, splitter): + """Fake some timestamps for the bridges in the splitter, and then call + Main.updateBridgeHistory(). + """ + def timestamp(): + return datetime.fromtimestamp(random.randint(1324285117, 1524285117)) + + bridges = splitter._bridges + timestamps = {} + + for fingerprint, _ in bridges.items(): + timestamps[fingerprint] = [timestamp(), timestamp(), timestamp()] + + return Main.updateBridgeHistory(bridges, timestamps) + + def _eb_Failure(self, failure): + """If something produces a twisted.python.failure.Failure, fail the + test with it. + """ + self.fail(failure) + + def _writeConfig(self, config): + """Write a config into the current working directory. + + :param str config: A big long multiline string that looks like the + bridgedb.conf file. + :rtype: str + :returns: The pathname of the file that the **config** was written to. + """ + configFile = os.path.join(os.getcwd(), 'bridgedb.conf') + fh = open(configFile, 'w') + fh.write(config) + fh.flush() + fh.close() + return configFile + + def setUp(self): + """Find the bridgedb.conf file in the top-level directory of this repo, + copy it and the descriptor files it references to the current working + directory, produce a state object from the loaded bridgedb.conf file, + and make an HMAC key. + """ + # Get the bridgedb.conf file in the top-level directory of this repo: + self.configFile = os.path.join(TOPDIR, 'bridgedb.conf') + self.config = Main.loadConfig(self.configFile) + + # Copy the referenced descriptor files from bridgedb/run/ to CWD: + self.config.STATUS_FILE = self._copyDescFilesHere([self.config.STATUS_FILE])[0] + self.config.BRIDGE_FILES = self._copyDescFilesHere(self.config.BRIDGE_FILES) + self.config.EXTRA_INFO_FILES = self._copyDescFilesHere(self.config.EXTRA_INFO_FILES) + + # Initialise the state + self.state = Main.persistent.State(**self.config.__dict__) + self.key = base64.b64decode('TvPS1y36BFguBmSOvhChgtXB2Lt+BOw0mGfz9SZe12Y=') + + # Create a BridgeSplitter + self.splitter = MockBridgeHolder() + + # Functions which some tests mock, which we'll need to re-replace + # later in tearDown(): + self._orig_addOrUpdateBridgeHistory = Main.addOrUpdateBridgeHistory + self._orig_sys_argv = sys.argv + + def tearDown(self): + """Replace the mocked mockAddOrUpdateBridgeHistory() function with the + real function, Stability.addOrUpdateBridgeHistory(). + """ + Main.addOrUpdateBridgeHistory = self._orig_addOrUpdateBridgeHistory + sys.argv = self._orig_sys_argv + + def test_Main_updateBridgeHistory(self): + """Main.updateBridgeHistory should update some timestamps for some + bridges. + """ + # Mock the addOrUpdateBridgeHistory() function so that we don't try to + # access the database: + Main.addOrUpdateBridgeHistory = mockAddOrUpdateBridgeHistory + + # Get the bridges into the mocked splitter + d = deferToThread(Main.load, self.state, self.splitter) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + d.addCallback(self._cbCallUpdateBridgeHistory, self.splitter) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load(self): + """Main.load() should run without error.""" + d = deferToThread(Main.load, self.state, self.splitter) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load_no_state(self): + """Main.load() should raise SystemExit without a state object.""" + self.assertRaises(SystemExit, Main.load, None, self.splitter) + + def test_Main_load_clear(self): + """When called with clear=True, load() should run and clear the + hashrings. + """ + d = deferToThread(Main.load, self.state, self.splitter, clear=True) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load_collect_timestamps(self): + """When COLLECT_TIMESTAMPS=True, Main.load() should call + Main.updateBridgeHistory(). + """ + # Mock the addOrUpdateBridgeHistory() function so that we don't try to + # access the database: + Main.addOrUpdateBridgeHistory = mockAddOrUpdateBridgeHistory + state = self.state + state.COLLECT_TIMESTAMPS = True + + # The reactor is deferring this to a thread, so the test execution + # here isn't actually covering the Main.updateBridgeHistory() + # function: + Main.load(state, self.splitter) + + def test_Main_load_malformed_networkstatus(self): + """When called with a networkstatus file with an invalid descriptor, + Main.load() should raise a ValueError. + """ + self._appendToFile(self.state.STATUS_FILE, NETWORKSTATUS_MALFORMED) + self.assertRaises(ValueError, Main.load, self.state, self.splitter) + + def test_Main_reloadFn(self): + """Main._reloadFn() should return True.""" + self.assertTrue(Main._reloadFn()) + + def test_Main_handleSIGHUP(self): + """Main._handleSIGHUP() should return True.""" + raise unittest.SkipTest("_handleSIGHUP touches the reactor.") + + self.assertTrue(Main._handleSIGHUP()) + + def test_Main_createBridgeRings(self): + """Main.createBridgeRings() should add three hashrings to the + splitter. + """ + proxyList = None + (splitter, emailDist, httpsDist) = Main.createBridgeRings(self.config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor ring, + # and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + + def test_Main_createBridgeRings_with_proxyList(self): + """Main.createBridgeRings() should add three hashrings to the + splitter and add the proxyList to the IPBasedDistibutor. + """ + exitRelays = ['1.1.1.1', '2.2.2.2', '3.3.3.3'] + proxyList = Main.proxy.ProxySet() + proxyList.addExitRelays(exitRelays) + (splitter, emailDist, httpsDist) = Main.createBridgeRings(self.config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor ring, + # and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + self.assertGreater(len(httpsDist.categories), 0) + self.assertItemsEqual(exitRelays, httpsDist.categories[-1]) + + def test_Main_createBridgeRings_no_https_dist(self): + """When HTTPS_DIST=False, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.HTTPS_DIST = False + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an EmailDistributor ring, and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('https', splitter.rings) + self.assertNotIn(httpsDist, splitter.ringsByName.values()) + + def test_Main_createBridgeRings_no_email_dist(self): + """When EMAIL_DIST=False, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.EMAIL_DIST = False + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('email', splitter.rings) + self.assertNotIn(emailDist, splitter.ringsByName.values()) + + def test_Main_createBridgeRings_no_reserved_share(self): + """When RESERVED_SHARE=0, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.RESERVED_SHARE = 0 + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, and an EmailDistributor ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('unallocated', splitter.rings) + + def test_Main_createBridgeRings_two_file_buckets(self): + """When FILE_BUCKETS has two filenames in it, Main.createBridgeRings() + should add three hashrings to the splitter, then add two + "pseudo-rings". + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.FILE_BUCKETS = { + 'bridges-for-support-desk': 10, + 'bridges-for-ooni-tests': 10, + } + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor, and an + # UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + + # Should have two pseudoRings: + self.assertEqual(len(splitter.pseudoRings), 2) + self.assertIn('pseudo_bridges-for-support-desk', splitter.pseudoRings) + self.assertIn('pseudo_bridges-for-ooni-tests', splitter.pseudoRings) + + def test_Main_run(self): + """Main.run() should run and then finally raise SystemExit.""" + config = """ +BRIDGE_FILES = ["../run/bridge-descriptors"] +EXTRA_INFO_FILES = ["../run/cached-extrainfo", "../run/cached-extrainfo.new"] +STATUS_FILE = "../run/networkstatus-bridges" +HTTPS_CERT_FILE="cert" +HTTPS_KEY_FILE="privkey.pem" +LOGFILE = "bridgedb.log" +PIDFILE = "bridgedb.pid" +DB_FILE = "bridgedist.db" +DB_LOG_FILE = "bridgedist.log" +MASTER_KEY_FILE = "secret_key" +ASSIGNMENTS_FILE = "assignments.log" +LOGLEVEL = "DEBUG" +SAFELOGGING = True +LOGFILE_COUNT = 5 +LOGFILE_ROTATE_SIZE = 10000000 +LOG_THREADS = False +LOG_TRACE = True +LOG_TIME_FORMAT = "%H:%M:%S" +COLLECT_TIMESTAMPS = False +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] +PROXY_LIST_FILES = [] +N_IP_CLUSTERS = 3 +FORCE_PORTS = [(443, 1)] +FORCE_FLAGS = [("Stable", 1)] +BRIDGE_PURPOSE = "bridge" +TASKS = {'GET_TOR_EXIT_LIST': 3 * 60 * 60,} +SERVER_PUBLIC_FQDN = 'bridges.torproject.org' +SERVER_PUBLIC_EXTERNAL_IP = '38.229.72.19' +HTTPS_DIST = True +HTTPS_BIND_IP = None +HTTPS_PORT = None +HTTPS_N_BRIDGES_PER_ANSWER = 3 +HTTPS_INCLUDE_FINGERPRINTS = True +HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +HTTP_UNENCRYPTED_BIND_IP = "127.0.0.1" +HTTP_UNENCRYPTED_PORT = 55555 +HTTP_USE_IP_FROM_FORWARDED_HEADER = False +RECAPTCHA_ENABLED = False +RECAPTCHA_PUB_KEY = '' +RECAPTCHA_SEC_KEY = '' +RECAPTCHA_REMOTEIP = '' +GIMP_CAPTCHA_ENABLED = False +GIMP_CAPTCHA_DIR = 'captchas' +GIMP_CAPTCHA_HMAC_KEYFILE = 'captcha_hmac_key' +GIMP_CAPTCHA_RSA_KEYFILE = 'captcha_rsa_key' +EMAIL_DIST = True +EMAIL_FROM_ADDR = "bridges(a)torproject.org" +EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" +EMAIL_SMTP_HOST = "127.0.0.1" +EMAIL_SMTP_PORT = 55556 +EMAIL_USERNAME = "bridges" +EMAIL_DOMAINS = ["somewhere.com", "somewhereelse.net"] +EMAIL_DOMAIN_MAP = { + "mail.somewhere.com": "somewhere.com", + "mail.somewhereelse.net": "somewhereelse.net", +} +EMAIL_DOMAIN_RULES = { + 'somewhere.com': ["ignore_dots", "dkim"], + 'somewhereelse.net': ["dkim"], +} +EMAIL_WHITELIST = {} +EMAIL_BLACKLIST = [] +EMAIL_FUZZY_MATCH = 4 +EMAIL_RESTRICT_IPS = [] +EMAIL_BIND_IP = "127.0.0.1" +EMAIL_PORT = 55557 +EMAIL_N_BRIDGES_PER_ANSWER = 3 +EMAIL_INCLUDE_FINGERPRINTS = True +EMAIL_GPG_SIGNING_ENABLED = False +EMAIL_GPG_SIGNING_KEY = '../gnupghome/TESTING.subkeys.sec' +HTTPS_SHARE = 10 +EMAIL_SHARE = 5 +RESERVED_SHARE = 2 +FILE_BUCKETS = {}""" + configFile = self._writeConfig(config) + + # Fake some options: + sys.argv = ['bridgedb', '-r', os.getcwd(), '-c', configFile] + options = parseOptions() + + self.assertRaises(SystemExit, Main.run, options, reactor=None)

1 0

[bridgedb/develop] Merge branch 'fix/12843-cc-spurning_r2' into develop
by isis＠torproject.org 22 Feb '15

22 Feb '15

commit 689b50aa4ad41efe1f7f54983239aaee16ed602e Merge: 9686f05 2033d83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 00:59:21 2015 +0000 Merge branch 'fix/12843-cc-spurning_r2' into develop bridgedb.conf | 11 +- lib/bridgedb/Main.py | 15 +- lib/bridgedb/configure.py | 2 +- lib/bridgedb/test/test_Main.py | 429 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 451 insertions(+), 6 deletions(-)

1 0

[bridgedb/develop] Fix two lines with old import syntax in bridgedb.Main.
by isis＠torproject.org 22 Feb '15

22 Feb '15

commit 5c65848a904c7b6774edba6217d82ee050643955 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 22:44:01 2015 +0000 Fix two lines with old import syntax in bridgedb.Main. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 440784b..83b60a4 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -42,10 +42,10 @@ from bridgedb.parse import options from bridgedb.parse.addr import isIPAddress from bridgedb.schedule import toUnixSeconds -import bridgedb.Bridges as Bridges -import bridgedb.Dist as Dist import bridgedb.Storage +from bridgedb import Bridges +from bridgedb import Dist from bridgedb.Stability import addOrUpdateBridgeHistory

1 0