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

[bridgedb/master] Deduplicate getClientIP() function in bridgedb.HTTPServer.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 06c22e1b40bec96502331fd7054c2354ef1eea38 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 08:38:53 2015 +0000 Deduplicate getClientIP() function in bridgedb.HTTPServer. --- lib/bridgedb/HTTPServer.py | 53 ++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index beff4bd..8c58380 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -75,6 +75,33 @@ lookup = TemplateLookup(directories=[TEMPLATE_DIR], collection_size=500) logging.debug("Set template root to %s" % TEMPLATE_DIR) + +def getClientIP(request, useForwardedHeader=False): + """Get the client's IP address from the :header:`X-Forwarded-For` + header, or from the :api:`request <twisted.web.server.Request>`. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for a + :api:`twisted.web.resource.Resource`. + :param bool useForwardedHeader: If ``True``, attempt to get the client's + IP address from the :header:`X-Forwarded-For` header. + :rtype: None or str + :returns: The client's IP address, if it was obtainable. + """ + ip = None + + 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 + else: + ip = request.getClientIP() + + return ip + def replaceErrorPage(error, template_name=None): """Create a general error page for displaying in place of tracebacks. @@ -138,20 +165,13 @@ class CaptchaProtectedResource(resource.Resource): """Get the client's IP address from the :header:`X-Forwarded-For` header, or from the :api:`request <twisted.web.server.Request>`. + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for a + :api:`twisted.web.resource.Resource`. :rtype: None or str :returns: The client's IP address, if it was obtainable. """ - ip = None - if self.useForwardedHeader: - h = request.getHeader("X-Forwarded-For") - if h: - ip = h.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird X-Forwarded-For value %r" % h) - ip = None - else: - ip = request.getClientIP() - return ip + return getClientIP(request, self.useForwardedHeader) def getCaptchaImage(self, request=None): """Get a CAPTCHA image. @@ -667,16 +687,7 @@ class WebResourceBridges(resource.Resource): ip = None countryCode = None - # XXX this code is duplicated in CaptchaProtectedResource - if self.useForwardedHeader: - h = request.getHeader("X-Forwarded-For") - if h: - ip = h.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird forwarded-for value %r",h) - ip = None - else: - ip = request.getClientIP() + ip = getClientIP(request, self.useForwardedForHeader) # Look up the country code of the input IP if isIPAddress(ip):

1 0

[bridgedb/master] Fix non-deterministic CI errors with use of Queue in test_smtp.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 069659d51d06a86cd1b609b42106774f536b58e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 18 03:37:50 2015 +0000 Fix non-deterministic CI errors with use of Queue in test_smtp. See https://travis-ci.org/isislovecruft/bridgedb/jobs/58996136#L3281 --- lib/bridgedb/test/test_smtp.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 1cbafba..de443b3 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -84,11 +84,21 @@ class EmailServer(SMTPServer): assert self._thread.is_alive() == False, "Thread is alive and kicking" def getAndCheckMessageContains(self, text, timeoutInSecs=2.0): - #print("Checking for reponse") - message = self.message_queue.get(block=True, timeout=timeoutInSecs) - assert message.find(text) != -1, ("Message did not contain text '%s'." - "Full message is:\n %s" - % (text, message)) + try: + message = self.message_queue.get(block=True, timeout=timeoutInSecs) + # Queue.Empty, according to its documentation, is only supposed to be + # raised when Queue.get(block=False) or Queue.get_nowait() are called. + # I've no idea why it's getting raised here, when we're blocking for + # it, but nonetheless it causes occasional, non-deterministic CI + # failures: + # + # https://travis-ci.org/isislovecruft/bridgedb/jobs/58996136#L3281 + except Queue.Empty: + pass + else: + assert message.find(text) != -1, ("Message did not contain text '%s'." + "Full message is:\n %s" + % (text, message)) def checkNoMessageReceived(self, timeoutInSecs=2.0): try:

1 0

[bridgedb/master] Add integration tests for post- prop#220 and prop#228 descriptor parsing.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 87bd6e2d0ec9522ed40be8175c046516ce42fc1a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 10 06:57:28 2015 +0000 Add integration tests for post- prop#220 and prop#228 descriptor parsing. --- lib/bridgedb/test/test_parse_descriptors.py | 121 +++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 46d86f1..dd6d146 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -179,6 +179,107 @@ U36EY4UoN5ABPowhNZFeyr5A3vKiDr6j0hCOqYOhxPY= -----END SIGNATURE----- ''' +BRIDGE_SERVER_DESCRIPTOR_ED25519 = '''\ +@purpose bridge +router piratepartei 80.92.79.70 80 0 0 +identity-ed25519 +-----BEGIN ED25519 CERT----- +AQQABhauAccW2uNOkPPWU7h9x9FFWtUJXCnw423dKqL/89pTHFRcAQAgBADfGmFI +//1tBiZZxZ2aXNvvLbEdS/0XHYCWY6Oz3lHCU2xHCJzW03U7htLpq95lWStr2bMm +D9N1MJp8Zufal71nFV5dgCm0DvMoeCN0d1F6zYnrGvyq+2E6p32x/DG33Qs= +-----END ED25519 CERT----- +master-key-ed25519 3xphSP/9bQYmWcWdmlzb7y2xHUv9Fx2AlmOjs95RwlM +platform Tor 0.2.7.1-alpha-dev on Linux +protocols Link 1 2 Circuit 1 +published 2015-06-09 21:59:40 +fingerprint 312D 6427 4C29 1560 0584 3EEC B19C 6865 FA3C C10C +uptime 0 +bandwidth 14971520 104857600 64512 +extra-info-digest 30E10A35CCEA6AA1E04C15FD5F99022F4CACEBC6 pph/KzxlcGa20Sl6/nQl7noyKctzcWkRkTbBX7aIapQ +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALRXlkmBc96bz/WFSJ0/NoNYuOivpRBkMDqE0617x63EE9zA+BQGVk81 +5mbF50IQRS12J3F7x+m7USGF7xcUw+id9pe1jzyyqOTo2BPf2Wemif+CvVc9uD0v +BLO38iImiret0yZtxq3RQ2KaCg2z0y+RPDudR6z/d6V3ASFSlPgBAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALGE2wcWNpWczHlLOa3MbRMKYGDMNe3MsTDKqxftImHuUdMV758q5/4c +2d0znZ1k5zma7TIKXM1xblVWaHmSZ65jMyy0jgZl7SNbxibP3xM8mfHAJOoWfnQu +LSj8tKSir2BdA8rncajrDmtQe0C8mxA/RgUHuB6ZF42kAB9lm/33AgMBAAE= +-----END RSA PUBLIC KEY----- +onion-key-crosscert +-----BEGIN CROSSCERT----- +EPpvZluK8YLLXU00HVskixVqpJfkCeKWXkQPv5Vq87n7E/gtzrVM9A0DasSPHgor +0Y1jP2K/6G0nuloeDZuNNqPxxz7LEKom5q66UO0Tk4Xdnmj1yp/hSsqi/8sUGe9R +BmZmuz45UJGmADiYwwFnwec/bKkX3al4BwuQRHwcZd0= +-----END CROSSCERT----- +ntor-onion-key-crosscert 1 +-----BEGIN ED25519 CERT----- +AQoABhSGAd8aYUj//W0GJlnFnZpc2+8tsR1L/RcdgJZjo7PeUcJTABR4eqhKqYNN +Sgpojtm7C+QRvD3mTk06EEbFly9VrXOaSK4BVxTlsHadm4ti7vdqGHbTWN7DRRu6 +nnUKJPMOsAk= +-----END ED25519 CERT----- +hidden-service-dir +contact 0x02225522 Frenn vun der Enn (FVDE) <info AT enn DOT lu> +ntor-onion-key ycFwQVUCqJlPaLwJNvlrpgNLwkU780t4pKiILLWZw0o= +reject *:* +router-sig-ed25519 /uWcpQeWcwywFwy+O1WGfLQFuxkLMsy8u+rTTum4CQd8uN7bt3VCHRG82X9sc18rMv2VHUs7b+WZcfX39ADMDw +router-signature +-----BEGIN SIGNATURE----- +FpF1a2jF1gkVbSUEuuDrw8ggeyQl4HLqHGXJM/J3SPQDky0OhvqPEV8E0CpONG38 +YNumnkSJ0vjI0YUuVyOZKpODHS/dlXnz5F/Yz8vwQfC7IsNRQgNgf5tbT3iAF8yh +VC4FdHgFlAkXbiqkpWtD0ojJJjLlEeXbmGILjC1Ls2I= +-----END SIGNATURE----- +''' + +BRIDGE_EXTRA_INFO_DESCRIPTOR_ED25519 = '''\ +extra-info piratepartei 312D64274C29156005843EECB19C6865FA3CC10C +identity-ed25519 +-----BEGIN ED25519 CERT----- +AQQABhauAccW2uNOkPPWU7h9x9FFWtUJXCnw423dKqL/89pTHFRcAQAgBADfGmFI +//1tBiZZxZ2aXNvvLbEdS/0XHYCWY6Oz3lHCU2xHCJzW03U7htLpq95lWStr2bMm +D9N1MJp8Zufal71nFV5dgCm0DvMoeCN0d1F6zYnrGvyq+2E6p32x/DG33Qs= +-----END ED25519 CERT----- +published 2015-06-09 21:59:40 +write-history 2015-06-09 19:41:54 (14400 s) 1093632,3138560,1309696,1641472,1064960,1799168 +read-history 2015-06-09 19:41:54 (14400 s) 4406272,6537216,5197824,5701632,5342208,5817344 +dirreq-write-history 2015-06-09 19:17:22 (14400 s) 28672,1727488,575488,589824,43008,618496 +dirreq-read-history 2015-06-09 19:17:22 (14400 s) 0,0,0,0,0,0 +geoip-db-digest 0A1F9C09E08F6F2490E8880664D4E863D1680A12 +geoip6-db-digest A6E9B5DE6F887315749B29F9C9F698215BE5240A +dirreq-stats-end 2015-06-09 12:33:11 (86400 s) +dirreq-v3-ips ir=8,us=8 +dirreq-v3-reqs ir=8,us=8 +dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=8,timeout=4,running=0 +transport scramblesuit 80.92.79.70:7333 password=S3DVRHWD5375I3AA5NMQBG4WED5MBIYD +transport fte 80.92.79.70:7331 +transport websocket 80.92.79.70:9901 +transport obfs3 80.92.79.70:7332 +transport obfs4 80.92.79.70:7334 cert=/Q8QygIhLarhjvB+rKiFvSmXdjhO9AF6OXACR8JH+voMwKF0s5uMaG3H3uEBiZNQI79jPw,iat-mode=0 +bridge-stats-end 2015-06-09 12:33:17 (86400 s) +bridge-ips us=24 +bridge-ip-versions v4=24,v6=0 +bridge-ip-transports obfs4=24 +router-sig-ed25519 O+yrUnkHXZ16Cf0+a3gfDl2ggygbxQUal4kRi5BD2v3NW8CrWjqGJLBjked8g5eJCThUXZuraHwkapeu8gtAAg +router-signature +-----BEGIN SIGNATURE----- +HbZs8ckBwKbJ4vg0LJztGosNaDqSRD+pHiWgBAmx9ARbz7niJMY/ql+Qxh7NFifQ +xa39dJvObxE65qeaZJvcznSyEkUDcHBFcHLWZev7XQjXf2no9vUL86JvwBKHHKC1 +GnoYumyiqlKn3MOiqVYN5KXhO5i6qN/W8SjMVvywxZI= +-----END SIGNATURE----- +extra-info Unnamed 9673B58C3A72BC279C4FADEA678DEDCF63E524D2 +published 2015-06-09 22:00:10 +router-signature +-----BEGIN SIGNATURE----- +S57LSzZy2ecjd9jqA5R7nzRUOWJBNVGA8TMLiuWMHXj4DY540ZgbObNtAIU/uzR5 +C3sfCVx39iQ39DKgi93zaeZ7s37KGKiUXwJkvDsY0+A2N/TNX5DyI0ZH8WAwCMNq +EXVgdbhn8RrQiVT69evPXjdr6hmgllUofRT7LimvR60= +-----END SIGNATURE----- +''' + class ParseDescriptorsTests(unittest.TestCase): """Unittests for :class:`bridgedb.parse.descriptors` module.""" @@ -696,6 +797,26 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 0) + def test_parse_descriptors_parseExtraInfoFiles_ed25519(self): + """Test parsing an extrainfo descriptor with Ed25519 keys/certificates. + """ + descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_ED25519) + routers = descriptors.parseExtraInfoFiles(descFileOne) + self.assertEqual(len(routers), 1) + + def test_parse_descriptors_parseExtraInfoFiles_ed25519(self): + """Test parsing an extrainfo descriptor with Ed25519 keys/certificates. + """ + descFileOne = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR_ED25519) + routers = descriptors.parseServerDescriptorsFile(descFileOne) + self.assertIsInstance(routers, list) + self.assertEqual(len(routers), 1) + + bridge = routers[0] + self.assertIsInstance(bridge, RelayDescriptor) + self.assertEqual(bridge.address, u'80.92.79.70') + self.assertEqual(bridge.fingerprint, u'312D64274C29156005843EECB19C6865FA3CC10C') + def test_parse_descriptors_copyUnparseableDescriptorFile_return_value(self): """``b.p.descriptors._copyUnparseableDescriptorFile()`` should return True when the new file is successfully created.

1 0

[bridgedb/master] Revert "Also forbid bogus characters in PT fingerprint and address"
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 2254b859abf24f437376b94c6c4907f91a04d957 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:41:31 2015 +0000 Revert "Also forbid bogus characters in PT fingerprint and address" This reverts commit 44e31908090a0e70dfdd82020a5b89c80e04a6d2. In the @property setters for b.bridges.BridgeAddressBase.fingerprint and b.bridges.BridgeAddressBase.address, the functions b.p.fingerprints.isValidFingerprint() and b.p.addr.isValidIP() respectively determine whether the attribute will be set. My tests show that all of {non-ASCII characters, control characters, double quotes, backslashes} will not make it through either of those validation functions. --- lib/bridgedb/bridges.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 01bbdd0..4e9ecd1 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -351,10 +351,6 @@ class PluggableTransport(BridgeAddressBase): characters or double quotes or backslashes, in keys or in values. - 3. The :data:`fingerprint` and :data:`address` do not - contain non-ASCII or control characters or double quotes - or backslashes. - :raises MalformedPluggableTransport: if any of the above checks fails. """ if not self.fingerprint: @@ -390,28 +386,6 @@ class PluggableTransport(BridgeAddressBase): % (k, v)) pass - if not isascii_noncontrol(self.fingerprint): - raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with non-ASCII or " - "control characters in fingerprint: %r") - % self.fingerprint) - if '"' in self.fingerprint or '\\' in self.fingerprint: - raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with double quotes or " - "backslashes in fingerprint: %r") - % self.fingerprint) - - if not isascii_noncontrol(self.address): - raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with non-ASCII or " - "control characters in address: %r") - % self.address) - if '"' in self.address or '\\' in self.address: - raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with double quotes or " - "backslashes in address: %r") - % self.address) - if not self._checkArguments(): raise MalformedPluggableTransport( ("Can't use %s transport with missing arguments. Arguments: "

1 0

[bridgedb/master] Minor cleanup for PluggableTransport._runChecks() changes from ad7b5f9a.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit c4013bc8a5ba0c48d8f752bdffd67d96a01c84d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 4 02:32:57 2015 +0000 Minor cleanup for PluggableTransport._runChecks() changes from ad7b5f9a. --- lib/bridgedb/bridges.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 4e9ecd1..91b62fa 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -372,19 +372,16 @@ class PluggableTransport(BridgeAddressBase): ("Cannot create PluggableTransport with arguments type: %s") % type(self.arguments)) - for k, v in self.arguments.items(): - kv = ''.join((k, v)) + for item in self.arguments.items(): + kv = ''.join(item) if not isascii_noncontrol(kv): raise MalformedPluggableTransport( ("Cannot create PluggableTransport with non-ASCII or " - "control characters in arguments: %r=%r") - % (k, v)) + "control characters in arguments: %r=%r") % item) if '"' in kv or '\\' in kv: raise MalformedPluggableTransport( ("Cannot create PluggableTransport with double quotes or " - "backslashes in arguments: %r=%r") - % (k, v)) - pass + "backslashes in arguments: %r=%r") % item) if not self._checkArguments(): raise MalformedPluggableTransport(

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.2-format-plain-bytes' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 522961f1dd2e58320237df7ea4e3e100bf7d2eb4 Merge: 5e1afa3 28ea3c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 8 23:40:30 2015 +0000 Merge branch 'hotfix/0.3.2-format-plain-bytes' into develop lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[bridgedb/master] Fix wrong ticket number for 0.3.2 CHANGELOG entry.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 5e1afa3d4399f6a525e0f476fa4d3b3afca762fb Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 1 08:23:38 2015 +0000 Fix wrong ticket number for 0.3.2 CHANGELOG entry. --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 240794e..6b428c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,7 +33,7 @@ Changes in version 0.3.2 - 2015-05-01 work. This fixes the issue by excluding broken transports from being distributed to clients. - * FIXES #15522 https://bugs.torproject.org/15522 + * FIXES #15517 https://bugs.torproject.org/15517 For all clients who are coming from IPv6 addresses and are not using Tor, who go to https://bridges.torproject.org, BridgeDB now groups these clients together by /32. This "grouping" causes all

1 0

[bridgedb/master] Fix an error in HTTPServer.py with requests for bridges?format=plain.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 28ea3c489c945f954e99bd996bb24bd879fb817e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 8 23:27:05 2015 +0000 Fix an error in HTTPServer.py with requests for bridges?format=plain. --- lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2e0398c..42e1c54 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -770,7 +770,10 @@ class WebResourceBridges(resource.Resource): if format == 'plain': request.setHeader("Content-Type", "text/plain") - rendered = bridgeLines + try: + rendered = bytes(bridgeLines) + except Exception as err: + rendered = replaceErrorPage(err) else: request.setHeader("Content-Type", "text/html; charset=utf-8") qrcode = None

1 0

[bridgedb/master] Also forbid bogus characters in PT fingerprint and address
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 44e31908090a0e70dfdd82020a5b89c80e04a6d2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 10:37:47 2015 -0700 Also forbid bogus characters in PT fingerprint and address --- lib/bridgedb/bridges.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index b799ca3..61cf503 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -356,6 +356,10 @@ class PluggableTransport(BridgeAddressBase): characters or double quotes or backslashes, in keys or in values. + 3. The :data:`fingerprint` and :data:`address` do not + contain non-ASCII or control characters or double quotes + or backslashes. + :raises MalformedPluggableTransport: if any of the above checks fails. """ if not self.fingerprint: @@ -391,6 +395,28 @@ class PluggableTransport(BridgeAddressBase): % (k, v)) pass + if not isascii_noncontrol(self.fingerprint): + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with non-ASCII or " + "control characters in fingerprint: %r") + % self.fingerprint) + if '"' in self.fingerprint or '\\' in self.fingerprint: + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with double quotes or " + "backslashes in fingerprint: %r") + % self.fingerprint) + + if not isascii_noncontrol(self.address): + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with non-ASCII or " + "control characters in address: %r") + % self.address) + if '"' in self.address or '\\' in self.address: + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with double quotes or " + "backslashes in address: %r") + % self.address) + if not self._checkArguments(): raise MalformedPluggableTransport( ("Can't use %s transport with missing arguments. Arguments: "

1 0

[bridgedb/master] Handle ConnectionRefusedError and DNSLookupError in get-tor-exits script.
by isis＠torproject.org 25 Jul '15

25 Jul '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