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

[bridgedb/master] Add unittests for bridgedb.parse.addr.normalizeEmail().
by isis＠torproject.org 16 May '14

16 May '14

commit e33c55bd62fcced148e5fcdcb7319583ea982538 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 06:58:06 2014 +0000 Add unittests for bridgedb.parse.addr.normalizeEmail(). --- lib/bridgedb/test/test_parse_addr.py | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 1e6af83..55f0f60 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -122,6 +122,63 @@ class ExtractEmailAddressTests(unittest.TestCase): self.assertEqual(domain, 'gmail.com') +class NormalizeEmailTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.addr.normalizeEmail`.""" + + def test_permitted(self): + """A valid email address from a permitted domain should return + unchanged. + """ + domainrules = {} + domainmap = {'foo.example.com': 'example.com'} + emailaddr = 'alice(a)foo.example.com' + normalized = addr.normalizeEmail(emailaddr, domainmap, domainrules) + self.assertEqual(emailaddr, normalized) + + def test_notPermitted(self): + """A valid email address from a non-permitted domain should raise an + UnsupportedDomain error. + """ + domainrules = {} + domainmap = {'bar.example.com': 'example.com'} + emailaddr = 'Alice <alice(a)foo.example.com>' + self.assertRaises(addr.UnsupportedDomain, + addr.normalizeEmail, + emailaddr, domainmap, domainrules) + + def test_ignoreDots(self): + """A valid email address with a '.' should remove the '.' if + 'ignore_dots' is in domainrules. + """ + domainrules = {'example.com': 'ignore_dots'} + domainmap = {'foo.example.com': 'example.com'} + emailaddr = 'alice.bridges(a)foo.example.com' + normalized = addr.normalizeEmail(emailaddr, domainmap, domainrules) + self.assertEqual('alicebridges(a)foo.example.com', normalized) + + def test_ignorePlus(self): + """A valid email address with a '+' and some extra stuff, from a + permitted domain, should remove the '+' stuff if 'ignore_plus' is + enabled. + """ + domainrules = {} + domainmap = {'foo.example.com': 'example.com'} + emailaddr = 'alice+bridges(a)foo.example.com' + normalized = addr.normalizeEmail(emailaddr, domainmap, domainrules) + self.assertEqual('alice(a)foo.example.com', normalized) + + def test_dontIgnorePlus(self): + """A valid email address with a '+' and some extra stuff, from a + permitted domain, should return unchanged if 'ignore_plus' is disabled. + """ + domainrules = {} + domainmap = {'foo.example.com': 'example.com'} + emailaddr = 'alice+bridges(a)foo.example.com' + normalized = addr.normalizeEmail(emailaddr, domainmap, domainrules, + ignorePlus=False) + self.assertEqual(emailaddr, normalized) + + class ParseAddrIsIPAddressTests(unittest.TestCase): """Unittests for :func:`bridgedb.parse.addr.isIPAddress`.

1 0

[bridgedb/master] Add unittests for bridgedb.parse.addr.canonicalizeEmailDomain().
by isis＠torproject.org 16 May '14

16 May '14

commit 46e16fa31c5590e7db2b092029124d90ea061e1d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 06:53:50 2014 +0000 Add unittests for bridgedb.parse.addr.canonicalizeEmailDomain(). --- lib/bridgedb/test/test_parse_addr.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 9714cc1..6b22232 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -45,6 +45,40 @@ IP6UniqueLocal = "fc00::" IP6SiteLocal = "fec0::" +class CanonicalizeEmailDomainTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.addr.canonicalizeEmailDomain`.""" + + def test_nonDict(self): + """Using a non-dict domainmap as a parameter to + canonicalizeEmailDomain() should log an AttributeError and then raise + an UnsupportedDomain error. + """ + domainmap = 'example.com' + domain = 'fubar.com' + self.assertRaises(addr.UnsupportedDomain, + addr.canonicalizeEmailDomain, + domain, domainmap) + + def test_notPermitted(self): + """A domain not in the domainmap of allowed domains should raise an + UnsupportedDomain error. + """ + domainmap = {'foo.example.com': 'example.com'} + domain = 'bar.example.com' + self.assertRaises(addr.UnsupportedDomain, + addr.canonicalizeEmailDomain, + domain, domainmap) + + def test_permitted(self): + """A domain in the domainmap of allowed domains should return the + canonical domain. + """ + domainmap = {'foo.example.com': 'example.com'} + domain = 'foo.example.com' + canonical = addr.canonicalizeEmailDomain(domain, domainmap) + self.assertEquals(canonical, 'example.com') + + class ParseAddrIsIPAddressTests(unittest.TestCase): """Unittests for :func:`bridgedb.parse.addr.isIPAddress`.

1 0

[bridgedb/master] Set the logfile path by default, or else we get a ValueError.
by isis＠torproject.org 16 May '14

16 May '14

commit 1e481bf61f685a5a8fb3cfc2aa9cf6f6272c11d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 07:45:23 2014 +0000 Set the logfile path by default, or else we get a ValueError. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 691b9bc..8ca9aed 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -80,7 +80,7 @@ def configureLogging(cfg): level = getattr(cfg, 'LOGLEVEL', 'WARNING') logLevel = getattr(logging, level, 0) logStderr = getattr(cfg, 'LOG_TO_STDERR', False) - logfileName = getattr(cfg, 'LOGFILE', "") + logfileName = getattr(cfg, 'LOGFILE', "bridgedb.log") logfileCount = getattr(cfg, 'LOGFILE_COUNT', 3) - 1 logfileRotateSize = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) logThreads = getattr(cfg, 'LOG_THREADS', False)

1 0

[bridgedb/master] Add unittests for bridgedb.parse.headers.parseAcceptLanguage().
by isis＠torproject.org 16 May '14

16 May '14

commit 12aa4ce0119dfe0c082d1ae4c4fb3a646fd67cac Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 07:14:51 2014 +0000 Add unittests for bridgedb.parse.headers.parseAcceptLanguage(). --- lib/bridgedb/test/test_parse_headers.py | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/lib/bridgedb/test/test_parse_headers.py b/lib/bridgedb/test/test_parse_headers.py new file mode 100644 index 0000000..ddcf66f --- /dev/null +++ b/lib/bridgedb/test/test_parse_headers.py @@ -0,0 +1,52 @@ +# -*- 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) 2014, Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.parse.headers` module.""" + +from __future__ import absolute_import +from __future__ import print_function +from __future__ import unicode_literals + +from twisted.trial import unittest + +from bridgedb.parse import headers + + +class ParseAcceptLanguageTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.headers.parseAcceptLanguage`.""" + + def test_noHeaders(self): + """No header should return an empty list.""" + header = None + langs = headers.parseAcceptLanguage(header) + self.assertIsInstance(langs, list) + self.assertEqual(len(langs), 0) + + def test_defaultTBBHeader(self): + """The header 'en-us,en;q=0.5' should return ['en_us', 'en'].""" + header = 'en-us,en;q=0.5' + langs = headers.parseAcceptLanguage(header) + self.assertIsInstance(langs, list) + self.assertEqual(len(langs), 2) + self.assertEqual(langs[0], 'en_us') + self.assertEqual(langs[1], 'en') + + def test_addNonLocalizedVariant(self): + """The header 'en-us,en-gb;q=0.5' should return + ['en_us', 'en', 'en_gb']. + """ + header = 'en-us,en-gb;q=0.5' + langs = headers.parseAcceptLanguage(header) + self.assertIsInstance(langs, list) + self.assertEqual(len(langs), 3) + self.assertEqual(langs[0], 'en_us') + self.assertEqual(langs[1], 'en') + self.assertEqual(langs[2], 'en_gb')

1 0

[bridgedb/master] Add unittests for bridgedb.util module.
by isis＠torproject.org 16 May '14

16 May '14

commit 739cca47c700a3a5965465c958297eee2de8f8b6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 07:46:22 2014 +0000 Add unittests for bridgedb.util module. --- lib/bridgedb/test/test_util.py | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py new file mode 100644 index 0000000..354a4cd --- /dev/null +++ b/lib/bridgedb/test/test_util.py @@ -0,0 +1,60 @@ +# -*- 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) 2014, Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.util` module.""" + +from __future__ import absolute_import +from __future__ import print_function +from __future__ import unicode_literals + +import os + +from twisted.trial import unittest + +from bridgedb import util + + +class MiscLoggingUtilTests(unittest.TestCase): + """Unittests for miscellaneous logging functions in :mod:`bridgedb.util`.""" + + def test_getLogHandlers(self): + """util._getLogHandlers() should return ['rotating', 'console'] if + both stderr and logfile logging are enabled. + """ + logHandlers = util._getLogHandlers() + self.assertIsInstance(logHandlers, list) + self.assertEqual(len(logHandlers), 2) + + def test_getLogHandlers_disableStderr(self): + """util._getLogHandlers() should return ['rotating'] if stderr logging + is disabled. + """ + logHandlers = util._getLogHandlers(logToStderr=False) + self.assertIsInstance(logHandlers, list) + self.assertEqual(len(logHandlers), 1) + self.assertTrue('console' not in logHandlers) + + def test_getRotatingFileHandler(self): + """_getRotatingFileHandler() should create a file with 0600 + permissions (os.ST_WRITE | os.ST_APPEND). + """ + filename = str(self.id()) + '.log' + logHandler = util._getRotatingFileHandler(filename) + self.assertTrue(os.path.isfile(filename)) + self.assertEqual(os.stat_result(os.stat(filename)).st_mode, 33152) + self.assertIsInstance(logHandler, + util.logging.handlers.RotatingFileHandler) + + def test_configureLogging(self): + """Configure logging should be callable without borking anything.""" + from bridgedb.persistent import Conf + util.configureLogging(Conf()) + util.logging.info("BridgeDB's email address: bridges(a)torproject.org")

1 0

[bridgedb/master] Fix incorrect types used to initiate test instances of Bridge class.
by isis＠torproject.org 16 May '14

16 May '14

commit 4bbf7a9914dfc3fb585857cab62dc1d292f2f4ed Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 09:25:03 2014 +0000 Fix incorrect types used to initiate test instances of Bridge class. --- lib/bridgedb/test/test_Bridges.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py index 421b308..b51019b 100644 --- a/lib/bridgedb/test/test_Bridges.py +++ b/lib/bridgedb/test/test_Bridges.py @@ -3,31 +3,38 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please also see AUTHORS file -# :copyright: (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.EmailServer` module.""" -from twisted.trial import unittest +import ipaddr from binascii import a2b_hex + +from twisted.trial import unittest + from bridgedb import Bridges +from bridgedb.parse.addr import PortList + import hashlib try: from cStringIO import StringIO except ImportError: from io import StringIO + class BridgeClassTest(unittest.TestCase): """Tests for :class:`bridgedb.Bridges.Bridge`.""" def setUp(self): self.nickname = 'unnamed' - self.ip = '127.0.0.1' + self.ip = ipaddr.IPAddress('127.0.0.1') self.orport = '9001' self.fingerprint = 'a1cc8dfef1fa11af9c40af1054df9daf45250556' self.id_digest = a2b_hex(self.fingerprint) - self.or_addresses = {} + self.or_addresses = {ipaddr.IPAddress('6.6.6.6'): PortList(6666), + ipaddr.IPAddress('42.1.42.1'): PortList(443)} def test_init(self): try:

1 0

[bridgedb/master] Split a unittest for the Bridge class into several smaller tests.
by isis＠torproject.org 16 May '14

16 May '14

commit 20175b52feab80003def73fc0829638cfeb84963 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 09:25:53 2014 +0000 Split a unittest for the Bridge class into several smaller tests. --- lib/bridgedb/test/test_Bridges.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py index b51019b..2c00618 100644 --- a/lib/bridgedb/test/test_Bridges.py +++ b/lib/bridgedb/test/test_Bridges.py @@ -61,21 +61,40 @@ class BridgeClassTest(unittest.TestCase): self.ip, self.orport, fingerprint=invalid_fingerprint) - def test_Bridgehelperfunctions(self): + def test_getID(self): bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, self.fingerprint) self.assertEqual(self.id_digest, bridge.getID()) + def test_setDescriptorDigest(self): + """Test setting the server-descriptor digest value.""" + bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) testtext = 'thisisatest' bridge.setDescriptorDigest(testtext) self.assertEqual(bridge.desc_digest, testtext) + + def test_setExtraInfoDigest(self): + """Test setting the extra-info digest value.""" + bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + testtext = 'thisisatest' bridge.setExtraInfoDigest(testtext) self.assertEqual(bridge.ei_digest, testtext) + + def test_setVerified(self): + """Test setting the `verified` attribute on a Bridge.""" + bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) bridge.setVerified() self.assertTrue(bridge.isVerified()) self.assertTrue(bridge.verified) self.assertEqual(self.id_digest, bridge.getID()) + def test_setRunningStable(self): + """Test setting the `running` and `stable` attributes on a Bridge.""" + bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) self.assertFalse(bridge.running) self.assertFalse(bridge.stable) bridge.setStatus(True, True)

1 0

[bridgedb/master] Update translations: Welsh (cy), Italian (it), Slovak (sk).
by isis＠torproject.org 16 May '14

16 May '14

commit 6ba28bb31275a10b3efa97919c864fa17470cc6f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:03:46 2014 +0000 Update translations: Welsh (cy), Italian (it), Slovak (sk). * UPDATE Italian (it) gettext file. Thanks to Francesca Ciceri. * ADD Welsh (cy) translations. Thanks to huwwaters and littlegreykida. * ADD Slovak (sk) translations. Thanks to Michelozzo and Svistwarrior273. --- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 14 ++-- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..b209bf3 --- /dev/null +++ b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# huwwaters <huwwaters(a)gmail.com>, 2014 +# littlegreykida <theinfinitygap(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2014-03-26 08:20+0000\n" +"Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" +"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: cy\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Beth yw pontydd?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Pontydd gyfnewid %s yw'r gyfnewidiau Tor sy'n helpu chithau i osgoi sensoriaeth." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Ffordd arall i canfod cyfeiriadau pontydd cyhoeddys yw i anfon e-bost (o %s neu gyfeiriad %s) i %s gyda'r llinell 'get bridges' ar ei ben ei hyn o fewn corff yr e-bost." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Os nad yw'ch Tor yn gweithio, dylech e-bostio %s. Ceisiwch cynnwys cymaint o gwybodaith ag y bo modd, yn cynnwys yr rhestr o pontydd rydych wedi defnyddio, enw'r pecyn a defnyddwyd, yr negeseuon a rhoddwyd allan gan Tor, ayyb." + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "I defnyddio'r llinellau uwchben, cer i tydalen osodiadau Vidalia's Network, ac pwyswch \"Mae fy ISP yn wahardd cysylltiadau i'r rhwydwaith Tor.\" Wedyn, ychwanegwch pob gyfeiriad pont, un ar amser." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Nid oes pontydd ar gael" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Diweddarwch eich porwr i Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Teipiwch y ddau air" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Cam 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Cael gafael ar y %s Pecyn Porwr Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Cam 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Cael gafael ar %s pontydd %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Cam 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Nawr %s ychwanegwch y pontydd i Tor %s" diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index 14a6ab5..923e096 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: +# Francesca Ciceri <madamezou(a)zouish.org>, 2014 # ironbishop <ironbishop(a)fsfe.org>, 2011 -# Random_R <rand(a)yopmail.com>, 2013 +# Random_R, 2013 # fetidyoo <tru74368(a)yahoo.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-05-05 13:00+0000\n" -"Last-Translator: Random_R <rand(a)yopmail.com>\n" +"PO-Revision-Date: 2014-04-24 12:26+0000\n" +"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "Cosa sono i bridge?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere le censure." +msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere la censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" @@ -41,7 +43,7 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "Un altro metodo per trovare bridge pubblici è di inviare un'email (da un %s o un indirizzo %s) a %s con la sola frase 'get bridges' nel corpo dell'email." +msgstr "Un altro metodo per trovare bridge pubblici è di inviare una email (da un %s o un indirizzo %s) a %s contenente la sola frase \"get bridges\"." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -53,7 +55,7 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Se il tuo Tor non funziona, manda un'email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." +msgstr "Se il tuo Tor non funziona, manda una email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." #: lib/bridgedb/templates/bridges.html:10 msgid "" diff --git a/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..e982650 --- /dev/null +++ b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2014-03-27 09:10+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Čo sú to premostenia?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s premostovacie relé %s sú také relé Toru, ktoré vám pomôžu obchádzať cenzúru." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Potrebujem iný spôsob ako získať premostenia!" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Ďalším spôsobom zistenia verejných adries mostov je zaslať email (z adries %s alebo %s) na %s s telom správy obsahujúcim riadok 'get bridges'." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Ak váš Tor nefunguje, mali by ste zaslať email na adresu %s. Pokúste sa zahrnúť všetky vám známe fakty, vrátane zoznamu vami využívaných mostov, názov/verziu používanej verzie Bundle, všetky správy vypísané Torom, atď." + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "Ak chcete využiť vyššie uvedené, navštívte stránku Nastavenia siete vo Vidalii a kliknite na \"Môj ISP blokuje pripojenia k sieti Toru\". Potom postupne pridávajte adresy premostení jednu za druhou." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Momentálne nie sú dostupné žiadne premostenia." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Aktualizujte váš prehliadač na Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Napíšte dve slová" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Krok 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Získajte %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Krok 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Získajte %s premostenia %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Krok 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Teraz %s pridajte premostenia k Toru %s"

1 0

[bridgedb/master] Add testing for Bridge.getConfigLine().
by isis＠torproject.org 16 May '14

16 May '14

commit 7d28e9448a66718e6430e672bfa54982d8c88661 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 09:26:17 2014 +0000 Add testing for Bridge.getConfigLine(). --- lib/bridgedb/test/test_Bridges.py | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py index 2c00618..93d6c10 100644 --- a/lib/bridgedb/test/test_Bridges.py +++ b/lib/bridgedb/test/test_Bridges.py @@ -101,8 +101,40 @@ class BridgeClassTest(unittest.TestCase): self.assertTrue(bridge.running) self.assertTrue(bridge.stable) -# def test_isBlocked(self): - + def test_getConfigLine_vanilla_withoutFingerprint(self): + """Should return a config line without a fingerprint.""" + bridge = Bridges.Bridge('nofpr', '23.23.23.23', 2323, self.fingerprint, + or_addresses=self.or_addresses) + bridgeLine = bridge.getConfigLine() + ip = bridgeLine.split(':')[0] + self.assertTrue(ipaddr.IPAddress(ip)) + + def test_getConfigLine_vanilla_withFingerprint(self): + """Should return a config line with a fingerprint.""" + bridge = Bridges.Bridge('fpr', '23.23.23.23', 2323, + id_digest=self.id_digest, + or_addresses=self.or_addresses) + bridgeLine = bridge.getConfigLine(includeFingerprint=True) + self.assertSubstring(self.fingerprint, bridgeLine) + ip = bridgeLine.split(':')[0] + self.assertTrue(ipaddr.IPAddress(ip)) + + def test_getConfigLine_scramblesuit_withFingerprint(self): + """Should return a scramblesuit config line with a fingerprint.""" + bridge = Bridges.Bridge('philipkdick', '23.23.23.23', 2323, + id_digest=self.id_digest, + or_addresses=self.or_addresses) + ptArgs = {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} + pt = Bridges.PluggableTransport(bridge, 'scramblesuit', + ipaddr.IPAddress('42.42.42.42'), 4242, + ptArgs) + bridge.transports.append(pt) + bridgeLine = bridge.getConfigLine(includeFingerprint=True, + transport='scramblesuit') + ptArgsList = ' '.join(["{0}={1}".format(k,v) for k,v in ptArgs.items()]) + self.assertEqual("scramblesuit 42.42.42.42:4242 %s %s" + % (self.fingerprint, ptArgsList), + bridgeLine) def test_getDescriptorDigests(self): sha1hash = hashlib.sha1()

1 0

[bridgedb/master] Remove unused unittest lib/bridgedb/test/bridgedb.conf file.
by isis＠torproject.org 16 May '14

16 May '14

commit d061571b2887f73905b8cc7749a19daa11cceab5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:31:02 2014 +0000 Remove unused unittest lib/bridgedb/test/bridgedb.conf file. --- lib/bridgedb/test/bridgedb.conf | 55 --------------------------------------- 1 file changed, 55 deletions(-) diff --git a/lib/bridgedb/test/bridgedb.conf b/lib/bridgedb/test/bridgedb.conf deleted file mode 100644 index ce12096..0000000 --- a/lib/bridgedb/test/bridgedb.conf +++ /dev/null @@ -1,55 +0,0 @@ -BRIDGE_FILES = ["bridge-descriptors"] -EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"] -STATUS_FILE = "networkstatus-bridges" -HTTPS_CERT_FILE="cert" -HTTPS_KEY_FILE="privkey.pem" -LOGFILE = "bridgedb.log" -ASSIGNMENTS_FILE = "assignments.log" -PIDFILE = "bridgedb.pid" -DB_FILE = "bridgedist.db" -DB_LOG_FILE = "bridgedist.log" -MASTER_KEY_FILE = "secret_key" -PROXY_LIST_FILES = [] -LOGLEVEL = "DEBUG" -SAFELOGGING = True -LOGFILE_COUNT = 5 -LOGFILE_ROTATE_SIZE = 10000000 -BRIDGE_PURPOSE = "bridge" -N_IP_CLUSTERS = 4 -FORCE_PORTS = [(443, 1)] -FORCE_FLAGS = [("Stable", 1)] -HTTPS_DIST = True -HTTPS_BIND_IP = '127.0.0.1' -HTTPS_PORT = 6789 -HTTPS_N_BRIDGES_PER_ANSWER = 3 -HTTPS_INCLUDE_FINGERPRINTS = True -HTTPS_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_UNENCRYPTED_BIND_IP = None -HTTP_UNENCRYPTED_PORT = None -HTTP_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_N_BRIDGES_PER_ANSWER = 3 -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 = 25 -EMAIL_USERNAME = "bridges" -EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] -EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com"} -EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"]} -EMAIL_RESTRICT_IPS = [] -EMAIL_BIND_IP="127.0.0.1" -EMAIL_PORT=6725 -EMAIL_N_BRIDGES_PER_ANSWER=3 -EMAIL_INCLUDE_FINGERPRINTS = True -EMAIL_GPG_SIGNING_ENABLED = True -EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' -HTTPS_SHARE = 10 -EMAIL_SHARE = 10 -RESERVED_SHARE = 2 -FILE_BUCKETS = {} -RECAPTCHA_ENABLED = False -RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = ''

1 0