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

[stem/master] Make our new process tests work with python3
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 74275db8403948d14159f7968f3e8f45487bc45b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 14:08:47 2015 -0800 Make our new process tests work with python3 --- test/integ/process.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index a6191b6..b1fbe73 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -15,6 +15,7 @@ import unittest import stem.prereq import stem.process import stem.socket +import stem.util.str_tools import stem.util.system import stem.util.tor_tools import stem.version @@ -98,10 +99,15 @@ class TestProcess(unittest.TestCase): # I'm not gonna even pretend to understand the following. Ported directly # from tor's test_cmdline_args.py. - output_hex = binascii.a2b_hex(output.strip()[3:]) - salt, how, hashed = output_hex[:8], ord(output_hex[8]), output_hex[9:] + if stem.prereq.is_python_3(): + output_hex = binascii.a2b_hex(stem.util.str_tools._to_bytes(output).strip()[3:]) + salt, how, hashed = output_hex[:8], output_hex[8], output_hex[9:] + else: + output_hex = binascii.a2b_hex(output.strip()[3:]) + salt, how, hashed = output_hex[:8], ord(output_hex[8]), output_hex[9:] + count = (16 + (how & 15)) << ((how >> 4) + 6) - stuff = salt + 'my_password' + stuff = salt + b'my_password' repetitions = count // len(stuff) + 1 inp = (stuff * repetitions)[:count] @@ -129,8 +135,8 @@ class TestProcess(unittest.TestCase): torrc_contents = [line for line in test.runner.get_runner().get_torrc_contents().splitlines() if not line.startswith('#')] - self.assertItemsEqual(torrc_contents, short_output.strip().splitlines()) - self.assertItemsEqual(torrc_contents, non_builtin_output.strip().splitlines()) + self.assertEqual(sorted(torrc_contents), sorted(short_output.strip().splitlines())) + self.assertEqual(sorted(torrc_contents), sorted(non_builtin_output.strip().splitlines())) for line in torrc_contents: self.assertTrue(line in full_output) @@ -223,7 +229,7 @@ class TestProcess(unittest.TestCase): torrc = BASIC_RELAY_TORRC % self.data_directory output = self.run_tor('-f', '-', '--dump-config', 'short', stdin = torrc) - self.assertItemsEqual(torrc.splitlines(), output.splitlines()) + self.assertEqual(sorted(torrc.splitlines()), sorted(output.splitlines())) def test_with_missing_torrc(self): """ @@ -419,7 +425,7 @@ class TestProcess(unittest.TestCase): tor_process = subprocess.Popen(args, stdin = subprocess.PIPE, stdout = subprocess.PIPE) if stdin: - tor_process.stdin.write(stdin) + tor_process.stdin.write(stem.util.str_tools._to_bytes(stdin)) stdout = tor_process.communicate()[0] exit_status = tor_process.poll() @@ -429,4 +435,4 @@ class TestProcess(unittest.TestCase): elif not exit_status and expect_failure: self.fail("Tor failed to start when we ran: %s\n%s" % (' '.join(args), stdout)) - return stdout + return stem.util.str_tools._to_unicode(stdout) if stem.prereq.is_python_3() else stdout

1 0

[stem/master] Test additional configuration use cases
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 7d7a1162b428ceb60a0a684ceadd7e9fff9c81e9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 13:48:13 2015 -0800 Test additional configuration use cases Test for specifying a configuration via arguments, stdin, or torrc that doesn't exist. --- test/integ/process.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index b9b168a..a6191b6 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -28,9 +28,10 @@ except ImportError: BASIC_RELAY_TORRC = """\ ORPort 6000 +ExtORPort 6001 Nickname stemIntegTest ExitPolicy reject *:* -PublishServerDescriptor 0 # don't actually publish to the dirauths +PublishServerDescriptor 0 DataDirectory %s """ @@ -182,6 +183,61 @@ class TestProcess(unittest.TestCase): self.assertTrue('UseBridges' in output) self.assertTrue('SocksPort' in output) + def test_torrc_arguments(self): + """ + Pass configuration options on the commandline. + """ + + torrc_path = os.path.join(self.data_directory, 'torrc') + + with open(torrc_path, 'w') as torrc_file: + torrc_file.write(BASIC_RELAY_TORRC % self.data_directory) + + config_args = [ + '+ORPort', '9003', # appends an extra ORPort + 'SocksPort', '9090', + '/ExtORPort', # drops our ExtORPort + '/TransPort', # drops a port we didn't originally have + '+ControlPort', '9005', # appends a ControlPort where we didn't have any before + ] + + output = self.run_tor('-f', torrc_path, '--dump-config', 'short', *config_args) + result = [line for line in output.splitlines() if not line.startswith('DataDirectory')] + + expected = [ + 'ControlPort 9005', + 'ExitPolicy reject *:*', + 'Nickname stemIntegTest', + 'ORPort 6000', + 'ORPort 9003', + 'PublishServerDescriptor 0', + 'SocksPort 9090', + ] + + self.assertEqual(expected, result) + + def test_torrc_arguments_via_stdin(self): + """ + Pass configuration options via stdin. + """ + + torrc = BASIC_RELAY_TORRC % self.data_directory + output = self.run_tor('-f', '-', '--dump-config', 'short', stdin = torrc) + self.assertItemsEqual(torrc.splitlines(), output.splitlines()) + + def test_with_missing_torrc(self): + """ + Provide a torrc path that doesn't exist. + """ + + output = self.run_tor('-f', '/path/that/really/shouldnt/exist', '--verify-config', expect_failure = True) + self.assertTrue('[warn] Unable to open configuration file "/path/that/really/shouldnt/exist".' in output) + self.assertTrue('[err] Reading config failed--see warnings above.' in output) + + output = self.run_tor('-f', '/path/that/really/shouldnt/exist', '--verify-config', '--ignore-missing-torrc') + self.assertTrue('[notice] Configuration file "/path/that/really/shouldnt/exist" not present, using reasonable defaults.' in output) + self.assertTrue('Configuration was valid' in output) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config. @@ -351,6 +407,7 @@ class TestProcess(unittest.TestCase): expect_failure = kwargs.pop('expect_failure', False) with_torrc = kwargs.pop('with_torrc', False) + stdin = kwargs.pop('stdin', None) if kwargs: raise ValueError("Got unexpected keyword arguments: %s" % kwargs) @@ -359,7 +416,10 @@ class TestProcess(unittest.TestCase): args = ['-f', test.runner.get_runner().get_torrc_path()] + list(args) args = [test.runner.get_runner().get_tor_command()] + list(args) - tor_process = subprocess.Popen(args, stdout = subprocess.PIPE) + tor_process = subprocess.Popen(args, stdin = subprocess.PIPE, stdout = subprocess.PIPE) + + if stdin: + tor_process.stdin.write(stdin) stdout = tor_process.communicate()[0] exit_status = tor_process.poll()

1 0

[stem/master] Test tor's commandline arguments
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 137d193a026638f066e817e3396cebbbb6ace012 Merge: bbba24e 74275db Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 20:27:50 2015 -0800 Test tor's commandline arguments Moving a revised version of tor's test_cmdline_args.py into our process tests. Now that tor has a make target for using Stem to supplement its tests this is the right home for them. https://trac.torproject.org/projects/tor/ticket/14109 test/integ/process.py | 271 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+)

1 0

[tor/master] Reserve enough space for rend_service_port_config_t
by arma＠torproject.org 09 Feb '15

09 Feb '15

commit 37d16c3cc78151daf2cbebd643ea4d64b504989e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 04:48:16 2015 +0100 Reserve enough space for rend_service_port_config_t In #14803, Damian noticed that his Tor sometimes segfaults. Roger noted that his valgrind gave an invalid write of size one here. Whenever we use FLEXIBLE_ARRAY_MEMBER, we have to make sure to actually malloc a thing that's large enough. Fixes bug #14803, not in any released version of Tor. --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6ae569c..6c934c8 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -314,7 +314,7 @@ static rend_service_port_config_t * rend_service_port_config_new(const char *socket_path) { if (!socket_path) - return tor_malloc_zero(sizeof(rend_service_port_config_t)); + return tor_malloc_zero(sizeof(rend_service_port_config_t) + 1); const size_t pathlen = strlen(socket_path) + 1; rend_service_port_config_t *conf =

1 0

[webwml/master] give an extra help for people confused by os x gatekeeper
by arma＠torproject.org 09 Feb '15

09 Feb '15

commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Feb 8 21:29:09 2015 -0500 give an extra help for people confused by os x gatekeeper --- projects/en/torbrowser.wml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 95ae518..99e80ed 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -516,7 +516,10 @@ <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> <p>Download the file above, save it somewhere, then click on it. - This opens the .dmg file. Drag the included file into your Applications folder and you will + This opens the .dmg file. (On recent versions of OS X, you might get + a warning that it's from an "unidentified developer" — you can + get around this complaint by <a href="https://tor.stackexchange.com/questions/1187/my-osx-is-saying-torbrowserbun…">control-clicking and selecting "open"</a>.) + Drag the included file into your Applications folder and you will have a Tor Browser application in your chosen language that you can pin on your Dock.</p> </div>

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 09 Feb '15

09 Feb '15

commit f23c282edf700178c16f50f7ccd97d3c431b8c61 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 9 02:15:56 2015 +0000 Update translations for tor-and-https_completed --- he.po | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/he.po b/he.po new file mode 100644 index 0000000..a90944b --- /dev/null +++ b/he.po @@ -0,0 +1,138 @@ +# +# Translators: +# dave nicetry <ndvnis(a)gmail.com>, 2014 +# lee grain <leegrain(a)gmail.com>, 2015 +# Ruben <drarbib(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2015-02-09 01:51+0000\n" +"Last-Translator: lee grain <leegrain(a)gmail.com>\n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "rtl" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor ו HTTPS" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Site.com" +msgstr "Site.com" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "user / pw" +msgstr "משתמש" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "data" +msgstr "נתונים" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "location" +msgstr "מיקום" + +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "WiFi" +msgstr "WIFI" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "ISP" +msgstr "ספק אינטרנט" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Hacker" +msgstr "האקר" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr " עורך דין" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Sysadmin" +msgstr "מנהל מערכת" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Police" +msgstr "משטרה" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "NSA" +msgstr "הסוכנות לביטחון לאומי האמריקאית" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Tor relay" +msgstr "ממסר Tor" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "מפתח" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "חיבור אינטרנט" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "צתות" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr "שיתוף נתונים"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 09 Feb '15

09 Feb '15

commit 10c6b3c2b23245a9a4674521d63df3cf75629410 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 9 02:15:50 2015 +0000 Update translations for tor-and-https --- he.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/he.po b/he.po index f235ae6..a90944b 100644 --- a/he.po +++ b/he.po @@ -1,13 +1,14 @@ # # Translators: # dave nicetry <ndvnis(a)gmail.com>, 2014 +# lee grain <leegrain(a)gmail.com>, 2015 # Ruben <drarbib(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2014-12-31 10:22+0000\n" -"Last-Translator: Ruben <drarbib(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-09 01:51+0000\n" +"Last-Translator: lee grain <leegrain(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,14 +35,14 @@ msgstr "Tor ו HTTPS" #: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" -msgstr "" +msgstr "Site.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". #: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" -msgstr "" +msgstr "משתמש" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". @@ -62,7 +63,7 @@ msgstr "מיקום" #: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WIFI" #. (itstool) path: defs/text #. Keep it short: 4em max. @@ -116,7 +117,7 @@ msgstr "ממסר Tor" #: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "מפתח" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 @@ -134,4 +135,4 @@ msgstr "צתות" #: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" -msgstr "" +msgstr "שיתוף נתונים"

1 0

[webwml/master] Add George as a potential mentor of the HS project
by atagar＠torproject.org 08 Feb '15

08 Feb '15

commit 1b53532871a3a65da9c4487a36188bdff6fad211 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 13:08:37 2015 -0800 Add George as a potential mentor of the HS project --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 92bf903..ab1b164 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1368,7 +1368,7 @@ the codebase that you want to work on. <br> Skill Level: <i>Medium</i> <br> - Likely Mentors: <i>David (dgoulet)</i> + Likely Mentors: <i>David (dgoulet), George (asn)</i> <p> We're working on a revamp of the entire Tor hidden service design to improve the security and reliability of the hidden service system.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 08 Feb '15

08 Feb '15

commit b149d9eb950d45057cc3cef3e76de3ad812bc826 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 8 18:45:28 2015 +0000 Update translations for torbirdy_completed --- fi/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd index 74950a0..88d3d88 100644 --- a/fi/torbirdy.dtd +++ b/fi/torbirdy.dtd @@ -24,7 +24,7 @@ <!ENTITY torbirdy.prefs.recommended.key "R"> <!ENTITY torbirdy.prefs.anonservice.text "Valitse anonymisointipalvelu"> <!ENTITY torbirdy.prefs.anonservice.key "p"> -<!ENTITY torbirdy.prefs.customsettings.text "Aseta välityspalvelinasetukset käsin"> +<!ENTITY torbirdy.prefs.customsettings.text "Käytä omia välityspalvelinasetuksia"> <!ENTITY torbirdy.prefs.customsettings.key "p"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS isäntä:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> @@ -33,7 +33,7 @@ <!ENTITY torbirdy.prefs.torification.label "Läpinäkyvä Torifikaatio (varoitus: vaatii mukautetun transproxyn tai Tor-reitittimen)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Universaali"> -<!ENTITY torbirdy.prefs.imap.label "Salli sähköpostituen antamisen IMAP-tunnuksille [oletus: pois käytöstä]"> +<!ENTITY torbirdy.prefs.imap.label "Ota käyttöön push-sähköpostituki IMAP-tileille [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty kansio käynnistyessä [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.startup_folder.key "p">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 08 Feb '15

08 Feb '15

commit d0cd1919ff3de46a48e66d7102b4b8b7c45a7225 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 8 18:45:23 2015 +0000 Update translations for torbirdy --- fi/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd index 74950a0..88d3d88 100644 --- a/fi/torbirdy.dtd +++ b/fi/torbirdy.dtd @@ -24,7 +24,7 @@ <!ENTITY torbirdy.prefs.recommended.key "R"> <!ENTITY torbirdy.prefs.anonservice.text "Valitse anonymisointipalvelu"> <!ENTITY torbirdy.prefs.anonservice.key "p"> -<!ENTITY torbirdy.prefs.customsettings.text "Aseta välityspalvelinasetukset käsin"> +<!ENTITY torbirdy.prefs.customsettings.text "Käytä omia välityspalvelinasetuksia"> <!ENTITY torbirdy.prefs.customsettings.key "p"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS isäntä:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> @@ -33,7 +33,7 @@ <!ENTITY torbirdy.prefs.torification.label "Läpinäkyvä Torifikaatio (varoitus: vaatii mukautetun transproxyn tai Tor-reitittimen)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Universaali"> -<!ENTITY torbirdy.prefs.imap.label "Salli sähköpostituen antamisen IMAP-tunnuksille [oletus: pois käytöstä]"> +<!ENTITY torbirdy.prefs.imap.label "Ota käyttöön push-sähköpostituki IMAP-tileille [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty kansio käynnistyessä [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.startup_folder.key "p">

1 0