tor-commits June 2015

tor-commits@lists.torproject.org

22 participants
1870 discussions

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 03 Jun '15

03 Jun '15

commit 6e02900e93fd4f62f5751bd56c69b31f78e8682f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 3 02:16:21 2015 +0000 Update translations for tor_animation --- en_GB.srt | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/en_GB.srt b/en_GB.srt index 78c998d..0e6056a 100644 --- a/en_GB.srt +++ b/en_GB.srt @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[bridgedb/develop] Fix line number anchors in gitweb links.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit bd6bd837c5717077ba9cf08ab23611a665b93843 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 2 12:24:44 2015 -0700 Fix line number anchors in gitweb links. In one case, provide a commit hash so that the line number is relative to a known commit of the file. I found the commit in bridgedb.git where the URL was added, then found a commit in torspec.git that was around the same time and seems to point to the right place. Subtract one from the line numbers; maybe the old gitweb and the new are off by one relative to each other. --- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index d4e331e..58a81cd 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -63,7 +63,7 @@ class BridgeRingParameters(object): :ivar list needFlags: List of two-tuples of desired flags_ assigned to a Bridge by the Bridge DirAuth. - .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1696 + .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=6b557594ef#n… """ def __init__(self, needPorts=[], needFlags=[]): diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5fe3355..40cc7d9 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -109,7 +109,7 @@ class Flags(object): | "Valid" if the router has been 'validated'. .. _dir-spec.txt: - https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… + https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… :param list flags: A list of strings containing each of the flags parsed from the 's'-line.

1 0

[bridgedb/develop] Update URLs for new gitweb.
by isis＠torproject.org 02 Jun '15

02 Jun '15

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

1 0

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

02 Jun '15

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

1 0

[bridgedb/develop] Handle ConnectionRefusedError and DNSLookupError in get-tor-exits script.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit a3bcb12b281a3ffb23cf747991811d4f999a27a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:07:24 2015 +0000 Handle ConnectionRefusedError and DNSLookupError in get-tor-exits script. --- scripts/get-tor-exits | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/get-tor-exits b/scripts/get-tor-exits index d4e59e3..fcd9fff 100755 --- a/scripts/get-tor-exits +++ b/scripts/get-tor-exits @@ -31,6 +31,8 @@ from twisted.internet import defer from twisted.internet import protocol from twisted.internet import reactor from twisted.internet import ssl +from twisted.internet.error import ConnectionRefusedError +from twisted.internet.error import DNSLookupError from twisted.internet.error import TimeoutError @@ -70,11 +72,16 @@ def getSelfIPAddress(): s.close() return ip.compressed -def handleTimeout(failure): - """Handle a **failure** due to a timedout connection attempt.""" - if failure.type == TimeoutError: +def handle(failure): + """Handle a **failure**.""" + if failure.type == ConnectionRefusedError: + log.msg("get-tor-exits: Could not download exitlist; connection was refused.") + elif failure.type == DNSLookupError: + log.msg("get-tor-exits: Could not download exitlist; domain resolution failed.") + elif failure.type == TimeoutError: log.msg("get-tor-exits: Could not download exitlist; connection timed out.") - failure.trap(TimeoutError) + + failure.trap(ConnectionRefusedError, DNSLookupError, TimeoutError) def writeToFile(response, filename): log.msg("get-tor-exits: Downloading list of Tor exit relays.") @@ -167,7 +174,7 @@ def main(filename=None, address=None, port=None): agent = client.Agent(reactor, contextFactory) d = agent.request("GET", check) d.addCallback(writeToFile, fh) - d.addErrback(handleTimeout) + d.addErrback(handle) d.addCallbacks(log.msg, log.err) if not reactor.running:

1 0

[bridgedb/develop] Fix two typos in CHANGELOG entries and add description for #5463 entry.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 4496bc7b895e8f81625dad6a237db53321bae832 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:03:52 2015 +0000 Fix two typos in CHANGELOG entries and add description for #5463 entry. --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6b428c5..4dc04f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -349,7 +349,7 @@ Changes in version 0.2.4 - 2015-02-03 * FIXES #13123 https://bugs.torproject.org/13123 Previously, there were two additional whitespace characters at the beginning of bridge lines handed out by BridgeDB's HTTPS - distributor, which would be annoying copy+pasted into TorLauncher + distributor, which would be annoyingly copy+pasted into TorLauncher and torrcs, etc. These are now gone. * FIXES #12664 https://bugs.torproject.org/12664 @@ -389,7 +389,7 @@ And includes the following general changes: Changes in version 0.2.3 - 2014-07-26 * FIXES #5463 https://bugs.torproject.org/5463 - XXX + BridgeDB can now OpenPGP sign outgoing emails. * FIXES #9385 https://bugs.torproject.org/9385 BridgeDB now has the ability to blacklist email addresses, and @@ -543,7 +543,7 @@ Changes in version 0.2.2 - 2014-06-06 If a user refreshed https://bridges.torproject.org/bridges after successfully solving a CAPTCHA, BridgeDB would reply with a new set of bridges for each page refresh. This was due to the use of - `getIterval()` in `IPBasedDistributor.getBridgesForIP()`.The + `getInterval()` in `IPBasedDistributor.getBridgesForIP()`. The correct function to use is `getIntervalStart()`. This had been noted in a "XXX FIXME" comment above the call for quite some time, however, when the `bridgedb.schedule` (previously called

1 0

[bridgedb/develop] Update copyright dates and version number for example bridgedb.conf.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 8037df3a2d8475185175a22da66ba245f76fc934 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:05:44 2015 +0000 Update copyright dates and version number for example bridgedb.conf. --- bridgedb.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 51d9047..2c83582 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -13,9 +13,9 @@ # :authors: The Tor Project, Inc. # :license: This file is freely distributed as part of BridgeDB, see LICENSE # for details. -# :copyright: (c) 2007-2014 The Tor Project, Inc. -# (c) 2007-2014, all sentient entities within the AUTHORS file -# :version: 0.0.14 +# :copyright: (c) 2007-2015 The Tor Project, Inc. +# (c) 2007-2015, all sentient entities within the AUTHORS file +# :version: 0.3.2 #=============================================================================== # # CHANGELOG:

1 0

[bridgedb/develop] Spend even less time running benchmark tests.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 80939644b8833243e64a7cb51783f83dc7603e73 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:09:01 2015 +0000 Spend even less time running benchmark tests. --- lib/bridgedb/test/test_parse_descriptors.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index a7b22cf..46d86f1 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -499,6 +499,9 @@ class ParseDescriptorsTests(unittest.TestCase): def test_parse_descriptors_parseExtraInfoFiles_benchmark_1000_bridges(self): """Benchmark test for ``b.p.descriptors.parseExtraInfoFiles``.""" + raise SkipTest(("This test can take several minutes to complete. " + "Run it on your own free time.")) + print() for i in range(1, 6): descFiles = self.createDuplicatesForBenchmark(b=1000, n=i) @@ -509,7 +512,7 @@ class ParseDescriptorsTests(unittest.TestCase): """Benchmark test for ``b.p.descriptors.parseExtraInfoFiles``. The algorithm should grow linearly in the number of duplicates. """ - raise SkipTest(("This test takes ~7 minutes to complete. " + raise SkipTest(("This test can take several minutes to complete. " "Run it on your own free time.")) print()

1 0

[bridgedb/develop] Removed unused import of twisted.internet.defer from test_safelog.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 57aa6d31d2c606e2cd3a0b8c6d97b9662236f675 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:16:03 2015 +0000 Removed unused import of twisted.internet.defer from test_safelog. --- lib/bridgedb/test/test_safelog.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/test/test_safelog.py b/lib/bridgedb/test/test_safelog.py index bc92305..247db06 100644 --- a/lib/bridgedb/test/test_safelog.py +++ b/lib/bridgedb/test/test_safelog.py @@ -4,7 +4,6 @@ import re -from twisted.internet import defer from twisted.test.proto_helpers import StringTransport from twisted.trial import unittest

1 0

[bridgedb/develop] Add tests for Bridge.allVanillaAddresses idempotency and reentrancy.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit f8b5300f81aca52a6b34f36201fecf58ff817628 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun May 10 22:24:32 2015 +0000 Add tests for Bridge.allVanillaAddresses idempotency and reentrancy. --- lib/bridgedb/test/test_bridges.py | 113 +++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 7778b02..99fc458 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -988,6 +988,119 @@ class BridgeTests(unittest.TestCase): bridgePrefix=True) self.assertEqual(bridgeline, 'Bridge [6bf3:806b:78cd::4ced:cfad:dad4]:36488') + def test_Bridge_allVanillaAddresses_idempotency_self(self): + """Bridge.allVanillaAddresses should be idempotent, i.e. calling + allVanillaAddresses should not affect the results of subsequent calls. + """ + self.bridge.address = '1.1.1.1' + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + + def test_Bridge_allVanillaAddresses_idempotency_others(self): + """Bridge.allVanillaAddresses should be idempotent, i.e. calling + allVanillaAddresses should not affect any of the Bridge's other + attributes (such as Bridge.orAddresses). + """ + self.bridge.address = '1.1.1.1' + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.orAddresses, []) + + def test_Bridge_allVanillaAddresses_reentrancy_all(self): + """Bridge.allVanillaAddresses should be reentrant, i.e. updating the + Bridge's address, orPort, or orAddresses should update the value + returned by allVanillaAddresses. + """ + self.bridge.address = '1.1.1.1' + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), None, 4)]) + self.assertEqual(self.bridge.address, ipaddr.IPv4Address('1.1.1.1')) + self.assertEqual(self.bridge.orPort, None) + self.assertItemsEqual(self.bridge.orAddresses, []) + + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertEqual(self.bridge.address, ipaddr.IPv4Address('1.1.1.1')) + self.assertEqual(self.bridge.orPort, 443) + self.assertItemsEqual(self.bridge.orAddresses, []) + + self.bridge.address = '2.2.2.2' + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('2.2.2.2'), 443, 4)]) + self.assertEqual(self.bridge.address, ipaddr.IPv4Address('2.2.2.2')) + self.assertEqual(self.bridge.orPort, 443) + self.assertItemsEqual(self.bridge.orAddresses, []) + + self.bridge.orAddresses.append( + (ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('2.2.2.2'), 443, 4), + (ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)]) + self.assertEqual(self.bridge.address, ipaddr.IPv4Address('2.2.2.2')) + self.assertEqual(self.bridge.orPort, 443) + self.assertItemsEqual(self.bridge.orAddresses, + [(ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)]) + + def test_Bridge_allVanillaAddresses_reentrancy_orPort(self): + """Calling Bridge.allVanillaAddresses before Bridge.orPort is set + should return ``None`` for the port value, and after Bridge.orPort is + set, it should return the orPort. + """ + self.bridge.address = '1.1.1.1' + self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), None, 4)]) + self.assertItemsEqual(self.bridge.orAddresses, []) + + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.orAddresses, []) + + def test_Bridge_allVanillaAddresses_reentrancy_address(self): + """Calling Bridge.allVanillaAddresses before Bridge.address is set + should return ``None`` for the address value, and after Bridge.address + is set, it should return the address. + """ + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(None, 443, 4)]) + self.bridge.address = '1.1.1.1' + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + + def test_Bridge_allVanillaAddresses_reentrancy_orAddresses(self): + """Calling Bridge.allVanillaAddresses before Bridge.orAddresses is set + should return only the Bridge's address and orPort. + """ + self.bridge.address = '1.1.1.1' + self.bridge.orPort = 443 + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + self.assertItemsEqual(self.bridge.orAddresses, []) + self.bridge.orAddresses.append( + (ipaddr.IPv4Address('2.2.2.2'), 4443, 4)) + self.assertItemsEqual(self.bridge.orAddresses, + [(ipaddr.IPv4Address('2.2.2.2'), 4443, 4)]) + self.assertItemsEqual(self.bridge.allVanillaAddresses, + [(ipaddr.IPv4Address('2.2.2.2'), 4443, 4), + (ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) + def test_Bridge_updateORAddresses_valid_and_invalid(self): """Bridge._updateORAddresses() called with a mixture of valid and invalid ORAddress tuples should only retain the valid ones.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2015