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

[tor-messenger-build/master] Enable shipping the SPI root cert
by sukhbir＠torproject.org 05 Dec '14

05 Dec '14

commit bbf2029bd53faaf0396ce96cea2efa361cb5e9cf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Dec 5 10:20:33 2014 +0530 Enable shipping the SPI root cert --- projects/instantbird/build | 3 +- projects/instantbird/ccc-jabber-cacert.der | 170 ---------------------------- projects/instantbird/config | 1 + 3 files changed, 2 insertions(+), 172 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index a925891..0a6dbe3 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -37,8 +37,7 @@ for patch in $(ls -1 ../*.patch | sort) do patch -p1 < $patch done -# cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt -# cat ../ccc-jabber-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt +cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/ccc-jabber-cacert.der b/projects/instantbird/ccc-jabber-cacert.der deleted file mode 100644 index abe8a43..0000000 --- a/projects/instantbird/ccc-jabber-cacert.der +++ /dev/null @@ -1,170 +0,0 @@ - -# -# Certificate "CCC Jabber Service" -# -# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA -# Serial Number: 914674 (0xdf4f2) -# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE -# Not Valid Before: Thu Oct 17 20:50:19 2013 -# Not Valid After : Sat Oct 17 20:50:19 2015 -# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 -# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CCC Jabber Service" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\154\061\013\060\011\006\003\125\004\006\023\002\104\105\061 -\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165\162 -\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142 -\165\162\147\061\041\060\037\006\003\125\004\012\023\030\103\150 -\141\157\163\040\103\157\155\160\165\164\145\162\040\103\154\165 -\142\040\145\056\126\056\061\026\060\024\006\003\125\004\003\023 -\015\152\141\142\142\145\162\056\143\143\143\056\144\145 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -\100\143\141\143\145\162\164\056\157\162\147 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\015\364\362 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\231\060\202\003\201\240\003\002\001\002\002\003\015 -\364\362\060\015\006\011\052\206\110\206\367\015\001\001\005\005 -\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157 -\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025 -\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031 -\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040 -\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052 -\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162 -\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015 -\061\063\061\060\061\067\062\060\065\060\061\071\132\027\015\061 -\065\061\060\061\067\062\060\065\060\061\071\132\060\154\061\013 -\060\011\006\003\125\004\006\023\002\104\105\061\020\060\016\006 -\003\125\004\010\023\007\110\141\155\142\165\162\147\061\020\060 -\016\006\003\125\004\007\023\007\110\141\155\142\165\162\147\061 -\041\060\037\006\003\125\004\012\023\030\103\150\141\157\163\040 -\103\157\155\160\165\164\145\162\040\103\154\165\142\040\145\056 -\126\056\061\026\060\024\006\003\125\004\003\023\015\152\141\142 -\142\145\162\056\143\143\143\056\144\145\060\202\001\042\060\015 -\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 -\017\000\060\202\001\012\002\202\001\001\000\310\261\317\205\204 -\034\231\376\301\360\110\352\155\135\376\122\023\172\361\001\200 -\265\357\075\056\112\164\114\356\131\337\306\274\373\060\275\167 -\201\126\272\032\324\117\037\344\050\310\253\334\114\113\127\071 -\022\362\020\366\163\322\312\174\362\263\326\037\056\002\050\165 -\143\366\111\332\032\130\065\323\252\076\310\143\024\140\026\306 -\307\032\024\351\264\157\102\062\333\010\270\074\154\220\334\116 -\100\047\352\117\102\050\151\277\365\103\176\131\132\141\112\373 -\267\321\037\356\030\327\000\004\216\141\245\247\144\234\146\004 -\227\345\076\145\253\343\066\110\375\066\243\350\152\240\021\235 -\330\026\217\317\212\324\317\375\353\020\101\104\362\045\363\341 -\174\011\361\176\115\047\246\237\266\253\337\215\165\120\015\364 -\202\046\145\112\251\365\072\276\110\144\360\013\214\357\272\205 -\116\056\237\350\213\022\100\246\011\317\174\052\235\142\063\353 -\131\272\201\317\172\373\016\067\050\245\105\056\053\302\213\246 -\100\335\372\252\144\343\246\271\250\125\223\215\332\133\300\361 -\142\106\331\027\257\372\117\303\371\151\151\002\003\001\000\001 -\243\202\001\065\060\202\001\061\060\014\006\003\125\035\023\001 -\001\377\004\002\060\000\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\003\250\060\064\006\003\125\035\045\004\055\060 -\053\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001 -\005\005\007\003\001\006\011\140\206\110\001\206\370\102\004\001 -\006\012\053\006\001\004\001\202\067\012\003\003\060\063\006\010 -\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006\010 -\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072\057 -\057\157\143\163\160\056\143\141\143\145\162\164\056\157\162\147 -\057\060\061\006\003\125\035\037\004\052\060\050\060\046\240\044 -\240\042\206\040\150\164\164\160\072\057\057\143\162\154\056\143 -\141\143\145\162\164\056\157\162\147\057\162\145\166\157\153\145 -\056\143\162\154\060\163\006\003\125\035\021\004\154\060\152\202 -\015\152\141\142\142\145\162\056\143\143\143\056\144\145\202\030 -\143\157\156\146\145\162\145\156\143\145\056\152\141\142\142\145 -\162\056\143\143\143\056\144\145\202\025\152\141\142\142\145\162 -\144\056\152\141\142\142\145\162\056\143\143\143\056\144\145\202 -\024\160\165\142\163\165\142\056\152\141\142\142\145\162\056\143 -\143\143\056\144\145\202\022\166\152\165\144\056\152\141\142\142 -\145\162\056\143\143\143\056\144\145\060\015\006\011\052\206\110 -\206\367\015\001\001\005\005\000\003\202\002\001\000\077\170\011 -\215\332\027\172\024\250\037\276\341\366\153\301\350\223\321\075 -\260\067\207\060\053\274\153\021\140\104\162\336\315\163\161\073 -\204\346\055\171\316\152\154\346\166\205\016\345\355\027\002\223 -\010\067\115\163\165\276\157\076\060\220\370\204\051\205\020\226 -\043\137\366\120\324\256\114\205\110\175\254\034\174\321\173\243 -\314\001\242\270\206\276\300\147\242\242\032\266\224\072\221\115 -\351\317\140\335\117\226\257\230\127\334\317\240\143\125\065\230 -\227\315\225\163\023\002\225\161\247\043\244\311\200\137\150\264 -\221\361\053\322\016\000\316\071\327\302\064\146\314\046\243\106 -\074\056\134\313\032\307\067\054\373\260\115\224\260\215\143\045 -\017\125\042\027\126\024\245\176\125\146\147\146\060\171\107\026 -\304\110\360\117\375\162\361\307\300\016\323\311\271\242\352\147 -\041\143\212\133\026\255\112\163\003\304\067\040\301\153\243\070 -\107\116\212\375\063\241\242\060\053\033\012\220\353\252\361\147 -\151\157\260\074\004\113\332\144\006\250\052\143\341\014\355\225 -\303\114\026\372\323\002\373\222\206\102\111\244\324\334\046\352 -\072\004\253\337\077\220\322\274\016\172\055\112\226\055\243\070 -\161\107\027\101\017\154\050\276\166\254\317\372\161\155\137\053 -\154\346\301\322\171\140\367\051\343\165\211\141\022\033\124\106 -\012\006\070\337\363\121\356\113\345\271\002\233\156\132\150\101 -\147\135\263\151\107\240\246\047\356\245\154\214\062\003\140\110 -\076\111\367\102\124\164\373\057\263\057\274\141\155\263\205\205 -\246\226\121\233\167\265\222\056\175\063\133\361\362\132\120\055 -\320\357\311\047\241\110\221\023\366\270\074\020\313\074\161\204 -\307\021\273\127\110\201\256\127\015\305\146\104\176\066\051\021 -\222\100\147\360\355\306\343\135\136\052\007\250\243\151\061\167 -\300\105\041\165\107\270\377\312\103\174\017\145\224\237\253\163 -\334\163\103\151\155\006\025\003\004\212\124\037\047\264\124\360 -\025\226\006\370\372\322\154\122\020\327\166\133\004\305\023\063 -\346\077\036\175\155\330\117\225\177\276\151\130\247\271\023\215 -\031\012\373\105\330\215\313\134\136\165\210\116\307\261\254\352 -\356\031\121\144\122\171\156\326\030\374\015\307\225 -END - -# Trust for "CCC Jabber Service" -# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA -# Serial Number: 914674 (0xdf4f2) -# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE -# Not Valid Before: Thu Oct 17 20:50:19 2013 -# Not Valid After : Sat Oct 17 20:50:19 2015 -# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 -# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CCC Jabber Service" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\116\011\371\331\362\044\027\106\204\166\215\106\172\204\261\071 -\270\152\002\037 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\014\101\362\053\214\147\235\160\222\215\317\335\363\117\200\301 -END -CKA_ISSUER MULTILINE_OCTAL -\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -\100\143\141\143\145\162\164\056\157\162\147 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\015\364\362 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/projects/instantbird/config b/projects/instantbird/config index 30af0f4..d69d5cc 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -56,6 +56,7 @@ input_files: - name: mozilla-src project: mozilla pkg_type: src + - filename: spi-cacert.der - filename: preferences.patch - filename: prepare-messages-for-displaying.patch - filename: test-transformation-api.patch

1 0

[stem/master] Change broke tests under mock 0.8.0
by atagar＠torproject.org 05 Dec '14

05 Dec '14

commit 72ef5421eb1611ad9dec9e210dd20b4d2e977b03 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 4 18:34:17 2014 -0800 Change broke tests under mock 0.8.0 Our last commit used behavior of mock's side_effect that was introduced in 1.0.0... 'Any exceptions in an iterable side_effect will be raised instead of returned' http://www.voidspace.org.uk/python/mock/changelog.html#version-1-0-0 This is all well and good, but our Jenkins tests are still using 0.8.0. We really don't need to rely on that behavoir here so just avoiding it. --- test/unit/control/controller.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 1974e50..58df2d4 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -428,17 +428,6 @@ class TestControl(unittest.TestCase): except ControllerError as exc: self.assertEqual('Unable to determine our own fingerprint: nope, too bad', str(exc)) - get_info_mock.side_effect = [ - '5AC9C5AA75BA1F18D8459B326B4B8111A856D290', - InvalidArguments(None, 'GETINFO request contained unrecognized keywords: ns/id/5AC9C5AA75BA1F18D8459B326B4B8111A856D290'), - ] - - try: - self.controller.get_network_status() - self.fail("We should've raised an exception") - except DescriptorUnavailable as exc: - self.assertEqual("Tor was unable to provide the descriptor for '5AC9C5AA75BA1F18D8459B326B4B8111A856D290'", str(exc)) - self.assertEqual('boom', self.controller.get_network_status(default = 'boom')) # successful request @@ -453,6 +442,20 @@ class TestControl(unittest.TestCase): self.assertEqual(stem.descriptor.router_status_entry.RouterStatusEntryV3(desc), self.controller.get_network_status()) @patch('stem.control.Controller.get_info') + def test_get_network_status_when_raising_descriptor_unavailable(self, get_info_mock): + """ + Exercises the get_network_status() method. + """ + + get_info_mock.side_effect = InvalidArguments(None, 'GETINFO request contained unrecognized keywords: ns/id/5AC9C5AA75BA1F18D8459B326B4B8111A856D290') + + try: + self.controller.get_network_status('5AC9C5AA75BA1F18D8459B326B4B8111A856D290') + self.fail("We should've raised an exception") + except DescriptorUnavailable as exc: + self.assertEqual("Tor was unable to provide the descriptor for '5AC9C5AA75BA1F18D8459B326B4B8111A856D290'", str(exc)) + + @patch('stem.control.Controller.get_info') def test_get_network_status(self, get_info_mock): """ Exercises the get_network_status() method.

1 0

[stem/master] Unit test for DescriptorUnavailable
by atagar＠torproject.org 05 Dec '14

05 Dec '14

commit f7438a1b577a8bf3ec027edcd5a7c1456ce66067 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 4 18:00:41 2014 -0800 Unit test for DescriptorUnavailable Quick test to exercise the new exception. --- stem/__init__.py | 3 +++ test/unit/control/controller.py | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stem/__init__.py b/stem/__init__.py index ffdfe72..c034f4f 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -546,6 +546,9 @@ class DescriptorUnavailable(OperationFailed): Tor was unable to provide a descriptor for the given relay. """ + def __init__(self, message): + super(DescriptorUnavailable, self).__init__(message = message) + class InvalidRequest(OperationFailed): """ diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 5e0058f..1974e50 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -13,7 +13,7 @@ import stem.socket import stem.util.system import stem.version -from stem import ControllerError, InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest +from stem import ControllerError, DescriptorUnavailable, InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest from stem.control import _parse_circ_path, Listener, Controller, EventType from stem.exit_policy import ExitPolicy from test import mocking @@ -428,6 +428,17 @@ class TestControl(unittest.TestCase): except ControllerError as exc: self.assertEqual('Unable to determine our own fingerprint: nope, too bad', str(exc)) + get_info_mock.side_effect = [ + '5AC9C5AA75BA1F18D8459B326B4B8111A856D290', + InvalidArguments(None, 'GETINFO request contained unrecognized keywords: ns/id/5AC9C5AA75BA1F18D8459B326B4B8111A856D290'), + ] + + try: + self.controller.get_network_status() + self.fail("We should've raised an exception") + except DescriptorUnavailable as exc: + self.assertEqual("Tor was unable to provide the descriptor for '5AC9C5AA75BA1F18D8459B326B4B8111A856D290'", str(exc)) + self.assertEqual('boom', self.controller.get_network_status(default = 'boom')) # successful request

1 0

[stem/master] Throwing DescriptorUnavailable when tor can't provide one for a relay
by atagar＠torproject.org 05 Dec '14

05 Dec '14

commit 6a3882a372149ff18b5be7f82fa4b9e5cac113b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 4 17:30:59 2014 -0800 Throwing DescriptorUnavailable when tor can't provide one for a relay Tor gives a pretty sucky 'GETINFO request contained unrecognized keywords: ns/id/5AC9C5AA75BA1F18D8459B326B4B8111A856D290' error when the descriptor is unavailable for a given relay. Having us give something better... https://trac.torproject.org/projects/tor/ticket/13879 --- docs/change_log.rst | 1 + stem/__init__.py | 8 ++++++++ stem/control.py | 40 ++++++++++++++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 4034884..e9fcac7 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -52,6 +52,7 @@ The following are only available within Stem's `git repository * :func:`~stem.process.launch_tor_with_config` could cause a "Too many open files" OSError if called too many times (:trac:`13141`) * The :func:`~stem.control.Controller.get_exit_policy` method errored if tor couldn't determine our external address * The Controller's methods for retrieving descriptors could raise unexpected ValueErrors if tor didn't have any descriptors available + * Throwing a new :class:`~stem.DescriptorUnavailable` exception type when the :class:`~stem.control.Controller` can't provide the descriptor for a relay (:trac:`13879`) * **Descriptors** diff --git a/stem/__init__.py b/stem/__init__.py index 310f4ab..ffdfe72 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -13,6 +13,7 @@ Library for working with the tor process. |- OperationFailed - Tor was unable to successfully complete the operation. | |- UnsatisfiableRequest - Tor was unable to satisfy a valid request. | | +- CircuitExtensionFailed - Attempt to make or extend a circuit failed. + | |- DescriptorUnavailable - The given relay descriptor is unavailable. | +- InvalidRequest - Invalid request. | +- InvalidArguments - Invalid request parameters. +- SocketError - Communication with the socket failed. @@ -459,6 +460,7 @@ __all__ = [ 'OperationFailed', 'UnsatisfiableRequest', 'CircuitExtensionFailed', + 'DescriptorUnavailable', 'InvalidRequest', 'InvalidArguments', 'SocketError', @@ -539,6 +541,12 @@ class CircuitExtensionFailed(UnsatisfiableRequest): self.circ = circ +class DescriptorUnavailable(OperationFailed): + """ + Tor was unable to provide a descriptor for the given relay. + """ + + class InvalidRequest(OperationFailed): """ Exception raised when the request was invalid or malformed. diff --git a/stem/control.py b/stem/control.py index f947aca..cace3ad 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1456,6 +1456,8 @@ class Controller(BaseController): :returns: :class:`~stem.descriptor.microdescriptor.Microdescriptor` for the given relay :raises: + * :class:`stem.DescriptorUnavailable` if unable to provide a descriptor + for the given relay * :class:`stem.ControllerError` if unable to query the descriptor * **ValueError** if **relay** doesn't conform with the pattern for being a fingerprint or nickname @@ -1476,10 +1478,16 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query, get_bytes = True) + try: + desc_content = self.get_info(query, get_bytes = True) + except stem.InvalidArguments as exc: + if str(exc).startswith('GETINFO request contained unrecognized keywords:'): + raise stem.DescriptorUnavailable("Tor was unable to provide the descriptor for '%s'" % relay) + else: + raise exc if not desc_content: - raise stem.ControllerError("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") return stem.descriptor.microdescriptor.Microdescriptor(desc_content) @@ -1555,6 +1563,8 @@ class Controller(BaseController): :returns: :class:`~stem.descriptor.server_descriptor.RelayDescriptor` for the given relay :raises: + * :class:`stem.DescriptorUnavailable` if unable to provide a descriptor + for the given relay * :class:`stem.ControllerError` if unable to query the descriptor * **ValueError** if **relay** doesn't conform with the pattern for being a fingerprint or nickname @@ -1576,10 +1586,16 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query, get_bytes = True) + try: + desc_content = self.get_info(query, get_bytes = True) + except stem.InvalidArguments as exc: + if str(exc).startswith('GETINFO request contained unrecognized keywords:'): + raise stem.DescriptorUnavailable("Tor was unable to provide the descriptor for '%s'" % relay) + else: + raise exc if not desc_content: - raise stem.ControllerError("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") return stem.descriptor.server_descriptor.RelayDescriptor(desc_content) except Exception as exc: @@ -1622,7 +1638,7 @@ class Controller(BaseController): if not self._is_server_descriptors_available(): raise stem.ControllerError(SERVER_DESCRIPTORS_UNSUPPORTED) else: - raise stem.ControllerError("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") for desc in stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_content)): yield desc @@ -1670,6 +1686,8 @@ class Controller(BaseController): for the given relay :raises: + * :class:`stem.DescriptorUnavailable` if unable to provide a descriptor + for the given relay * :class:`stem.ControllerError` if unable to query the descriptor * **ValueError** if **relay** doesn't conform with the pattern for being a fingerprint or nickname @@ -1695,10 +1713,16 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query, get_bytes = True) + try: + desc_content = self.get_info(query, get_bytes = True) + except stem.InvalidArguments as exc: + if str(exc).startswith('GETINFO request contained unrecognized keywords:'): + raise stem.DescriptorUnavailable("Tor was unable to provide the descriptor for '%s'" % relay) + else: + raise exc if not desc_content: - raise stem.ControllerError("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") if self.get_conf('UseMicrodescriptors', '0') == '1': return stem.descriptor.router_status_entry.RouterStatusEntryMicroV3(desc_content) @@ -1747,7 +1771,7 @@ class Controller(BaseController): desc_content = self.get_info('ns/all', get_bytes = True) if not desc_content: - raise stem.ControllerError("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") desc_iterator = stem.descriptor.router_status_entry._parse_file( io.BytesIO(desc_content),

1 0

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

04 Dec '14

commit 2bab70fc58b1e1f5ddf644e3c67966e3e9ae6045 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:47 2014 +0000 Update translations for tails-misc --- fy.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy.po b/fy.po index fe728a6..3ff375f 100644 --- a/fy.po +++ b/fy.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-04 20:41+0000\n" +"PO-Revision-Date: 2014-12-04 20:51+0000\n" "Last-Translator: Robin van der Vliet <info(a)robinvandervliet.nl>\n" "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n" "MIME-Version: 1.0\n"

1 0

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

04 Dec '14

commit 020b20af7321092f76406553c3655544bcfad6bf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:43 2014 +0000 Update translations for tor-launcher-network-settings --- fy/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy/network-settings.dtd b/fy/network-settings.dtd index 34f4791..e189a46 100644 --- a/fy/network-settings.dtd +++ b/fy/network-settings.dtd @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Wachtwurd:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 04 Dec '14

04 Dec '14

commit 9f07df3371f80dbb463c3980c9514ee30de0aa79 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:29 2014 +0000 Update translations for tails-greeter --- fy/fy.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy/fy.po b/fy/fy.po index aa4f41c..6d91724 100644 --- a/fy/fy.po +++ b/fy/fy.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2014-12-04 20:41+0000\n" +"PO-Revision-Date: 2014-12-04 21:01+0000\n" "Last-Translator: Robin van der Vliet <info(a)robinvandervliet.nl>\n" "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 04 Dec '14

04 Dec '14

commit b4a19aad3eedcf1f44063680b734d68ea17d51da Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:24 2014 +0000 Update translations for tails-persistence-setup --- fy/fy.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy/fy.po b/fy/fy.po index eaea3f2..814b91c 100644 --- a/fy/fy.po +++ b/fy/fy.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-12-02 09:42+0100\n" -"PO-Revision-Date: 2014-12-04 20:41+0000\n" +"PO-Revision-Date: 2014-12-04 20:51+0000\n" "Last-Translator: Robin van der Vliet <info(a)robinvandervliet.nl>\n" "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 04 Dec '14

04 Dec '14

commit d30f42984c934331080aa40ca0d336dbddea18ee Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:08 2014 +0000 Update translations for gettor --- fy/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy/gettor.po b/fy/gettor.po index e08f739..20dfb02 100644 --- a/fy/gettor.po +++ b/fy/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-12-04 20:41+0000\n" +"PO-Revision-Date: 2014-12-04 20:51+0000\n" "Last-Translator: Robin van der Vliet <info(a)robinvandervliet.nl>\n" "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 04 Dec '14

04 Dec '14

commit ea77c48a60972cc417d43a91f70d853587e7e02c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 4 21:15:03 2014 +0000 Update translations for bridgedb --- fy/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fy/LC_MESSAGES/bridgedb.po b/fy/LC_MESSAGES/bridgedb.po index 60aaf56..90e132f 100644 --- a/fy/LC_MESSAGES/bridgedb.po +++ b/fy/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-12-04 20:41+0000\n" +"PO-Revision-Date: 2014-12-04 20:51+0000\n" "Last-Translator: Robin van der Vliet <info(a)robinvandervliet.nl>\n" "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n" "MIME-Version: 1.0\n"

1 0