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

[tor/master] Add a "make test-rust" target to run the rust tests only.
by nickm＠torproject.org 14 Feb '18

14 Feb '18

commit 549a450f52124405eb75b781fc1686e81461327b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 8 17:51:57 2018 -0500 Add a "make test-rust" target to run the rust tests only. --- changes/ticket25071 | 4 ++++ src/test/include.am | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket25071 b/changes/ticket25071 new file mode 100644 index 000000000..5e2917e10 --- /dev/null +++ b/changes/ticket25071 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Add a "make test-rust" target to run the rust tests only. + Closes ticket 25071. + diff --git a/src/test/include.am b/src/test/include.am index 9783f93d5..fd70cc345 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -358,3 +358,5 @@ EXTRA_DIST += \ src/test/test_workqueue_pipe2.sh \ src/test/test_workqueue_socketpair.sh +test-rust: + $(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh

1 0

[tor/master] Merge branch 'tests_rust'
by nickm＠torproject.org 14 Feb '18

14 Feb '18

commit 9e566f3a72884cd8e1c5e4e4b48ad120bfe532fc Merge: 17c6de249 549a450f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 18:12:01 2018 -0500 Merge branch 'tests_rust' changes/ticket25071 | 4 ++++ src/test/include.am | 2 ++ 2 files changed, 6 insertions(+)

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit e95fa192fb2a28ce45c972b313c10e85bca5b3f8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:47:11 2018 +0000 Update translations for tails-misc_completed --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index c8170cf6a..a67a14ac9 100644 --- a/fr.po +++ b/fr.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-13 22:01+0000\n" +"PO-Revision-Date: 2018-02-13 22:42+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Synchronisation de l’horloge système" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor a besoin d’une horloge bien réglée pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter..." +msgstr "Tor exige une horloge précise et bien réglée pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 2ce04ae428fdd4d3288687c9d158d2e01427e4b6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:47:03 2018 +0000 Update translations for tails-misc --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index c8170cf6a..a67a14ac9 100644 --- a/fr.po +++ b/fr.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-13 22:01+0000\n" +"PO-Revision-Date: 2018-02-13 22:42+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Synchronisation de l’horloge système" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor a besoin d’une horloge bien réglée pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter..." +msgstr "Tor exige une horloge précise et bien réglée pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!"

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit c970e64636be52adfcd10db58549859ff6592313 Merge: 4faecd5 54c6629 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 22:24:33 2018 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] The JSON data coming into moat is being processed as a str.
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 8b4f7367e82636701997acbb57ae463c4471e3c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 20:02:47 2018 +0000 The JSON data coming into moat is being processed as a str. Duck-typing is why we can't have nice things. --- bridgedb/distributors/moat/server.py | 14 +++++++------- bridgedb/test/test_distributors_moat_server.py | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index d1d0b10..4137f51 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -185,7 +185,7 @@ class JsonAPIErrorResource(JsonAPIResource): object. """ resource.Resource.__init__(self) - self.id = id + self.id = "%s" % id self.type = type self.code = code self.status = status @@ -452,7 +452,7 @@ class CaptchaFetchResource(CaptchaResource): data = { 'data': [{ - 'id': 1, + 'id': '1', 'type': 'moat-challenge', 'version': MOAT_API_VERSION, 'transport': preferred, @@ -565,7 +565,7 @@ class CaptchaCheckResource(CaptchaResource): raise ValueError( "Bad JSON API object type: expected %s got %s" % ("moat-solution", data["type"])) - elif data["id"] != 2: + elif data["id"] != "2": raise ValueError( "Bad JSON API data id: expected 2 got %s" % (data["id"])) @@ -632,15 +632,15 @@ class CaptchaCheckResource(CaptchaResource): """ if id == 4: error_response = resource419 - error_response.id = 4 + error_response.id = "4" error_response.detail = "The CAPTCHA solution was incorrect." elif id == 5: error_response = resource419 - error_response.id = 5 + error_response.id = "5" error_response.detail = "The CAPTCHA challenge timed out." elif id == 6: error_response = resource404 - error_response.id = 6 + error_response.id = "6" error_response.detail = ("No bridges available to fulfill " "request: %s.") % bridgeRequest @@ -673,7 +673,7 @@ class CaptchaCheckResource(CaptchaResource): data = { "data": [{ - "id": 3, + "id": '3', "type": 'moat-bridges', "version": MOAT_API_VERSION, "bridges": None, diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index 2f84557..f29f224 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -233,7 +233,7 @@ class JsonAPIErrorResourceTests(unittest.TestCase): self.use_resource(server.JsonAPIErrorResource()) error = self.do_render_for_method(b'GET') - self.assertEqual(error['id'], 0) + self.assertEqual(error['id'], '0') self.assertEqual(error['type'], '') self.assertEqual(error['code'], 200) self.assertEqual(error['status'], 'OK') @@ -640,7 +640,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def create_valid_POST_with_challenge(self, challenge): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -674,7 +674,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_withoutBlockIn(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -740,7 +740,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_weird_transport(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'dinosaur', @@ -759,7 +759,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_wrong_version(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': '0.0.1', # this version never existed 'transport': 'obfs4', @@ -778,7 +778,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_wrong_type(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'boat-revolution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -809,7 +809,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertEqual(error['status'], "No You're A Teapot") self.assertEqual(error['code'], 419) self.assertEqual(error['detail'], "The CAPTCHA challenge timed out.") - self.assertEqual(error['id'], 5) + self.assertEqual(error['id'], '5') def test_checkSolution(self): request = self.create_valid_POST_make_new_challenge() @@ -840,7 +840,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertEqual(error['detail'], "The CAPTCHA solution was incorrect.") self.assertEqual(error['version'], server.MOAT_API_VERSION) self.assertEqual(error['type'], "moat-bridges") - self.assertEqual(error['id'], 4) + self.assertEqual(error['id'], '4') def test_createBridgeRequest(self): request = self.create_valid_POST_with_challenge(self.expiredChallenge) @@ -909,7 +909,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertIsNotNone(data['bridges']) self.assertEqual(data['version'], server.MOAT_API_VERSION) self.assertEqual(data['type'], 'moat-bridges') - self.assertEqual(data['id'], 3) + self.assertEqual(data['id'], '3') def test_render_POST_unexpired_with_qrcode(self): request = DummyRequest([self.pagename]) @@ -925,7 +925,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -953,7 +953,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertIsNotNone(data['bridges']) self.assertEqual(data['version'], server.MOAT_API_VERSION) self.assertEqual(data['type'], 'moat-bridges') - self.assertEqual(data['id'], 3) + self.assertEqual(data['id'], '3') class AddMoatServerTests(unittest.TestCase):

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 30e11ff6e5ba13f9509dfe217ff68fa46427212a Merge: bc61afb d49e904 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 23 21:42:01 2018 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Add config option to skip loopback addresses in X-Forwarded-For parsing.
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit bf7ec9eeb61908bd3bc39efc68281638504cd3cf Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 21:11:21 2018 +0000 Add config option to skip loopback addresses in X-Forwarded-For parsing. --- bridgedb.conf | 5 ++++ bridgedb/distributors/common/http.py | 24 +++++++++++++---- bridgedb/distributors/moat/server.py | 36 +++++++++++++++++++------- bridgedb/parse/addr.py | 22 ++++++++++++++++ bridgedb/test/moat_helpers.py | 3 +++ bridgedb/test/test_distributors_common_http.py | 18 +++++++++++++ bridgedb/test/test_distributors_moat_server.py | 1 + 7 files changed, 94 insertions(+), 15 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 724c802..7700917 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -345,6 +345,11 @@ MOAT_HTTP_PORT = None # the *last* entry from its X-Forwarded-For header as the client's IP. MOAT_USE_IP_FROM_FORWARDED_HEADER = True +# If True, there is a misconfigured proxy relaying incoming messages +# to us: take the *last* entry in the X-Forwarded-For header which is +# not a loopback address (127.0.0.1/8) as the client's IP. +MOAT_SKIP_LOOPBACK_ADDRESSES = True + # 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 # is use one higher than the number here, and the extra cluster is used diff --git a/bridgedb/distributors/common/http.py b/bridgedb/distributors/common/http.py index 86c26b8..3bd7b41 100644 --- a/bridgedb/distributors/common/http.py +++ b/bridgedb/distributors/common/http.py @@ -21,6 +21,7 @@ import logging import os from bridgedb.parse.addr import isIPAddress +from bridgedb.parse.addr import isLoopback #: The fully-qualified domain name for any and all web servers we run. @@ -54,7 +55,7 @@ def getFQDN(): """ return SERVER_PUBLIC_FQDN -def getClientIP(request, useForwardedHeader=False): +def getClientIP(request, useForwardedHeader=False, skipLoopback=False): """Get the client's IP address from the ``'X-Forwarded-For:'`` header, or from the :api:`request <twisted.web.server.Request>`. @@ -62,6 +63,9 @@ def getClientIP(request, useForwardedHeader=False): :param request: A ``Request`` for a :api:`twisted.web.resource.Resource`. :param bool useForwardedHeader: If ``True``, attempt to get the client's IP address from the ``'X-Forwarded-For:'`` header. + :param bool skipLoopback: If ``True``, and ``useForwardedHeader`` is + also ``True``, then skip any loopback addresses (127.0.0.1/8) when + parsing the X-Forwarded-For header. :rtype: ``None`` or :any:`str` :returns: The client's IP address, if it was obtainable. """ @@ -70,10 +74,20 @@ def getClientIP(request, useForwardedHeader=False): if useForwardedHeader: header = request.getHeader("X-Forwarded-For") if header: - ip = header.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird X-Forwarded-For value %r" % header) - ip = None + index = -1 + ip = header.split(",")[index].strip() + if skipLoopback: + logging.info(("Parsing X-Forwarded-For again, ignoring " + "loopback addresses...")) + while isLoopback(ip): + index -= 1 + ip = header.split(",")[index].strip() + if not skipLoopback and isLoopback(ip): + logging.warn("Accepting loopback address: %s" % ip) + else: + if not isIPAddress(ip): + logging.warn("Got weird X-Forwarded-For value %r" % header) + ip = None else: ip = request.getClientIP() diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index 4137f51..509d471 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -134,9 +134,17 @@ class JsonAPIResource(resource.Resource): """A resource which conforms to the `JSON API spec <http://jsonapi.org/>`__. """ - def __init__(self, useForwardedHeader=True): + def __init__(self, useForwardedHeader=True, skipLoopback=False): + """Create a JSON API resource, containing either error(s) or data. + + :param bool useForwardedHeader: If ``True``, obtain the client's IP + address from the ``X-Forwarded-For`` HTTP header. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. + """ resource.Resource.__init__(self) self.useForwardedHeader = useForwardedHeader + self.skipLoopback = skipLoopback def getClientIP(self, request): """Get the client's IP address from the ``'X-Forwarded-For:'`` @@ -148,7 +156,7 @@ class JsonAPIResource(resource.Resource): :rtype: ``None`` or :any:`str` :returns: The client's IP address, if it was obtainable. """ - return getClientIP(request, self.useForwardedHeader) + return getClientIP(request, self.useForwardedHeader, self.skipLoopback) def formatDataForResponse(self, data, request): """Format a dictionary of ``data`` into JSON and add necessary response @@ -233,8 +241,8 @@ class CustomErrorHandlingResource(resource.Resource): class JsonAPIDataResource(JsonAPIResource): """A resource which returns some JSON API data.""" - def __init__(self, useForwardedHeader=True): - JsonAPIResource.__init__(self, useForwardedHeader) + def __init__(self, useForwardedHeader=True, skipLoopback=False): + JsonAPIResource.__init__(self, useForwardedHeader, skipLoopback) def checkRequestHeaders(self, request): """The JSON API specification requires servers to respond with certain HTTP @@ -288,8 +296,8 @@ class CaptchaResource(JsonAPIDataResource): """A CAPTCHA.""" def __init__(self, hmacKey=None, publicKey=None, secretKey=None, - useForwardedHeader=True): - JsonAPIDataResource.__init__(self, useForwardedHeader) + useForwardedHeader=True, skipLoopback=False): + JsonAPIDataResource.__init__(self, useForwardedHeader, skipLoopback) self.hmacKey = hmacKey self.publicKey = publicKey self.secretKey = secretKey @@ -301,7 +309,7 @@ class CaptchaFetchResource(CaptchaResource): isLeaf = True def __init__(self, hmacKey=None, publicKey=None, secretKey=None, - captchaDir="captchas", useForwardedHeader=True): + captchaDir="captchas", useForwardedHeader=True, skipLoopback=False): """DOCDOC :param bytes hmacKey: The master HMAC key, used for validating CAPTCHA @@ -319,6 +327,8 @@ class CaptchaFetchResource(CaptchaResource): :param str captchaDir: The directory where the cached CAPTCHA images :param bool useForwardedHeader: If ``True``, obtain the client's IP address from the ``X-Forwarded-For`` HTTP header. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. """ CaptchaResource.__init__(self, hmacKey, publicKey, secretKey, useForwardedHeader) @@ -477,7 +487,7 @@ class CaptchaCheckResource(CaptchaResource): def __init__(self, distributor, schedule, N=1, hmacKey=None, publicKey=None, secretKey=None, - useForwardedHeader=True): + useForwardedHeader=True, skipLoopback=False): """Create a new resource for checking CAPTCHA solutions and returning bridges to a client. @@ -490,6 +500,8 @@ class CaptchaCheckResource(CaptchaResource): :param int N: The number of bridges to hand out per query. :param bool useForwardedHeader: Whether or not we should use the the X-Forwarded-For header instead of the source IP address. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. """ CaptchaResource.__init__(self, hmacKey, publicKey, secretKey, useForwardedHeader) @@ -748,6 +760,7 @@ def addMoatServer(config, distributor): MOAT_BRIDGES_PER_ANSWER MOAT_TRANSPORT_PREFERENCE_LIST MOAT_USE_IP_FROM_FORWARDED_HEADER + MOAT_SKIP_LOOPBACK_ADDRESSES MOAT_ROTATION_PERIOD MOAT_GIMP_CAPTCHA_HMAC_KEYFILE MOAT_GIMP_CAPTCHA_RSA_KEYFILE @@ -760,6 +773,7 @@ def addMoatServer(config, distributor): captcha = None fwdHeaders = config.MOAT_USE_IP_FROM_FORWARDED_HEADER numBridges = config.MOAT_BRIDGES_PER_ANSWER + skipLoopback = config.MOAT_SKIP_LOOPBACK_ADDRESSES logging.info("Starting moat servers...") @@ -785,9 +799,11 @@ def addMoatServer(config, distributor): meek = CustomErrorHandlingResource() moat = CustomErrorHandlingResource() fetch = CaptchaFetchResource(hmacKey, publicKey, secretKey, - config.GIMP_CAPTCHA_DIR, fwdHeaders) + config.GIMP_CAPTCHA_DIR, + fwdHeaders, skipLoopback) check = CaptchaCheckResource(distributor, sched, numBridges, - hmacKey, publicKey, secretKey, fwdHeaders) + hmacKey, publicKey, secretKey, + fwdHeaders, skipLoopback) moat.putChild("fetch", fetch) moat.putChild("check", check) diff --git a/bridgedb/parse/addr.py b/bridgedb/parse/addr.py index bf5a8a5..90bc1d5 100644 --- a/bridgedb/parse/addr.py +++ b/bridgedb/parse/addr.py @@ -435,6 +435,28 @@ def isValidIP(ip): return False return True +def isLoopback(ip): + """Determine if ``ip`` is a loopback or localhost address (127.0.0.1/8). + + :type: ``str`` or ``ipaddr.IPAddress`` + :param ip: An IP address. + :rtype: bool + :returns: ``True`` if the IP was a loopback or localhost address; ``False`` + otherwise. + """ + try: + if isinstance(ip, basestring): + ip = ipaddr.IPAddress(ip) + + if ip.is_loopback: + return True + else: + return False + except Exception as err: + logging.debug("Error attempting to parse IP address: %s", ip) + + return False + def normalizeEmail(emailaddr, domainmap, domainrules, ignorePlus=True): """Normalise an email address according to the processing rules for its canonical originating domain. diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index c7f7718..07b44a0 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -42,6 +42,7 @@ MOAT_HTTPS_PORT = None MOAT_HTTP_IP = None MOAT_HTTP_PORT = None MOAT_USE_IP_FROM_FORWARDED_HEADER = True +MOAT_SKIP_LOOPBACK_ADDRESSES = True MOAT_N_IP_CLUSTERS = 4 MOAT_ROTATION_PERIOD = "3 hours" MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = 'moat_captcha_hmac_key' @@ -63,6 +64,7 @@ MOAT_HTTP_PORT = %r MOAT_BRIDGES_PER_ANSWER = %r MOAT_TRANSPORT_PREFERENCE_LIST = %r MOAT_USE_IP_FROM_FORWARDED_HEADER = %r +MOAT_SKIP_LOOPBACK_ADDRESSES = %r MOAT_N_IP_CLUSTERS = %r MOAT_ROTATION_PERIOD = %r MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = %r @@ -82,6 +84,7 @@ MOAT_GIMP_CAPTCHA_RSA_KEYFILE = %r MOAT_BRIDGES_PER_ANSWER, MOAT_TRANSPORT_PREFERENCE_LIST, MOAT_USE_IP_FROM_FORWARDED_HEADER, + MOAT_SKIP_LOOPBACK_ADDRESSES, MOAT_N_IP_CLUSTERS, MOAT_ROTATION_PERIOD, MOAT_GIMP_CAPTCHA_HMAC_KEYFILE, diff --git a/bridgedb/test/test_distributors_common_http.py b/bridgedb/test/test_distributors_common_http.py index 60759e4..ff3da41 100644 --- a/bridgedb/test/test_distributors_common_http.py +++ b/bridgedb/test/test_distributors_common_http.py @@ -91,6 +91,24 @@ class GetClientIPTests(unittest.TestCase): clientIP = server.getClientIP(request, useForwardedHeader=True) self.assertEqual(clientIP, None) + def test_getClientIP_XForwardedFor_skip_loopback(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=True) + self.assertEqual(clientIP, '3.3.3.3') + + def test_getClientIP_XForwardedFor_skip_loopback_multiple(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.6, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=True) + self.assertEqual(clientIP, '3.3.3.3') + + def test_getClientIP_XForwardedFor_no_skip_loopback(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=False) + self.assertEqual(clientIP, '127.0.0.1') + def test_getClientIP_fromRequest(self): """getClientIP() should return the IP address from the request instance when ``useForwardedHeader=False``. diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index f29f224..33069ef 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -337,6 +337,7 @@ class CaptchaFetchResourceTests(unittest.TestCase): self.root.putChild(self.pagename, self.resource) self.make_captcha_directory() + server.setPreferredTransports(['obfs4', 'vanilla']) def make_captcha_directory(self): if not os.path.isdir(self.captchaDir):

1 0

[bridgedb/develop] Merge branch 'release/0.6.4'
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 54c662947fb86330ef4a160a0e9fe2c707bd560c Merge: d49e904 4faecd5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 22:24:25 2018 +0000 Merge branch 'release/0.6.4' bridgedb.conf | 5 +++ bridgedb/distributors/common/http.py | 24 ++++++++++--- bridgedb/distributors/moat/server.py | 50 +++++++++++++++++--------- bridgedb/parse/addr.py | 22 ++++++++++++ bridgedb/test/moat_helpers.py | 3 ++ bridgedb/test/test_distributors_common_http.py | 18 ++++++++++ bridgedb/test/test_distributors_moat_server.py | 23 ++++++------ 7 files changed, 112 insertions(+), 33 deletions(-)

1 0

[bridgedb/master] Merge branch 'fix/24432-ignore-loopback' into develop
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 4faecd5c7252d108e3749a63ab0f0a0464adec05 Merge: 8b4f736 bf7ec9e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 22:20:51 2018 +0000 Merge branch 'fix/24432-ignore-loopback' into develop bridgedb.conf | 5 ++++ bridgedb/distributors/common/http.py | 24 +++++++++++++---- bridgedb/distributors/moat/server.py | 36 +++++++++++++++++++------- bridgedb/parse/addr.py | 22 ++++++++++++++++ bridgedb/test/moat_helpers.py | 3 +++ bridgedb/test/test_distributors_common_http.py | 18 +++++++++++++ bridgedb/test/test_distributors_moat_server.py | 1 + 7 files changed, 94 insertions(+), 15 deletions(-)

1 0