- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '12

30 Dec '12

commit 45dca84c4394c7d3dbeefb784a917152b945361a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 11:45:29 2012 +0000 Update translations for vidalia_help --- lv/config.po | 14 +++++++------- lv/server.po | 39 +++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/lv/config.po b/lv/config.po index 19e6bb0..01e25c8 100644 --- a/lv/config.po +++ b/lv/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-12-30 11:11+0000\n" +"PO-Revision-Date: 2012-12-30 11:35+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgid "" " a bridge relay address somehow and add it here. See the help topic on <a " "href=\"bridges.html#finding\">finding bridge relays</a> for more information" " on how to learn new bridge relay addresses and fingerprints." -msgstr "" +msgstr "Ja savienojumi ar parastiem Tor retranslatoriem ir bloķēti, tad kaut kādā veidā ir jānoskaidro tilta retranslatora adrese, un, tad, tā jāpievieno te. Skatiet palīdzības tematu <a href=\"bridges.html#finding\">tiltu retranslatoru atrašana</a>, lai gūtu vairāk informācijas par to kā uzzināt jaunas tiltu retranslatoru adreses un ciparvirknes." #. type: Content of: <html><body> #: en/config.html:100 @@ -245,7 +245,7 @@ msgid "" "connects to Tor's control port. If Vidalia starts Tor for you, you can have " "Vidalia randomly generate a new password each time it starts Tor by checking" " the <i>Randomly Generate</i> checkbox." -msgstr "<b>Parole</b> <i>(pēc noklusējuma)</i> -- Izvēloties šo metodi, varat norādīt paroli, kuru Tor prasīs ikreiz, kad lietotājs vai lietotne izveido savienojumu ar Tor'a vadības portu. Gadījumā ja Vidalia startē Tor'u, tad ir iespējams norādīt lai Vidalia ģenerētu jaunu gadījumģenerētu paroli, kad tā startē Tor. Lai to izdarītu ir jāatzīmē izvēles rūtiņa <i>Ģenerēt gadījumveidā</i>." +msgstr "<b>Parole</b> <i>(pēc noklusējuma)</i> -- Izvēloties šo metodi, varat norādīt paroli, kuru Tor prasīs ikreiz, kad lietotājs vai lietotne izveido savienojumu ar Tor'a vadības portu. Gadījumā ja Vidalia startē Tor'u, tad ir iespējams norādīt lai Vidalia ģenerētu jaunu gadījumģenerētu paroli, kad tā startē Tor. Lai to izdarītu jāatzīmē izvēles rūtiņa <i>Ģenerēt gadījumveidā</i>." #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:162 @@ -254,7 +254,7 @@ msgid "" " (or, <i>cookie</i>) containing random bytes to its data directory when it " "starts. Any user or application that tries to connect to Tor's control port " "must be able to provide the contents of this cookie." -msgstr "<b>Sīkdatne</b> -- If cookie authentication is selected, Tor will write a file (or, <i>cookie</i>) containing random bytes to its data directory when it starts. Any user or application that tries to connect to Tor's control port must be able to provide the contents of this cookie." +msgstr "<b>Sīkdatne</b> -- Izvēloties sīkdatņu autentifikāciju, Tor, startējot, ierakstīs savā datu direktorijā datni (vai, <i>sīkdatne</i>), kurā ir gadījumģenerēti baiti. Ikvienam lietotājam vai lietotnei, kuri cenšas izveidot savienojumu ar Tor'a vadības portu, jāspēj uzrādīt šīs sīkdatnes saturu." #. type: Content of: <html><body><ul><li> #: en/config.html:170 @@ -263,7 +263,7 @@ msgid "" "have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration " "file. If you leave this field blank, Tor will uses its own default torrc " "location." -msgstr "" +msgstr "<b>Tor konfigurācijas datne</b> <i>(neobligāts)</i>: Šo izvēles iespēju var izmantot, lai Vidalia startētu Tor, izmantojot konkrētu <i>torrc</i>, Tor'a konfigurācijas datni. Neaizpildot šo lauku, Tor lietos savu noklusēto torrc atrašanās vietu." #. type: Content of: <html><body><ul><li> #: en/config.html:175 @@ -272,7 +272,7 @@ msgid "" "in which Tor will store its saved data, such as cached Tor relay " "information, Tor relay keys, and configuration files. If you leave this " "field blank, Tor will use its own default data directory location." -msgstr "" +msgstr "<b>Tor datu direktorijs</b> <i>(neobligāts)</i>: Ir iespējams norādīt direktoriju, kurā Tor glabās savus saglabātos datus, piem., kešotu Tor retranslatoru informāciju, Tor retranslatoru atslēgas, kā arī konfigurācijas datnes. Neaizpildot šo lauku, Tor lietos savu noklusēto datu direktorija atrašanās vietu." #. type: Content of: <html><body><ul><li> #: en/config.html:181 @@ -281,7 +281,7 @@ msgid "" " a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it" " starts. If you enter a value for <b>Run as Group</b>, Tor will " "<i>setgid</i> to this group when it starts." -msgstr "" +msgstr "<b>Atļaujas</b> <i>(neobligāts, nav pieejams OS Windows)</i>: Norādot vērtību <b>Izpildīt kā lietotājam</b>, Tor, startējot, piešķirs šim lietotājam <i>setuid</i>. Norādot vērtību <b>Izpildīt kā grupai</b>, Tor, startējot, piešķirs šai grupai <i>setgid</i>." #. type: Content of: <html><body> #: en/config.html:189 diff --git a/lv/server.po b/lv/server.po index c542960..80ac614 100644 --- a/lv/server.po +++ b/lv/server.po @@ -1,18 +1,19 @@ # # Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-12-30 11:44+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #. type: Content of: <html><body><h1> #: en/server.html:16 @@ -30,7 +31,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:24 msgid "Basic Settings" -msgstr "" +msgstr "Pamata iestatījumi" #. type: Content of: <html><body><p> #: en/server.html:26 @@ -66,7 +67,7 @@ msgstr "" #. type: Content of: <html><body><ol><li> #: en/server.html:44 msgid "Enter the following information:" -msgstr "" +msgstr "Ievādiet šādu informāciju:" #. type: Content of: <html><body><ol><ul><li> #: en/server.html:46 @@ -110,7 +111,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "Joslas platuma ierobežojumi" #. type: Content of: <html><body><p> #: en/server.html:74 @@ -171,12 +172,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:111 msgid "<a name=\"exitpolicy\"/>" -msgstr "" +msgstr "<vārds=\"iziešanas kārtība\"/>" #. type: Content of: <html><body><h3> #: en/server.html:112 msgid "Exit Policies" -msgstr "" +msgstr "Iziešanas kārtība" #. type: Content of: <html><body><p> #: en/server.html:114 @@ -216,22 +217,22 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:139 msgid "<b>Ports</b>" -msgstr "" +msgstr "<b>Porti</b>" #. type: Content of: <html><body><table><tr><td> #: en/server.html:140 msgid "<b>Description</b>" -msgstr "" +msgstr "<b>Apraksts</b>" #. type: Content of: <html><body><table><tr><td> #: en/server.html:143 msgid "Websites" -msgstr "" +msgstr "Tīmekļa vietnes" #. type: Content of: <html><body><table><tr><td> #: en/server.html:144 msgid "80" -msgstr "" +msgstr "80" #. type: Content of: <html><body><table><tr><td> #: en/server.html:145 @@ -241,12 +242,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 msgid "Secure Websites (SSL)" -msgstr "" +msgstr "Drošas tīmekļa vietnes (SSL)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:149 msgid "443" -msgstr "" +msgstr "443" #. type: Content of: <html><body><table><tr><td> #: en/server.html:150 @@ -261,7 +262,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:154 msgid "110, 143, 993, 995" -msgstr "" +msgstr "110, 143, 993, 995" #. type: Content of: <html><body><table><tr><td> #: en/server.html:155 @@ -287,12 +288,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163 msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Tērzēšanas retranslēšana internetā (IRC)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:164 msgid "6660-6669, 6697, 7000-7001" -msgstr "" +msgstr "6660-6669, 6697, 7000-7001" #. type: Content of: <html><body><table><tr><td> #: en/server.html:165 @@ -307,7 +308,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:169 msgid "*" -msgstr "" +msgstr "*" #. type: Content of: <html><body><table><tr><td> #: en/server.html:170 @@ -401,5 +402,3 @@ msgid "" "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by " "default on all operating systems." msgstr "" - -

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '12

30 Dec '12

commit b2ccf09aa8760e9a251001bfc567967f44183054 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 11:15:28 2012 +0000 Update translations for vidalia_help --- lv/config.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lv/config.po b/lv/config.po index ca8afaf..19e6bb0 100644 --- a/lv/config.po +++ b/lv/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-12-28 13:36+0000\n" +"PO-Revision-Date: 2012-12-30 11:11+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -219,7 +219,7 @@ msgid "" " Vidalia uses to talk to Tor. This doesn't need to be changed unless you " "have a conflict with another service on your machine, or if you are using " "Vidalia to control and monitor a Tor process running on another machine." -msgstr "" +msgstr "<b>Vadības adrese & Ports</b>: <i>Vadības ports</i> ir ports, kuru Vidalia izmanto, lai sazinātos ar Tor. To nevajag mainīt izņemot tad, ja datorā radies konflikts ar citu pakalpojumu, kā arī tad, ja izmantojat Vidalia, lai vadītu un monitorētu uz cita datora izpildītu Tor'a procesu." #. type: Content of: <html><body><ul><li> #: en/config.html:144 @@ -227,7 +227,7 @@ msgid "" "<b>Control Port Authentication</b>: Control port authentication is used to " "limit the applications on your machine that can connect to and reconfigure " "your Tor installation. The available authentication methods are:" -msgstr "" +msgstr "<b>Vadības porta autentifikācija</b>: Vadības porta autentifikāciju lieto, lai ierobežotu lietotņu skaitu datorā, kuras var izveidot savienojumus un pārkonfigurēt Jūsu Tor'a instalāciju. Pieejamās autentifikācijas metodes ir:" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:150 @@ -245,7 +245,7 @@ msgid "" "connects to Tor's control port. If Vidalia starts Tor for you, you can have " "Vidalia randomly generate a new password each time it starts Tor by checking" " the <i>Randomly Generate</i> checkbox." -msgstr "" +msgstr "<b>Parole</b> <i>(pēc noklusējuma)</i> -- Izvēloties šo metodi, varat norādīt paroli, kuru Tor prasīs ikreiz, kad lietotājs vai lietotne izveido savienojumu ar Tor'a vadības portu. Gadījumā ja Vidalia startē Tor'u, tad ir iespējams norādīt lai Vidalia ģenerētu jaunu gadījumģenerētu paroli, kad tā startē Tor. Lai to izdarītu ir jāatzīmē izvēles rūtiņa <i>Ģenerēt gadījumveidā</i>." #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:162 @@ -254,7 +254,7 @@ msgid "" " (or, <i>cookie</i>) containing random bytes to its data directory when it " "starts. Any user or application that tries to connect to Tor's control port " "must be able to provide the contents of this cookie." -msgstr "" +msgstr "<b>Sīkdatne</b> -- If cookie authentication is selected, Tor will write a file (or, <i>cookie</i>) containing random bytes to its data directory when it starts. Any user or application that tries to connect to Tor's control port must be able to provide the contents of this cookie." #. type: Content of: <html><body><ul><li> #: en/config.html:170

1 0

[stem/master] Moving the ExitPolicyRule's masked_bits behind a method
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit dc003e8bb26bf9261718ee2ac6ba5a3109972c44 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 02:23:12 2012 -0800 Moving the ExitPolicyRule's masked_bits behind a method In looking at TorCtl's ExitPolicyLine class I'm realizing that we may want to use our mask attribute as our main subnet representation rather than the masked_bits. Changing the class so the masked_bits are accessed via a method so we'll have the flexability to change this in the future. --- stem/exit_policy.py | 45 ++++++++++++++++++++++++---------------- test/unit/exit_policy/rule.py | 6 ++-- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 3e2cbd7..e1f68b7 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -35,6 +35,7 @@ exiting to a destination is permissible or not. For instance... |- get_address_type - provides the protocol our ip address belongs to |- is_match - checks if we match a given destination |- get_mask - provides the address representation of our mask + |- get_masked_bits - provides the bit representation of our mask +- __str__ - string representation for this rule .. data:: AddressType (enum) @@ -339,8 +340,6 @@ class ExitPolicyRule(object): :var bool is_accept: indicates if exiting is allowed or disallowed :var str address: address that this rule is for - :var int masked_bits: number of bits the subnet mask represents, **None** if - the mask can't have a bit representation :var int min_port: lower end of the port range that we include (inclusive) :var int max_port: upper end of the port range that we include (inclusive) @@ -373,7 +372,7 @@ class ExitPolicyRule(object): self.address = None self._address_type = None - self.masked_bits = None + self._masked_bits = None self.min_port = self.max_port = None # Our mask in ip notation (ex. "255.255.255.0"). This is only set if we @@ -494,15 +493,25 @@ class ExitPolicyRule(object): if address_type == AddressType.WILDCARD: mask = None elif address_type == AddressType.IPv4: - mask = stem.util.connection.get_mask(self.masked_bits) + mask = stem.util.connection.get_mask(self._masked_bits) elif address_type == AddressType.IPv6: - mask = stem.util.connection.get_mask_ipv6(self.masked_bits) + mask = stem.util.connection.get_mask_ipv6(self._masked_bits) if not cache: return mask self._mask = mask return self._mask + def get_masked_bits(self): + """ + Provides the number of bits our subnet mask represents. This is **None** if + our mask can't have a bit representation. + + :returns: int with the bit representation of our mask + """ + + return self._masked_bits + def __str__(self): """ Provides the string representation of our policy. This does not @@ -530,11 +539,11 @@ class ExitPolicyRule(object): # - use our masked bit count if we can # - use the mask itself otherwise - if (address_type == AddressType.IPv4 and self.masked_bits == 32) or \ - (address_type == AddressType.IPv6 and self.masked_bits == 128): + if (address_type == AddressType.IPv4 and self._masked_bits == 32) or \ + (address_type == AddressType.IPv6 and self._masked_bits == 128): label += ":" - elif self.masked_bits is not None: - label += "/%i:" % self.masked_bits + elif self._masked_bits is not None: + label += "/%i:" % self._masked_bits else: label += "/%s:" % self.get_mask() @@ -576,7 +585,7 @@ class ExitPolicyRule(object): if addrspec == "*": self._address_type = _address_type_to_int(AddressType.WILDCARD) - self.address = self.masked_bits = None + self.address = self._masked_bits = None elif stem.util.connection.is_valid_ip_address(self.address): # ipv4spec ::= ip4 | ip4 "/" num_ip4_bits | ip4 "/" ip4mask # ip4 ::= an IPv4 address in dotted-quad format @@ -586,20 +595,20 @@ class ExitPolicyRule(object): self._address_type = _address_type_to_int(AddressType.IPv4) if addr_extra is None: - self.masked_bits = 32 + self._masked_bits = 32 elif stem.util.connection.is_valid_ip_address(addr_extra): # provided with an ip4mask try: - self.masked_bits = stem.util.connection.get_masked_bits(addr_extra) + self._masked_bits = stem.util.connection.get_masked_bits(addr_extra) except ValueError: # mask can't be represented as a number of bits (ex. "255.255.0.255") self._mask = addr_extra - self.masked_bits = None + self._masked_bits = None elif addr_extra.isdigit(): # provided with a num_ip4_bits - self.masked_bits = int(addr_extra) + self._masked_bits = int(addr_extra) - if self.masked_bits < 0 or self.masked_bits > 32: + if self._masked_bits < 0 or self._masked_bits > 32: raise ValueError("IPv4 masks must be in the range of 0-32 bits") else: raise ValueError("The '%s' isn't a mask nor number of bits: %s" % (addr_extra, rule)) @@ -613,12 +622,12 @@ class ExitPolicyRule(object): self._address_type = _address_type_to_int(AddressType.IPv6) if addr_extra is None: - self.masked_bits = 128 + self._masked_bits = 128 elif addr_extra.isdigit(): # provided with a num_ip6_bits - self.masked_bits = int(addr_extra) + self._masked_bits = int(addr_extra) - if self.masked_bits < 0 or self.masked_bits > 128: + if self._masked_bits < 0 or self._masked_bits > 128: raise ValueError("IPv6 masks must be in the range of 0-128 bits") else: raise ValueError("The '%s' isn't a number of bits: %s" % (addr_extra, rule)) diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 994b899..0341f43 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -104,7 +104,7 @@ class TestExitPolicyRule(unittest.TestCase): self.assertEquals(AddressType.WILDCARD, rule.get_address_type()) self.assertEquals(None, rule.address) self.assertEquals(None, rule.get_mask()) - self.assertEquals(None, rule.masked_bits) + self.assertEquals(None, rule.get_masked_bits()) self.assertEquals(1, rule.min_port) self.assertEquals(65535, rule.max_port) @@ -123,7 +123,7 @@ class TestExitPolicyRule(unittest.TestCase): self.assertEquals(AddressType.IPv4, rule.get_address_type()) self.assertEquals(address, rule.address) self.assertEquals(mask, rule.get_mask()) - self.assertEquals(masked_bits, rule.masked_bits) + self.assertEquals(masked_bits, rule.get_masked_bits()) def test_invalid_ipv4_addresses(self): test_inputs = ( @@ -162,7 +162,7 @@ class TestExitPolicyRule(unittest.TestCase): self.assertEquals(AddressType.IPv6, rule.get_address_type()) self.assertEquals(address, rule.address) self.assertEquals(mask, rule.get_mask()) - self.assertEquals(masked_bits, rule.masked_bits) + self.assertEquals(masked_bits, rule.get_masked_bits()) def test_invalid_ipv6_addresses(self): test_inputs = (

1 0

[stem/master] Flagging the ExitPolicy's set_default_allowed() as private
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit d1d00b635c53c885ff930fe28771cef51f1edebb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 01:18:59 2012 -0800 Flagging the ExitPolicy's set_default_allowed() as private The ExitPolicy's set_default_allowed() method is there to support microdescriptor policies, not for our users. Acually, exit policies were entirely immutable with the exception of this attribute. Changing the method to be private. --- stem/exit_policy.py | 35 +++++++++++++++++------------------ test/unit/exit_policy/policy.py | 4 ++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 6aaa4cc..3e2cbd7 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -23,7 +23,6 @@ exiting to a destination is permissible or not. For instance... ExitPolicy - Exit policy for a Tor relay | + MicrodescriptorExitPolicy - Microdescriptor exit policy - |- set_default_allowed - sets the can_exit_to response when no rules match |- 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 @@ -99,22 +98,6 @@ class ExitPolicy(object): self._is_allowed_default = True self._summary_representation = None - def set_default_allowed(self, is_allowed_default): - """ - Generally policies end with either an 'reject \*:\*' or 'accept \*:\*' - policy, but if it doesn't then is_allowed_default will determine the - default response for our :meth:`~stem.exit_policy.ExitPolicy.can_exit_to` - method. - - Our default, and tor's, is **True**. - - :param bool is_allowed_default: - :meth:`~stem.exit_policy.ExitPolicy.can_exit_to` default when no rules - apply - """ - - self._is_allowed_default = is_allowed_default - def can_exit_to(self, address = None, port = None): """ Checks if this policy allows exiting to a given destination or not. If the @@ -231,6 +214,22 @@ class ExitPolicy(object): return self._summary_representation + def _set_default_allowed(self, is_allowed_default): + """ + Generally policies end with either an 'reject \*:\*' or 'accept \*:\*' + policy, but if it doesn't then is_allowed_default will determine the + default response for our :meth:`~stem.exit_policy.ExitPolicy.can_exit_to` + method. + + Our default, and tor's, is **True**. + + :param bool is_allowed_default: + :meth:`~stem.exit_policy.ExitPolicy.can_exit_to` default when no rules + apply + """ + + self._is_allowed_default = is_allowed_default + def __iter__(self): for rule in self._rules: yield rule @@ -311,7 +310,7 @@ class MicrodescriptorExitPolicy(ExitPolicy): raise ValueError(exc_msg) super(MicrodescriptorExitPolicy, self).__init__(*rules) - self.set_default_allowed(not self.is_accept) + self._set_default_allowed(not self.is_accept) def __str__(self): return self._policy diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index bfafa98..831009e 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -43,7 +43,7 @@ class TestExitPolicy(unittest.TestCase): self.assertTrue(policy.can_exit_to("75.119.206.243", 443)) self.assertTrue(policy.can_exit_to("75.119.206.243", 999)) - policy.set_default_allowed(False) + policy._set_default_allowed(False) self.assertFalse(policy.can_exit_to("75.119.206.243", 80)) self.assertTrue(policy.can_exit_to("75.119.206.243", 443)) self.assertFalse(policy.can_exit_to("75.119.206.243", 999)) @@ -54,7 +54,7 @@ class TestExitPolicy(unittest.TestCase): policy = ExitPolicy() self.assertTrue(policy.is_exiting_allowed()) - policy.set_default_allowed(False) + policy._set_default_allowed(False) self.assertFalse(policy.is_exiting_allowed()) def test_can_exit_to(self):

1 0

[stem/master] Handle keyword arguments with mocking.return_for_args()
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit 1dbb7befdbd10169a35e27977a0736a9dc9465d0 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 22 04:29:46 2012 -0700 Handle keyword arguments with mocking.return_for_args() Allow a structured way to match keyword arguments to be included in the mapping keys for return_for_args(). This changes the API for return_for_args to require tuples as the mapping keys. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/mocking.py | 34 +++++++++++++++++++++++++++++----- test/unit/tutorial.py | 4 ++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index fa9e71f..697fd0f 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -210,15 +210,39 @@ def return_for_args(args_to_return_value, default = None): 'argument => return value' mapping. Otherwise, a default function is called with the arguments. - :param dict args_to_return_value: mapping of arguments to the value we should provide + The mapped argument is a tuple (not a list) of parameters to a function (or + method). Positional arguments must be in the order used to call the mocked + function and keyword arguments must be strings of the form 'k=v' in + alphabetical order. Some examples: + + :: + + Mocked functions can return different types depending on input: + + mocking.mock("get_answer", mocking.return_for_args({ + ("breakfast_menu",): "spam", + ("lunch_menu",): "eggs and spam", + (42,): ["life", "universe", "everything"], + }) + + mocking.mock("align_text", { + ("Stem", "alignment=left", "size=10"): "Stem ", + ("Stem", "alignment=center", "size=10"): " Stem ", + ("Stem", "alignment=right", "size=10"): " Stem", + }) + + :param dict,tuple args_to_return_value: mapping of arguments to the value we should provide :param functor default: returns the value of this function if the args don't match something that we have, we raise a ValueError by default """ - def _return_value(*args): + def _return_value(*args, **kwargs): # strip off the 'self' for mock clases if args and 'MockClass' in str(type(args[0])): - args = args[1:] if len(args) > 2 else args[1] + args = args[1:] if len(args) > 2 else [args[1]] + if kwargs: + args.extend(['='.join((str(k),str(kwargs[k]))) for k in sorted(kwargs.keys())]) + args = tuple(args) if args in args_to_return_value: return args_to_return_value[args] elif default is None: @@ -275,7 +299,7 @@ def mock(target, mock_call, target_module=None): target_function = target.__name__ MOCK_STATE[mocking_id] = (target_module, target_function, target) - mock_wrapper = lambda *args: mock_call(*args) + mock_wrapper = lambda *args, **kwargs: mock_call(*args, **kwargs) mock_wrapper.__dict__["mock_id"] = mocking_id # mocks the function with this wrapper @@ -323,7 +347,7 @@ def mock_method(target_class, method_name, mock_call): mocking_id = MOCK_ID.next() MOCK_STATE[mocking_id] = (target_class, method_name, target_method) - mock_wrapper = lambda *args: mock_call(*args) + mock_wrapper = lambda *args, **kwargs: mock_call(*args, **kwargs) setattr(mock_wrapper, "mock_id", mocking_id) # mocks the function with this wrapper diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index bb50e11..343258b 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -19,8 +19,8 @@ class TestTutorial(unittest.TestCase): 'authenticate': mocking.no_op(), 'close': mocking.no_op(), 'get_info': mocking.return_for_args({ - 'traffic/read': '1234', - 'traffic/written': '5678', + ('traffic/read',): '1234', + ('traffic/written',): '5678', }), })

1 0

[stem/master] Add explicit declaration of method use for mocking.return_for_args
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit d3cd0841393b20b4b333be0b39fb4890609426cf Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 22 04:34:36 2012 -0700 Add explicit declaration of method use for mocking.return_for_args The previous way of removing 'self' for MockClass objects only worked for fully mock objects. By using an explicit declaration, mocked methods for real objects can be used. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/mocking.py | 19 ++++++++++++++++--- test/unit/tutorial.py | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 697fd0f..074c977 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -204,7 +204,7 @@ def return_true(): return return_value(True) def return_false(): return return_value(False) def return_none(): return return_value(None) -def return_for_args(args_to_return_value, default = None): +def return_for_args(args_to_return_value, default = None, method = False): """ Returns a value if the arguments to it match something in a given 'argument => return value' mapping. Otherwise, a default function @@ -230,14 +230,27 @@ def return_for_args(args_to_return_value, default = None): ("Stem", "alignment=center", "size=10"): " Stem ", ("Stem", "alignment=right", "size=10"): " Stem", }) + + The mocked method returns one of three circuit ids depending on the input: + + :: + + mocking.mock_method(Controller, "new_circuit", mocking.return_for_args({ + (): "1", + ("path=['718BCEA286B531757ACAFF93AE04910EA73DE617', " + \ + "'30BAB8EE7606CBD12F3CC269AE976E0153E7A58D', " + \ + "'2765D8A8C4BBA3F89585A9FFE0E8575615880BEB']",): "2" + ("path=['1A', '2B', '3C']", "purpose=controller"): "3" + }, method = True) :param dict,tuple args_to_return_value: mapping of arguments to the value we should provide :param functor default: returns the value of this function if the args don't match something that we have, we raise a ValueError by default + :param bool method: removes the 'self' reference before processing the remainder of the parameters """ def _return_value(*args, **kwargs): - # strip off the 'self' for mock clases - if args and 'MockClass' in str(type(args[0])): + # strip off the 'self' for mock classes + if args and method: args = args[1:] if len(args) > 2 else [args[1]] if kwargs: diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 343258b..b586549 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -21,7 +21,7 @@ class TestTutorial(unittest.TestCase): 'get_info': mocking.return_for_args({ ('traffic/read',): '1234', ('traffic/written',): '5678', - }), + }, method = True), }) controller.authenticate()

1 0

[stem/master] Adding get_socks_listeners() to Controller
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit bbb2d5a44a898e1a7202d876fe27cc87065ffd3f Merge: bf28436 79fc8cd Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 29 23:34:13 2012 -0800 Adding get_socks_listeners() to Controller Adding a get_socks_listeners() to the controller to provide the (address, port) tuples where tor is listening for SOCKS connections. This also includes some mocking changes to better support the tests. Changes are from Sean... https://trac.torproject.org/7783 https://trac.torproject.org/7784 stem/control.py | 44 ++++++++++++++++++ test/integ/control/controller.py | 11 +++++ test/mocking.py | 54 ++++++++++++++++++---- test/runner.py | 9 +++- test/unit/control/controller.py | 93 +++++++++++++++++++++++++++++++++++++- test/unit/tutorial.py | 6 +- 6 files changed, 201 insertions(+), 16 deletions(-)

1 0

[stem/master] Revisions for prior mocking and controller changes
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit 79fc8cd7514cda072abf855b6a1908f0dd10bb17 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 29 23:27:06 2012 -0800 Revisions for prior mocking and controller changes Changes include... * Rewrite of get_socks_ports() with the following changes... * Renaming to get_socks_listeners() since it provides (address, port) tuples, not just ports. * Better error handling. Previously malformed content such as invalid ports would cause us to raise ValueErrors. * The method wasn't documented as raising any exceptions, but if the get_conf() calls fail then a ControllerError will be raised. * Minor corrections to the return_for_args() examples. * Renamed return_for_args()'s "method" arg to "is_method" (it's nice when the an arg name can imply the type). * I'm not sure what was meant by "Also, remove the the space in the join so that there is only one parameter passed to the string substitution.". Personally I'd find a message like... "Unrecognized argument sent for return_for_args(). Got 'foo, bar' but we only recognize 'foo, blarg'." ... to be a bit nicer than... "Unrecognized argument sent for return_for_args(). Got 'foo, bar' but we only recognize 'foo;blarg'." --- stem/control.py | 53 ++++++++++++++++++--------- test/integ/control/controller.py | 2 +- test/mocking.py | 68 +++++++++++++++++------------------ test/unit/control/controller.py | 72 +++++++++++++++++++++++++++++-------- test/unit/tutorial.py | 2 +- 5 files changed, 126 insertions(+), 71 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8a36285..704bb5e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -26,6 +26,7 @@ providing its own for interacting at a higher level. |- set_options - sets or resets the values of multiple configuration options |- load_conf - loads configuration information as if it was in the torrc |- save_conf - saves configuration information to the torrc + |- get_socks_listeners - provides (address, port) where tor is listening for SOCKS connections |- is_feature_enabled - checks if a given controller feature is enabled |- enable_feature - enables a controller feature that has been disabled by default |- signal - sends a signal to the tor client @@ -1320,32 +1321,48 @@ class Controller(BaseController): else: raise stem.ProtocolError("SAVECONF returned unexpected response code") - def get_socks_ports(self): + def get_socks_listeners(self): """ - Returns a list of SOCKS proxy ports open on the controlled tor instance. + Provides the SOCKS **(address, port)** tuples that tor has open. - :returns: list of **(host, port)** tuples or an empty list if there are no - SOCKS listeners + :returns: list of **(address, port)** tuples for the available SOCKS + listeners + + :raises: :class:`stem.ControllerError` if unable to determine the listeners """ + proxy_addrs = [] + try: - raw_addrs = self.get_info("net/listeners/socks").split() - # remove the surrounding quotes from each listener - raw_addrs = [x.replace("\"", "") for x in raw_addrs] + for listener in self.get_info("net/listeners/socks").split(): + if not (listener.startswith('"') and listener.endswith('"')): + raise stem.ProtocolError("'GETINFO net/listeners/socks' responses are expected to be quoted: %s" % listener) + elif not ':' in listener: + raise stem.ProtocolError("'GETINFO net/listeners/socks' had a listener without a colon: %s" % listener) + + listener = listener[1:-1] # strip quotes + addr, port = listener.split(':') + proxy_addrs.append((addr, port)) except stem.InvalidArguments: - # tor version is old (pre-tor-0.2.2.26-beta); use get_conf() + # tor version is old (pre-tor-0.2.2.26-beta), use get_conf() instead socks_port = self.get_conf('SocksPort') - raw_addrs = [] + for listener in self.get_conf('SocksListenAddress', multiple = True): - if listener.count(':') == 0: - listener = listener + ":" + socks_port - raw_addrs.append(listener) - # both processes above give a list of strings of the form host:port - proxy_addrs = [] - for proxy in raw_addrs: - proxy_pair = proxy.split(":") - proxy_addrs.append(tuple((proxy_pair[0], int(proxy_pair[1])))) - return proxy_addrs + if ':' in listener: + addr, port = listener.split(':') + proxy_addrs.append((addr, port)) + else: + proxy_addrs.append((listener, socks_port)) + + # validate that address/ports are valid, and convert ports to ints + + for addr, port in proxy_addrs: + if not stem.util.connection.is_valid_ip_address(addr): + raise stem.ProtocolError("Invalid address for a SOCKS listener: %s" % addr) + elif not stem.util.connection.is_valid_port(port): + raise stem.ProtocolError("Invalid port for a SOCKS listener: %s" % port) + + return [(addr, int(port)) for (addr, port) in proxy_addrs] def is_feature_enabled(self, feature): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 5c146e0..86056aa 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -467,7 +467,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - self.assertEqual([('127.0.0.1', 1112)], controller.get_socks_ports()) + self.assertEqual([('127.0.0.1', 1112)], controller.get_socks_listeners()) def test_enable_feature(self): """ diff --git a/test/mocking.py b/test/mocking.py index 074c977..a86b958 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -204,63 +204,61 @@ def return_true(): return return_value(True) def return_false(): return return_value(False) def return_none(): return return_value(None) -def return_for_args(args_to_return_value, default = None, method = False): +def return_for_args(args_to_return_value, default = None, is_method = False): """ Returns a value if the arguments to it match something in a given 'argument => return value' mapping. Otherwise, a default function is called with the arguments. - The mapped argument is a tuple (not a list) of parameters to a function (or - method). Positional arguments must be in the order used to call the mocked - function and keyword arguments must be strings of the form 'k=v' in - alphabetical order. Some examples: + The mapped argument is a tuple (not a list) of parameters to a function or + method. Positional arguments must be in the order used to call the mocked + function, and keyword arguments must be strings of the form 'k=v'. Keyword + arguments **must** appear in alphabetical order. For example... :: - Mocked functions can return different types depending on input: + mocking.mock("get_answer", mocking.return_for_args({ + ("breakfast_menu",): "spam", + ("lunch_menu",): "eggs and spam", + (42,): ["life", "universe", "everything"], + })) - mocking.mock("get_answer", mocking.return_for_args({ - ("breakfast_menu",): "spam", - ("lunch_menu",): "eggs and spam", - (42,): ["life", "universe", "everything"], - }) - - mocking.mock("align_text", { - ("Stem", "alignment=left", "size=10"): "Stem ", - ("Stem", "alignment=center", "size=10"): " Stem ", - ("Stem", "alignment=right", "size=10"): " Stem", - }) - - The mocked method returns one of three circuit ids depending on the input: - - :: + mocking.mock("align_text", mocking.return_for_args({ + ("Stem", "alignment=left", "size=10"): "Stem ", + ("Stem", "alignment=center", "size=10"): " Stem ", + ("Stem", "alignment=right", "size=10"): " Stem", + })) - mocking.mock_method(Controller, "new_circuit", mocking.return_for_args({ - (): "1", - ("path=['718BCEA286B531757ACAFF93AE04910EA73DE617', " + \ - "'30BAB8EE7606CBD12F3CC269AE976E0153E7A58D', " + \ - "'2765D8A8C4BBA3F89585A9FFE0E8575615880BEB']",): "2" - ("path=['1A', '2B', '3C']", "purpose=controller"): "3" - }, method = True) + mocking.mock_method(Controller, "new_circuit", mocking.return_for_args({ + (): "1", + ("path=['718BCEA286B531757ACAFF93AE04910EA73DE617', " + \ + "'30BAB8EE7606CBD12F3CC269AE976E0153E7A58D', " + \ + "'2765D8A8C4BBA3F89585A9FFE0E8575615880BEB']",): "2" + ("path=['1A', '2B', '3C']", "purpose=controller"): "3" + }, is_method = True)) - :param dict,tuple args_to_return_value: mapping of arguments to the value we should provide - :param functor default: returns the value of this function if the args don't match something that we have, we raise a ValueError by default - :param bool method: removes the 'self' reference before processing the remainder of the parameters + :param dict args_to_return_value: mapping of arguments to the value we should provide + :param functor default: returns the value of this function if the args don't + match something that we have, we raise a ValueError by default + :param bool is_method: handles this like a method, removing the 'self' + reference """ def _return_value(*args, **kwargs): - # strip off the 'self' for mock classes - if args and method: + # strip off the 'self' if we're mocking a method + if args and is_method: args = args[1:] if len(args) > 2 else [args[1]] if kwargs: - args.extend(['='.join((str(k),str(kwargs[k]))) for k in sorted(kwargs.keys())]) + args.extend(["%s=%s" % (k, kwargs[k]) for k in sorted(kwargs.keys())]) + args = tuple(args) + if args in args_to_return_value: return args_to_return_value[args] elif default is None: arg_label = ", ".join([str(v) for v in args]) - arg_keys = ";".join([str(v) for v in args_to_return_value.keys()]) + arg_keys = ", ".join([str(v) for v in args_to_return_value.keys()]) raise ValueError("Unrecognized argument sent for return_for_args(). Got '%s' but we only recognize '%s'." % (arg_label, arg_keys)) else: return default(args) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index f3849eb..695c2de 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -77,54 +77,94 @@ class TestControl(unittest.TestCase): # EventType.SIGNAL was added in tor version 0.2.3.1-alpha self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.SIGNAL) - def test_socks_port_old_tor(self): + def test_get_socks_listeners_old(self): """ - Exercises the get_socks_ports method as if talking to an old tor process. + Exercises the get_socks_listeners() method as though talking to an old tor + instance. """ # An old tor raises stem.InvalidArguments for get_info about socks, but - # get_socks_ports returns the socks information, anyway. + # get_socks_listeners should work anyway. + mocking.mock_method(Controller, "get_info", mocking.raise_exception(InvalidArguments)) + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ ("SocksPort",): "9050", ("SocksListenAddress", "multiple=True"): ["127.0.0.1"] - }, method = True)) - self.assertEqual([('127.0.0.1', 9050)], self.controller.get_socks_ports()) + }, is_method = True)) + self.assertEqual([('127.0.0.1', 9050)], self.controller.get_socks_listeners()) # Again, an old tor, but SocksListenAddress overrides the port number. + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ ("SocksPort",): "9050", ("SocksListenAddress", "multiple=True"): ["127.0.0.1:1112"] - }, method = True)) - self.assertEqual([('127.0.0.1', 1112)], self.controller.get_socks_ports()) + }, is_method = True)) + self.assertEqual([('127.0.0.1', 1112)], self.controller.get_socks_listeners()) # Again, an old tor, but multiple listeners + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ ("SocksPort",): "9050", ("SocksListenAddress", "multiple=True"): ["127.0.0.1:1112", "127.0.0.1:1114"] - }, method = True)) - self.assertEqual([('127.0.0.1', 1112), ('127.0.0.1', 1114)], self.controller.get_socks_ports()) + }, is_method = True)) + self.assertEqual([('127.0.0.1', 1112), ('127.0.0.1', 1114)], self.controller.get_socks_listeners()) # Again, an old tor, but no SOCKS listeners + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ ("SocksPort",): "0", ("SocksListenAddress", "multiple=True"): [] - }, method = True)) - self.assertEqual([], self.controller.get_socks_ports()) + }, is_method = True)) + self.assertEqual([], self.controller.get_socks_listeners()) + + # Where tor provides invalid ports or addresses + + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "blarg", + ("SocksListenAddress", "multiple=True"): ["127.0.0.1"] + }, is_method = True)) + self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) + + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "0", + ("SocksListenAddress", "multiple=True"): ["127.0.0.1:abc"] + }, is_method = True)) + self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) + + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "40", + ("SocksListenAddress", "multiple=True"): ["500.0.0.1"] + }, is_method = True)) + self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) - def test_socks_port_new_tor(self): + def test_get_socks_listeners_new(self): """ - Exercises the get_socks_ports method as if talking to a newer tor process. + Exercises the get_socks_listeners() method as if talking to a newer tor + instance. """ # multiple SOCKS listeners mocking.mock_method(Controller, "get_info", mocking.return_value( - "\"127.0.0.1:1112\" \"127.0.0.1:1114\"" + '"127.0.0.1:1112" "127.0.0.1:1114"' )) self.assertEqual([('127.0.0.1', 1112), ('127.0.0.1', 1114)], - self.controller.get_socks_ports()) + self.controller.get_socks_listeners()) # no SOCKS listeners mocking.mock_method(Controller, "get_info", mocking.return_value("")) - self.assertEqual([], self.controller.get_socks_ports()) + self.assertEqual([], self.controller.get_socks_listeners()) + + # check where GETINFO provides malformed content + + invalid_responses = ( + '"127.0.0.1"', # address only + '"1112"', # port only + '"5127.0.0.1:1112"', # invlaid address + '"127.0.0.1:991112"', # invalid port + ) + + for response in invalid_responses: + mocking.mock_method(Controller, "get_info", mocking.return_value(response)) + self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index b586549..79baa8c 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -21,7 +21,7 @@ class TestTutorial(unittest.TestCase): 'get_info': mocking.return_for_args({ ('traffic/read',): '1234', ('traffic/written',): '5678', - }, method = True), + }, is_method = True), }) controller.authenticate()

1 0

[stem/master] Add get_socks_ports method to Controller
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit 3a2875f22d1bf5dba6171e98807ef22f2a02c729 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 22 06:16:56 2012 -0700 Add get_socks_ports method to Controller Adds a method to find the SOCKS listeners on a controlled tor. This method is tested on tor versions 0.2.1.32 - 0.2.4.6-alpha and provides a similar response regardless of the underlying tor process. Also includes unit and integration tests for the new method. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 27 +++++++++++++++++++ test/integ/control/controller.py | 11 ++++++++ test/unit/control/controller.py | 53 +++++++++++++++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 15b762e..8a36285 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1320,6 +1320,33 @@ class Controller(BaseController): else: raise stem.ProtocolError("SAVECONF returned unexpected response code") + def get_socks_ports(self): + """ + Returns a list of SOCKS proxy ports open on the controlled tor instance. + + :returns: list of **(host, port)** tuples or an empty list if there are no + SOCKS listeners + """ + + try: + raw_addrs = self.get_info("net/listeners/socks").split() + # remove the surrounding quotes from each listener + raw_addrs = [x.replace("\"", "") for x in raw_addrs] + except stem.InvalidArguments: + # tor version is old (pre-tor-0.2.2.26-beta); use get_conf() + socks_port = self.get_conf('SocksPort') + raw_addrs = [] + for listener in self.get_conf('SocksListenAddress', multiple = True): + if listener.count(':') == 0: + listener = listener + ":" + socks_port + raw_addrs.append(listener) + # both processes above give a list of strings of the form host:port + proxy_addrs = [] + for proxy in raw_addrs: + proxy_pair = proxy.split(":") + proxy_addrs.append(tuple((proxy_pair[0], int(proxy_pair[1])))) + return proxy_addrs + def is_feature_enabled(self, feature): """ Checks if a control connection feature is enabled. These features can be diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4388cdc..5c146e0 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -458,6 +458,17 @@ class TestController(unittest.TestCase): controller.load_conf(oldconf) controller.save_conf() + def test_get_socks_ports(self): + """ + Test Controller.get_socks_ports against a running tor instance. + """ + if test.runner.require_control(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + self.assertEqual([('127.0.0.1', 1112)], controller.get_socks_ports()) + def test_enable_feature(self): """ Test Controller.enable_feature with valid and invalid inputs. diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 400d795..f3849eb 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -8,7 +8,7 @@ import unittest import stem.socket import stem.version -from stem import InvalidRequest, ProtocolError +from stem import InvalidArguments, InvalidRequest, ProtocolError from stem.control import _parse_circ_path, Controller, EventType from test import mocking @@ -76,4 +76,55 @@ class TestControl(unittest.TestCase): # EventType.SIGNAL was added in tor version 0.2.3.1-alpha self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.SIGNAL) + + def test_socks_port_old_tor(self): + """ + Exercises the get_socks_ports method as if talking to an old tor process. + """ + + # An old tor raises stem.InvalidArguments for get_info about socks, but + # get_socks_ports returns the socks information, anyway. + mocking.mock_method(Controller, "get_info", mocking.raise_exception(InvalidArguments)) + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "9050", + ("SocksListenAddress", "multiple=True"): ["127.0.0.1"] + }, method = True)) + self.assertEqual([('127.0.0.1', 9050)], self.controller.get_socks_ports()) + + # Again, an old tor, but SocksListenAddress overrides the port number. + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "9050", + ("SocksListenAddress", "multiple=True"): ["127.0.0.1:1112"] + }, method = True)) + self.assertEqual([('127.0.0.1', 1112)], self.controller.get_socks_ports()) + + # Again, an old tor, but multiple listeners + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "9050", + ("SocksListenAddress", "multiple=True"): ["127.0.0.1:1112", "127.0.0.1:1114"] + }, method = True)) + self.assertEqual([('127.0.0.1', 1112), ('127.0.0.1', 1114)], self.controller.get_socks_ports()) + + # Again, an old tor, but no SOCKS listeners + mocking.mock_method(Controller, "get_conf", mocking.return_for_args({ + ("SocksPort",): "0", + ("SocksListenAddress", "multiple=True"): [] + }, method = True)) + self.assertEqual([], self.controller.get_socks_ports()) + + def test_socks_port_new_tor(self): + """ + Exercises the get_socks_ports method as if talking to a newer tor process. + """ + + # multiple SOCKS listeners + mocking.mock_method(Controller, "get_info", mocking.return_value( + "\"127.0.0.1:1112\" \"127.0.0.1:1114\"" + )) + self.assertEqual([('127.0.0.1', 1112), ('127.0.0.1', 1114)], + self.controller.get_socks_ports()) + + # no SOCKS listeners + mocking.mock_method(Controller, "get_info", mocking.return_value("")) + self.assertEqual([], self.controller.get_socks_ports())

1 0

[stem/master] Replace SocksPort with SocksListenAddress in base torrc
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit 667cafa0c5fbdcc74dfb781ef8f55ac84d727112 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 22 06:14:37 2012 -0700 Replace SocksPort with SocksListenAddress in base torrc This is the most widely accepted format for specifying a SOCKS port, it works with tor 0.2.1.x - 0.2.4.x. SocksPort is preferred for tor 0.2.4.x and later, but this also acceptable. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/runner.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/runner.py b/test/runner.py index 9cdf509..f3e44f3 100644 --- a/test/runner.py +++ b/test/runner.py @@ -68,11 +68,14 @@ STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) SUBSTATUS_ATTR = (term.Color.BLUE, ) ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) +SOCKS_HOST = "127.0.0.1" +SOCKS_PORT = 1112 + BASE_TORRC = """# configuration for stem integration tests -DataDirectory %s -SocksPort 1112 +DataDirectory %%s +SocksListenAddress %s:%i DownloadExtraInfo 1 -""" +""" % (SOCKS_HOST, SOCKS_PORT) # We make some paths relative to stem's base directory (the one above us) # rather than the process' cwd. This doesn't end with a slash.

1 0