January 2013 - tor-commits - lists.torproject.org

r25986: {website} tell people to use the new ServerTransportListenAddr option (website/trunk/projects/en)
by Roger Dingledine 06 Jan '13

06 Jan '13

Author: arma Date: 2013-01-06 16:41:30 +0000 (Sun, 06 Jan 2013) New Revision: 25986 Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml Log: tell people to use the new ServerTransportListenAddr option Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-debian-instructions.wml 2013-01-03 11:09:15 UTC (rev 25985) +++ website/trunk/projects/en/obfsproxy-debian-instructions.wml 2013-01-06 16:41:30 UTC (rev 25986) @@ -123,9 +123,9 @@ The last number, in this case <i>26821</i>, is the TCP port number that you need to forward through your firewall. (This port is randomly chosen the first time Tor starts, but Tor will cache and reuse the - same number in future runs.) If you want to change the number, - stop Tor, edit /var/lib/tor/state to change the number in the - "TransportProxy obfs2" line, and then restart Tor. + same number in future runs.) If you want to change the number, use + Tor 0.2.4.7-alpha or later, and set "ServerTransportListenAddr obfs2 + 0.0.0.0:26821" in your torrc. </p> </div>

1 0

[flashproxy/master] Fix bundle typo found by Alexandre.
by dcf＠torproject.org 06 Jan '13

06 Jan '13

commit 5148740d378547a506a3d4fc41c71a73dc867f2b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jan 5 21:54:12 2013 -0800 Fix bundle typo found by Alexandre. --- doc/bundle-gnulinux.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 79f5584..c84047b 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -87,7 +87,7 @@ https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-… Extract the bundle. $ gpg --verify tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz.asc - $ tar xzvf tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz.asc + $ tar xzvf tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz $ cd tor-browser_en-US Copy files into the bundle.

1 0

[flashproxy/master] Add instructions for bundling pyobfsproxy.
by dcf＠torproject.org 06 Jan '13

06 Jan '13

commit ae05ce3aae56c28350138f8f27286a55305c35f9 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jan 5 22:01:35 2013 -0800 Add instructions for bundling pyobfsproxy. These are from Alexandre. --- doc/bundle-gnulinux.txt | 26 +++++++++++++++++++++++++- doc/bundle-macosx.txt | 37 ++++++++++++++++++++++++++++++++----- doc/bundle-windows.txt | 43 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index c84047b..848aecb 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -65,6 +65,14 @@ Packages to install: sudo apt-get update sudo apt-get upgrade sudo apt-get install git make python-m2crypto zip + sudo apt-get install python-setuptools python-crypto python-twisted python-argparse + +== Dependencies + +=== pyptlib + + $ git clone https://git.torproject.org/user/asn/pyptlib.git + $ cd pyptlib && python setup.py install == Browser bundle @@ -74,6 +82,10 @@ Clone and build the flashproxy source. $ cd flashproxy $ make dist +Clone pyobfsproxy. + + $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git + Within the VM, download the 32-bit or 64-bit obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. The instructions below are for the 32-bit (i686) version. @@ -97,20 +109,32 @@ Copy files into the bundle. $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy + $ rm App/obfsproxy + $ cp -r ~/pyobfsproxy/{obfsproxy,obfsproxy.py} App + $ cp -r /usr/lib/python2.6/dist-packages/{Crypto,twisted} App + $ cp /usr/lib/pymodules/python2.6/argparse.pyc App + Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "./App/flashproxy-client". +changing "./flashproxy-client" to "./App/flashproxy-client". You are also +changing the obfsproxy ClientTransportPlugin line to match what pyobfsproxy +expects. UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 + +# Keep the obfs2 bridges. +... + LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2 exec ./App/obfsproxy.py managed Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 8d33701..7bea830 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -1,8 +1,8 @@ This document describes how to build a Tor Browser bundle for Mac OS X -that is preconfigured to use the flash proxy transport. Because Mac have -Python preinstalled, we include the Python source of the programs. An -exception to this is the M2Crypto library, which has some compiled -components. +that is preconfigured to use the pyobfsproxy and flashproxy transports. +Because Macs have Python preinstalled, we include the Python source of +the programs. Exceptions to this are the M2Crypto and PyCrypto libraries, +which have some compiled components. == Dependencies @@ -41,6 +41,20 @@ http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc $ mkdir -p ~/usr/lib/python2.7/site-packages/ $ python setup.py install --root=~/bundle --prefix=/usr +=== PyCrypto + +http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz +http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc + +Extract and verify the tarball. Then run + + $ python setup.py install --root=~/bundle --prefix=/usr + +=== pyptlib + + $ git clone https://git.torproject.org/user/asn/pyptlib.git + $ cd pyptlib && python setup.py install --root=~/bundle --prefix=/usr + == Browser bundle Run "make dist" in the flashproxy source directory. @@ -64,20 +78,33 @@ Copy files into the bundle. $ mkdir -p Contents/Resources/Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Contents/Resources/Docs/FlashProxy + $ rm Contents/MacOs/obfsproxy + $ cp -r ~/pyobfsproxy/{obfsproxy,obfsproxy.py} Contents/MacOs + $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS + $ mkdir -p Contents/Resources/Docs/PyObfsproxy + $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy + Make the second half of Library/Vidalia/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "flashproxy-client". +changing "./flashproxy-client" to "flashproxy-client". You are also +changing "--managed" to "managed" and "obfsproxy" to "obfsproxy.py" in +the obfsproxy ClientTransportPlugin line. UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 + +# Keep the obfs2 bridges. +... + LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2 exec obfsproxy.py managed Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha. diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 360ec1b..9e908b6 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -13,6 +13,38 @@ The sha256sum of the package I used was fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi +=== PyCrypto + +http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz +http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc + +To install run: + + $ python setup.py install + +=== zope.interface + +Required by Twisted. Visit https://pypi.python.org/pypi/zope.interface/4.0.3#downloads +and download the appropriate egg for your version of Windows. Extract the egg and +copy the EGG-INFO and zope directories to /cygdrive/c/Python27/Lib/site-packages. + +=== Twisted + +Download and run the appropriate installer from https://twistedmatrix.com/trac/wiki/Downloads. + +=== pyptlib + +Run: + + $ git clone https://git.torproject.org/user/asn/pyptlib.git + $ cd pyptlib && python setup.py install + +== Bundle pyobfsproxy + +Use PyInstaller to bundle pyobfsproxy. + + $ ../pyinstaller-2.0/pyinstaller.py obfsproxy.py + == Browser bundle Run "make dist-exe" in the flashproxy source directory. @@ -36,21 +68,30 @@ from being overwritten. $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy + $ cp -r ~/pyobfsproxy/dist/obfsproxy/{*.pyd,*.dll,*.exe,*.manifest,eggs} App + $ mkdir -p Docs/PyObfsproxy + $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "flashproxy-client". +changing "./flashproxy-client" to "flashproxy-client". You are also +changing "--managed" to "managed" in the obfsproxy ClientTransportPlugin line. UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 + +# Keep the list of obfs2 bridges +... + LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2 exec obfsproxy managed Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha. The 7zg program (as opposed to 7z) causes the

1 0

[flashproxy/master] Fix indentation.
by dcf＠torproject.org 06 Jan '13

06 Jan '13

commit 492e42003ab8579699e4524148182329b7e129bc Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jan 5 22:01:24 2013 -0800 Fix indentation. --- doc/bundle-macosx.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index f9cfd33..8d33701 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -37,9 +37,9 @@ http://chandlerproject.org/Projects/MeTooCrypto#Downloads http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc -$ python setup.py build_ext --swig ~/bundle/usr/bin/swig -$ mkdir -p ~/usr/lib/python2.7/site-packages/ -$ python setup.py install --root ~/bundle --prefix=/usr + $ python setup.py build_ext --swig ~/bundle/usr/bin/swig + $ mkdir -p ~/usr/lib/python2.7/site-packages/ + $ python setup.py install --root=~/bundle --prefix=/usr == Browser bundle

1 0

[stem/master] Fixing test_reattaching_listeners when there's authentication
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 19d9a1ccde704ea05bd8e4b4231820a0b28df974 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 5 20:35:31 2013 -0800 Fixing test_reattaching_listeners when there's authentication The test_reattaching_listeners wasn't making any effort to authenticate connections, causing the test to break for every integ target except RUN_NONE and RUN_OPEN (the later being the default which is why this went undiscovered so long). Oops. --- test/integ/control/controller.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b212300..22d06be 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -146,7 +146,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again controller.connect() - controller.authenticate() + controller.authenticate(password = test.runner.CONTROL_PASSWORD) event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1) @@ -160,7 +160,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again controller.connect() - stem.connection.authenticate(controller) + controller.authenticate(password = test.runner.CONTROL_PASSWORD) event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1) @@ -174,7 +174,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again controller.connect() - controller.msg("AUTHENTICATE") + controller.authenticate(password = test.runner.CONTROL_PASSWORD) event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1)

1 0

[stem/master] Missing a requirement from test_get_latest_heartbeat
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 69a2d6d8aba1e538bdaf7f0ca8d2c66c57bb99de Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 5 19:48:07 2013 -0800 Missing a requirement from test_get_latest_heartbeat All controller tests (including test_get_latest_heartbeat) require an open control socket. Missing this requirement broke the RUN_NONE target. --- test/integ/control/base_controller.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 8709469..319f7a8 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -188,6 +188,8 @@ class TestBaseController(unittest.TestCase): Basic check for get_latest_heartbeat(). """ + if test.runner.require_control(self): return + # makes a getinfo query, then checks that the heartbeat is close to now with test.runner.get_runner().get_tor_socket() as control_socket: controller = stem.control.BaseController(control_socket)

1 0

[stem/master] Parsing server descriptor's ntor-onion-key line
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit c78d9cda3ab5fc307264bce774187b6f4188f96d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 5 18:01:49 2013 -0800 Parsing server descriptor's ntor-onion-key line Parsing for the newly introduced 'ntor-onion-key' line. I'm not entirely clear of the format that our users will want so checking with Nick and just parsing the raw string. --- stem/descriptor/server_descriptor.py | 6 ++++++ test/unit/descriptor/server_descriptor.py | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 17664bc..8f73cdd 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -68,6 +68,7 @@ SINGLE_FIELDS = ( "hidden-service-dir", "protocols", "allow-single-hop-exits", + "ntor-onion-key", ) def parse_file(descriptor_file, validate = True): @@ -585,6 +586,7 @@ class RelayDescriptor(ServerDescriptor): <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_) :var str onion_key: **\*** key used to encrypt EXTEND cells + :var str ntor_onion_key: base64 key used to encrypt EXTEND in the ntor protocol :var str signing_key: **\*** relay's long-term identity key :var str signature: **\*** signature for this descriptor @@ -593,6 +595,7 @@ class RelayDescriptor(ServerDescriptor): def __init__(self, raw_contents, validate = True, annotations = None): self.onion_key = None + self.ntor_onion_key = None self.signing_key = None self.signature = None self._digest = None @@ -738,6 +741,9 @@ class RelayDescriptor(ServerDescriptor): self.onion_key = block_contents del entries["onion-key"] + elif keyword == "ntor-onion-key": + self.ntor_onion_key = value + del entries["ntor-onion-key"] elif keyword == "signing-key": if validate and not block_contents: raise ValueError("Signing key line must be followed by a public key: %s" % line) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 62eb033..0edf429 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -268,6 +268,14 @@ class TestServerDescriptor(unittest.TestCase): desc = get_relay_server_descriptor({"ipv6-policy": "accept 22-23,53,80,110"}) self.assertEquals(expected, desc.exit_policy_v6) + def test_ntor_onion_key(self): + """ + Checks a 'ntor-onion-key' line. + """ + + desc = get_relay_server_descriptor({"ntor-onion-key": "Od2Sj3UXFyDjwESLXk6fhatqW9z/oBL/vAKJ+tbDqUU="}) + self.assertEquals("Od2Sj3UXFyDjwESLXk6fhatqW9z/oBL/vAKJ+tbDqUU=", desc.ntor_onion_key) + def test_minimal_bridge_descriptor(self): """ Basic sanity check that we can parse a descriptor with minimal attributes.

1 0

[stem/master] Renaming MicrodescriptorExitPolicy to MicroExitPolicy
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit ec306804fc325b8670758df36ec76a1e10fe3604 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 5 16:14:12 2013 -0800 Renaming MicrodescriptorExitPolicy to MicroExitPolicy Suggestion by Sean on "Stem code review 2013-01-03". The new name both fits better (since the rule class is called MicroExitPolicyRule) and a friendlier length to type. --- stem/descriptor/router_status_entry.py | 4 ++-- stem/descriptor/server_descriptor.py | 4 ++-- stem/exit_policy.py | 12 ++++++------ test/unit/descriptor/router_status_entry.py | 6 +++--- test/unit/descriptor/server_descriptor.py | 2 +- test/unit/exit_policy/policy.py | 18 +++++++++--------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index ed01132..57b018a 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -279,7 +279,7 @@ class RouterStatusEntryV3(RouterStatusEntry): :var list unrecognized_bandwidth_entries: **\*** bandwidth weighting information that isn't yet recognized - :var stem.exit_policy.MicrodescriptorExitPolicy exit_policy: router's exit policy + :var stem.exit_policy.MicroExitPolicy exit_policy: router's exit policy :var list microdescriptor_hashes: **\*** tuples of two values, the list of consensus methods for generating a set of digests and the 'algorithm => @@ -557,7 +557,7 @@ def _parse_p_line(desc, value, validate): # example: p accept 80,110,143,443,993,995,6660-6669,6697,7000-7001 try: - desc.exit_policy = stem.exit_policy.MicrodescriptorExitPolicy(value) + desc.exit_policy = stem.exit_policy.MicroExitPolicy(value) except ValueError, exc: if not validate: return raise ValueError("%s exit policy is malformed (%s): p %s" % (desc._name(), exc, value)) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 634a705..17664bc 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -146,7 +146,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): :var int uptime: uptime when published in seconds :var str contact: contact information :var stem.exit_policy.ExitPolicy exit_policy: **\*** stated exit policy - :var stem.exit_policy.MicrodescriptorExitPolicy exit_policy_v6: **\*** exit policy for IPv6 + :var stem.exit_policy.MicroExitPolicy exit_policy_v6: **\*** exit policy for IPv6 :var list family: **\*** nicknames or fingerprints of declared family :var int average_bandwidth: **\*** average rate it's willing to relay in bytes/s @@ -475,7 +475,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): elif keyword == "eventdns": self.eventdns = value == "1" elif keyword == "ipv6-policy": - self.exit_policy_v6 = stem.exit_policy.MicrodescriptorExitPolicy(value) + self.exit_policy_v6 = stem.exit_policy.MicroExitPolicy(value) elif keyword == "or-address": or_address_entries = [value for (value, _) in values] diff --git a/stem/exit_policy.py b/stem/exit_policy.py index d7e091f..677a3c9 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -4,7 +4,7 @@ exiting to a destination is permissible or not. For instance... :: - >>> from stem.exit_policy import ExitPolicy, MicrodescriptorExitPolicy + >>> from stem.exit_policy import ExitPolicy, MicroExitPolicy >>> policy = ExitPolicy("accept *:80", "accept *:443", "reject *:*") >>> print policy accept *:80, accept *:443, reject *:* @@ -13,7 +13,7 @@ exiting to a destination is permissible or not. For instance... >>> policy.can_exit_to("75.119.206.243", 80) True - >>> policy = MicrodescriptorExitPolicy("accept 80,443") + >>> policy = MicroExitPolicy("accept 80,443") >>> print policy accept 80,443 >>> policy.can_exit_to("75.119.206.243", 80) @@ -22,7 +22,7 @@ exiting to a destination is permissible or not. For instance... :: ExitPolicy - Exit policy for a Tor relay - | + MicrodescriptorExitPolicy - Microdescriptor exit policy + | + MicroExitPolicy - Microdescriptor exit policy |- can_exit_to - check if exiting to this destination is allowed or not |- is_exiting_allowed - check if any exiting is allowed |- summary - provides a short label, similar to a microdescriptor @@ -256,7 +256,7 @@ class ExitPolicy(object): else: return False -class MicrodescriptorExitPolicy(ExitPolicy): +class MicroExitPolicy(ExitPolicy): """ Exit policy provided by the microdescriptors. This is a distilled version of a normal :class:`~stem.exit_policy.ExitPolicy` contains, just consisting of a @@ -323,14 +323,14 @@ class MicrodescriptorExitPolicy(ExitPolicy): rules.append(MicroExitPolicyRule(self.is_accept, int(min_port), int(max_port))) - super(MicrodescriptorExitPolicy, self).__init__(*rules) + super(MicroExitPolicy, self).__init__(*rules) self._set_default_allowed(not self.is_accept) def __str__(self): return self._policy def __eq__(self, other): - if isinstance(other, MicrodescriptorExitPolicy): + if isinstance(other, MicroExitPolicy): return str(self) == str(other) else: return False diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index ef03baa..fd668d2 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -7,7 +7,7 @@ import unittest from stem.descriptor import Flag from stem.descriptor.router_status_entry import RouterStatusEntryV3, _decode_fingerprint -from stem.exit_policy import MicrodescriptorExitPolicy +from stem.exit_policy import MicroExitPolicy from stem.version import Version from test.mocking import get_router_status_entry_v2, \ @@ -439,8 +439,8 @@ class TestRouterStatusEntry(unittest.TestCase): """ test_values = { - "reject 1-65535": MicrodescriptorExitPolicy("reject 1-65535"), - "accept 80,110,143,443": MicrodescriptorExitPolicy("accept 80,110,143,443"), + "reject 1-65535": MicroExitPolicy("reject 1-65535"), + "accept 80,110,143,443": MicroExitPolicy("accept 80,110,143,443"), } for p_line, expected in test_values.items(): diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index e0a86fb..62eb033 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -264,7 +264,7 @@ class TestServerDescriptor(unittest.TestCase): Checks a 'ipv6-policy' line. """ - expected = stem.exit_policy.MicrodescriptorExitPolicy("accept 22-23,53,80,110") + expected = stem.exit_policy.MicroExitPolicy("accept 22-23,53,80,110") desc = get_relay_server_descriptor({"ipv6-policy": "accept 22-23,53,80,110"}) self.assertEquals(expected, desc.exit_policy_v6) diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 831009e..c4e675e 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -5,18 +5,18 @@ Unit tests for the stem.exit_policy.ExitPolicy class. import unittest from stem.exit_policy import ExitPolicy, \ - MicrodescriptorExitPolicy, \ + MicroExitPolicy, \ ExitPolicyRule class TestExitPolicy(unittest.TestCase): def test_example(self): - # tests the ExitPolicy and MicrodescriptorExitPolicy pydoc examples + # tests the ExitPolicy and MicroExitPolicy pydoc examples policy = ExitPolicy("accept *:80", "accept *:443", "reject *:*") self.assertEquals("accept *:80, accept *:443, reject *:*", str(policy)) self.assertEquals("accept 80, 443", policy.summary()) self.assertTrue(policy.can_exit_to("75.119.206.243", 80)) - policy = MicrodescriptorExitPolicy("accept 80,443") + policy = MicroExitPolicy("accept 80,443") self.assertTrue(policy.can_exit_to("75.119.206.243", 80)) def test_constructor(self): @@ -145,7 +145,7 @@ class TestExitPolicy(unittest.TestCase): for policy_arg, expect_success in test_inputs.items(): try: - policy = MicrodescriptorExitPolicy(policy_arg) + policy = MicroExitPolicy(policy_arg) if expect_success: self.assertEqual(policy_arg, str(policy)) @@ -158,15 +158,15 @@ class TestExitPolicy(unittest.TestCase): # checks that its is_accept attribute is properly set # single port - policy = MicrodescriptorExitPolicy('accept 443') + policy = MicroExitPolicy('accept 443') self.assertTrue(policy.is_accept) # multiple ports - policy = MicrodescriptorExitPolicy('accept 80,443') + policy = MicroExitPolicy('accept 80,443') self.assertTrue(policy.is_accept) # port range - policy = MicrodescriptorExitPolicy('reject 1-1024') + policy = MicroExitPolicy('reject 1-1024') self.assertFalse(policy.is_accept) def test_microdescriptor_can_exit_to(self): @@ -178,13 +178,13 @@ class TestExitPolicy(unittest.TestCase): } for policy_arg, attr in test_inputs.items(): - policy = MicrodescriptorExitPolicy(policy_arg) + policy = MicroExitPolicy(policy_arg) for port, expected_value in attr.items(): self.assertEqual(expected_value, policy.can_exit_to(port = port)) # address argument should be ignored - policy = MicrodescriptorExitPolicy('accept 80,443') + policy = MicroExitPolicy('accept 80,443') self.assertFalse(policy.can_exit_to('127.0.0.1', 79)) self.assertTrue(policy.can_exit_to('127.0.0.1', 80))

1 0

[stem/master] Replacing 'assert' keyword in extend_circuit()
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 9cd9b4004995015c0a0a04a32bb9c68a1addf728 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 5 16:04:50 2013 -0800 Replacing 'assert' keyword in extend_circuit() Issue spotted by Sean in "Stem code review 2013-01-03". The check itself is fine but I'm trying to avoid using the 'assert' keyword. --- stem/control.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index c7d52b4..b22adfd 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1616,17 +1616,16 @@ class Controller(BaseController): response = self.msg("EXTENDCIRCUIT %s" % " ".join(args)) stem.response.convert("SINGLELINE", response) - if response.is_ok(): - try: - extended, new_circuit = response.message.split(" ") - assert extended == "EXTENDED" - except: - raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", str(response)) - elif response.code in ('512', '552'): + if response.code in ('512', '552'): raise stem.InvalidRequest(response.code, response.message) - else: + elif not response.is_ok(): raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) + if not response.message.startswith("EXTENDED "): + raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", response) + + new_circuit = response.message.split(" ", 1)[1] + if await_build: while True: circ = circ_queue.get()

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Jan '13

06 Jan '13

commit 08b9f85ddf8d3af395549f5ef61b8ce4324c0963 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 5 23:45:55 2013 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 5557bff..48e301b 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-01-05 23:15+0000\n" +"PO-Revision-Date: 2013-01-05 23:19+0000\n" "Last-Translator: alshara3 <hsn.ali91(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "المعلومات الشخصية" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "اخزن الملفات في دليل \"بيرسستنت\"" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" @@ -129,7 +129,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:450 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "" +msgstr "لا يوجد فراغ كافي على الجهاز %s" #: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 #, perl-format

1 0