December 2017 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit 8eea488300a577af6546a10f2ef15a0f341b4e70 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 11:16:54 2017 +0000 Update translations for tor-launcher-network-settings --- tr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index 6111cfbe9..85553956b 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Tor ağına bağlanmak için "Bağlan" üzerine tıklayın."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Tor'u sansürleyen bir ülkedeyseniz (örneğin Mısır, Çin, Türkiye) veya bir vekil sunucu gerektiren özel bir ağdan bağlanıyorsanız ağ ayarlarını yapmak için "Yapılandır" a tıklayın."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connect "Bağlan">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit ea851b77aabbb55083988fdb85f5dbf9e08ec090 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 10:15:51 2017 +0000 Update translations for https_everywhere_completed --- sv/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/ssl-observatory.dtd b/sv/ssl-observatory.dtd index 365602426..e9d909c89 100644 --- a/sv/ssl-observatory.dtd +++ b/sv/ssl-observatory.dtd @@ -27,7 +27,7 @@ ett väldigt påträngande företagsnätverk:"> "Säkert, om inte du använder ett företagsnätverk med hemliga intranät server namn:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Skicka och kolla certifikat signerade av icke-standard root Certifikat Instanser"> +"Skicka och kontrollera certifikat signerade av icke-standard root Certifikat Instanser"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "Det är säkert (och en bra idé) att aktivera detta val, om inte du använder ett påträngande företagsnätverk eller Kaspersky antivirus program som övervakar ditt surfande med en TLS proxy och en privat root Certifikat Instans. Om aktiverat på ett sådant nätverk kan denna inställning publicera bevis av vilka https:// domäner blev besökta genom den proxyn, på grund av de unika certifikat de skulle producera. Så vi lämnar den avaktiverad som standard.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit 5549400e33dad99927075a89500ad7752c7b25d4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 10:15:40 2017 +0000 Update translations for https_everywhere --- sv/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/ssl-observatory.dtd b/sv/ssl-observatory.dtd index 365602426..e9d909c89 100644 --- a/sv/ssl-observatory.dtd +++ b/sv/ssl-observatory.dtd @@ -27,7 +27,7 @@ ett väldigt påträngande företagsnätverk:"> "Säkert, om inte du använder ett företagsnätverk med hemliga intranät server namn:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Skicka och kolla certifikat signerade av icke-standard root Certifikat Instanser"> +"Skicka och kontrollera certifikat signerade av icke-standard root Certifikat Instanser"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "Det är säkert (och en bra idé) att aktivera detta val, om inte du använder ett påträngande företagsnätverk eller Kaspersky antivirus program som övervakar ditt surfande med en TLS proxy och en privat root Certifikat Instans. Om aktiverat på ett sådant nätverk kan denna inställning publicera bevis av vilka https:// domäner blev besökta genom den proxyn, på grund av de unika certifikat de skulle producera. Så vi lämnar den avaktiverad som standard.">

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit e913845a1d102e34ffb360e23239b89f013b06b0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 05:50:30 2017 +0000 Update translations for exoneratorproperties --- mk/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/exonerator.properties b/mk/exonerator.properties index 5cf9ac90a..5d9a5c53b 100644 --- a/mk/exonerator.properties +++ b/mk/exonerator.properties @@ -1,6 +1,6 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=IP address -form.timestamp.label=Date +form.timestamp.label=Датум form.search.label=Пребарај summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit 0c52936105e1747ac0368615e767490a4c615cdd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 05:16:26 2017 +0000 Update translations for mat-gui --- mk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk.po b/mk.po index 0f0fd9bb9..e55abf97d 100644 --- a/mk.po +++ b/mk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-12-20 20:26+0000\n" +"PO-Revision-Date: 2017-12-22 05:00+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "" #: mat-gui:219 msgid "Preferences" -msgstr "" +msgstr "Параметри" #: mat-gui:232 msgid "Reduce PDF quality"

1 0

[bridgedb/develop] Merge branch 'fix/24701' into develop
by isis＠torproject.org 21 Dec '17

21 Dec '17

commit c6c9f47968368f987dd0b9edefdf55ea4f0b1ad2 Merge: 637e1fc 0f03fb6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 22 03:20:32 2017 +0000 Merge branch 'fix/24701' into develop bridgedb/distributors/https/server.py | 43 +++++++++++++++++++++++++++-------- bridgedb/test/test_https_server.py | 11 ++++----- 2 files changed, 39 insertions(+), 15 deletions(-)

1 0

[bridgedb/develop] Delay and then redirect malicious requests.
by isis＠torproject.org 21 Dec '17

21 Dec '17

commit 0f03fb65518353e1409e08def7201ea17fe1318f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 22 01:45:52 2017 +0000 Delay and then redirect malicious requests. * FIXES #24701: https://bugs.torproject.org/24701 --- bridgedb/distributors/https/server.py | 43 +++++++++++++++++++++++++++-------- bridgedb/test/test_https_server.py | 11 ++++----- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index d4771a6..8c50bc1 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -37,7 +37,9 @@ import mako.exceptions from mako.template import Template from mako.lookup import TemplateLookup +from twisted.internet import defer from twisted.internet import reactor +from twisted.internet import task from twisted.internet.error import CannotListenError from twisted.web import resource from twisted.web import static @@ -138,6 +140,20 @@ def replaceErrorPage(request, error, template_name=None, html=True): return rendered +def redirectMaliciousRequest(request): + '''Redirect the client to a "daring work of art" which "in true + post-modern form, […] tends to raise more questions than answers." + ''' + logging.debug("Redirecting %s to a daring work of art..." % getClientIP(request)) + request.write(redirectTo(base64.b64decode("aHR0cDovLzJnaXJsczFjdXAuY2Ev"), request)) + request.finish() + return request + + +class MaliciousRequest(Exception): + """Raised when we received a possibly malicious request.""" + + class CSPResource(resource.Resource): """A resource which adds a ``'Content-Security-Policy:'`` header. @@ -411,9 +427,9 @@ class CaptchaProtectedResource(CustomErrorHandlingResource, CSPResource): challenge = request.args['captcha_challenge_field'][0] response = request.args['captcha_response_field'][0] except Exception as error: - logging.debug(("Client CAPTCHA solution to HTTPS distributor server" - "didn't include correct HTTP arguments: %s" % error)) - return redirectTo(type(b'')(request.URLPath()), request) + raise MaliciousRequest( + ("Client CAPTCHA solution to HTTPS distributor server " + "didn't include correct HTTP arguments: %s" % error)) return (challenge, response) def checkSolution(self, request): @@ -477,12 +493,21 @@ class CaptchaProtectedResource(CustomErrorHandlingResource, CSPResource): self.setCSPHeader(request) request.setHeader("Content-Type", "text/html; charset=utf-8") - if self.checkSolution(request) is True: - try: - rendered = self.resource.render(request) - except Exception as err: - rendered = replaceErrorPage(request, err) - return rendered + try: + if self.checkSolution(request) is True: + return self.resource.render(request) + except ValueError as err: + logging.debug(err.message) + except MaliciousRequest as err: + logging.debug(err.message) + # Make them wait a bit, then redirect them to a "daring + # work of art" as pennance for their sins. + d = task.deferLater(reactor, 1, lambda: request) + d.addCallback(redirectMaliciousRequest) + return NOT_DONE_YET + except Exception as err: + logging.debug(err.message) + return replaceErrorPage(request, err) logging.debug("Client failed a CAPTCHA; returning redirect to %s" % request.uri) diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 13ec20e..ba555e8 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -373,18 +373,17 @@ class GimpCaptchaProtectedResourceTests(unittest.TestCase): self.assertEqual(response, expectedResponse) def test_extractClientSolution_missing_arguments(self): - """A solution with missing arguments (the solution field) should - return a very agressive redirect to the originally requested, - CAPTCHA-protected page. + """A solution with missing arguments (the solution/challenge fields) + should raise a MaliciousRequest exception. """ expectedChallenge = '23232323232323232323' self.request.method = b'POST' self.request.addArg('captcha_challenge_field', expectedChallenge) - response = self.captchaResource.extractClientSolution(self.request) - - self.assertIn("click here", response) + self.assertRaises(server.MaliciousRequest, + self.captchaResource.extractClientSolution, + self.request) def test_checkSolution(self): """checkSolution() should return False is the solution is invalid."""

1 0

[bridgedb/develop] Filter returned bridges to avoid multiples from the same /16 or /32.
by isis＠torproject.org 21 Dec '17

21 Dec '17

commit ad269657fe16f2603f207bdb2a979266c3b918e8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 22 02:34:32 2017 +0000 Filter returned bridges to avoid multiples from the same /16 or /32. * FIXES #24704 https://bugs.torproject.org/24704 --- bridgedb/Bridges.py | 52 ++++++++++++++++++++---- bridgedb/distributors/email/distributor.py | 2 +- bridgedb/distributors/https/distributor.py | 2 +- bridgedb/test/test_Bridges.py | 64 ++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 9 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 13bffd2..dfc6ac5 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -268,7 +268,39 @@ class BridgeRing(object): assert len(r) == N return r - def getBridges(self, pos, N=1): + def filterDistinctSubnets(self, fingerprints): + """Given a chosen set of ``fingerprints`` of bridges to distribute, + filter the bridges such that they are in distinct subnets. + """ + logging.debug("Got %d possible bridges to filter" % len(fingerprints)) + + bridges = [] + subnets = [] + + for fingerprint in fingerprints: + bridge = self.bridges[fingerprint] + jump = False + for subnet in subnets: + if bridge.address in subnet: + jump = True + logging.debug( + ("Skipping distribution of bridge %s in a subnet which " + "contains another bridge we're already distributing") + % bridge) + break + if jump: + continue + + bridges.append(bridge) + if bridge.address.version == 4: + cidr = str(bridge.address) + "/16" + else: + cidr = str(bridge.address) + "/32" + subnets.append(ipaddr.IPNetwork(cidr)) + + return bridges + + def getBridges(self, pos, N=1, filterBySubnet=False): """Return **N** bridges appearing in this hashring after a position. :param bytes pos: The position to jump to. Any bridges returned will @@ -285,19 +317,25 @@ class BridgeRing(object): count = len(subring) forced.extend(subring._getBridgeKeysAt(pos, count)) - keys = [ ] - for k in forced + self._getBridgeKeysAt(pos, N): + keys = [] + + # Oversample double the number we need, in case we need to + # filter them and some are within the same subnet. + for k in forced + self._getBridgeKeysAt(pos, N + N): if k not in keys: keys.append(k) else: logging.debug( "Got duplicate bridge %r in main hashring for position %r." % (logSafely(k.encode('hex')), pos.encode('hex'))) - keys = keys[:N] keys.sort() - #Do not return bridges from the same /16 - bridges = [ self.bridges[k] for k in keys ] + if filterBySubnet: + bridges = self.filterDistinctSubnets(keys) + else: + bridges = [self.bridges[k] for k in keys] + + bridges = bridges[:N] return bridges @@ -551,7 +589,7 @@ class FilteredBridgeSplitter(object): For all sub-hashrings, the ``bridge`` will only be added iff it passes the filter functions for that sub-hashring. - :type bridge: :class:`~bridgedb.Bridges.Bridge` + :type bridge: :class:`~bridgedb.bridges.Bridge` :param bridge: The bridge to add. """ # The bridge must be running to insert it: diff --git a/bridgedb/distributors/email/distributor.py b/bridgedb/distributors/email/distributor.py index b76c26c..fbf1a50 100644 --- a/bridgedb/distributors/email/distributor.py +++ b/bridgedb/distributors/email/distributor.py @@ -191,7 +191,7 @@ class EmailDistributor(Distributor): populate_from=self.hashring.bridges) returnNum = self.bridgesPerResponse(ring) - result = ring.getBridges(pos, returnNum) + result = ring.getBridges(pos, returnNum, filterBySubnet=False) db.setEmailTime(bridgeRequest.client, now) db.commit() diff --git a/bridgedb/distributors/https/distributor.py b/bridgedb/distributors/https/distributor.py index 5ff9d83..7bce8d9 100644 --- a/bridgedb/distributors/https/distributor.py +++ b/bridgedb/distributors/https/distributor.py @@ -342,6 +342,6 @@ class HTTPSDistributor(Distributor): # Determine the appropriate number of bridges to give to the client: returnNum = self.bridgesPerResponse(ring) - answer = ring.getBridges(position, returnNum) + answer = ring.getBridges(position, returnNum, filterBySubnet=True) return answer diff --git a/bridgedb/test/test_Bridges.py b/bridgedb/test/test_Bridges.py new file mode 100644 index 0000000..092b033 --- /dev/null +++ b/bridgedb/test/test_Bridges.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# :copyright: (c) 2017, Isis Lovecruft +# (c) 2017, The Tor Project, Inc. +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.Bridges`.""" + +from __future__ import print_function + +import copy +import ipaddr +import logging + +from twisted.trial import unittest + +from bridgedb import Bridges +from bridgedb.test import util + +# For additional logger output for debugging, comment out the following: +#logging.disable(50) +# and then uncomment the following line: +Bridges.logging.getLogger().setLevel(10) + + +class BridgeRingTests(unittest.TestCase): + """Unittests for :class:`bridgedb.Bridges.BridgeRing`.""" + + def setUp(self): + self.ring = Bridges.BridgeRing('fake-hmac-key') + + def addBridgesFromSameSubnet(self): + bridges = copy.deepcopy(util.generateFakeBridges()) + subnet = "5.5.%d.%d" + i = 1 + j = 1 + + for bridge in bridges: + bridge.address = ipaddr.IPAddress(subnet % (i, j)) + self.ring.insert(bridge) + + if j == 255: + j = 1 + i += 1 + else: + j += 1 + + def test_filterDistinctSubnets(self): + """If there are bridges in the same subnet then they should be + filtered out of the results. + """ + self.addBridgesFromSameSubnet() + + chosen = self.ring.bridges.keys()[:10] + bridges = self.ring.filterDistinctSubnets(chosen) + + # Since they're all in the same /16, we should only get one + # bridge back: + self.assertEqual(len(bridges), 1)

1 0

[bridgedb/develop] Merge branch 'fix/24704' into develop
by isis＠torproject.org 21 Dec '17

21 Dec '17

commit 637e1fc2a4e09ec8ad5a2442db2298d3666897eb Merge: 1096bf4 ad26965 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 22 02:41:46 2017 +0000 Merge branch 'fix/24704' into develop bridgedb/Bridges.py | 52 ++++++++++++++++++++---- bridgedb/distributors/email/distributor.py | 2 +- bridgedb/distributors/https/distributor.py | 2 +- bridgedb/test/test_Bridges.py | 64 ++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 9 deletions(-)

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 21 Dec '17

21 Dec '17

commit 067d58e99c5816f398806520144eea4cc4d8d563 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 00:20:20 2017 +0000 Update translations for tails-greeter-2 --- mk/mk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/mk.po b/mk/mk.po index 235d4989e..5ccd0b010 100644 --- a/mk/mk.po +++ b/mk/mk.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-15 21:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: orvel_mk <george.orwell50(a)gmail.com>, 2016\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>, 2017\n" "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +150,7 @@ msgstr "" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Отклучи" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage"

1 0