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

[orbot/master] enable app conflict checker for samsung users
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit ac6cdb70ba018e515de97c1a87ed9d3de84b1ad1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 12:42:49 2014 -0400 enable app conflict checker for samsung users --- src/org/torproject/android/Orbot.java | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index f444921..678b98d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -295,21 +295,25 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void appConflictChecker () { - boolean debug = TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean("pref_enable_logging",false); + SharedPreferences sprefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + boolean showAppConflict = sprefs.getBoolean("pref_show_conflict",true); - if (debug) + String[] badApps = {"com.sec.msc.nts.android.proxy"}; + + for (String badApp : badApps) { - String[] badApps = {"com.sec.msc.nts.android.proxy"}; + if (appInstalledOrNot(badApp)) + { + if (showAppConflict) + showAlert(getString(R.string.app_conflict),getString(R.string.please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_) + badApp,true); - for (String badApp : badApps) - { - if (appInstalledOrNot(badApp)) - { - showAlert("App Conflict","Please disable this app in Android settings if you are having problems with Orbot: " + badApp,true); - break; - } - } + appendLogTextAndScroll(getString(R.string.please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_) + badApp); + } } + + sprefs.edit().putBoolean("pref_show_conflict", false).commit(); + }

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit 5a9b9dc5b10eefee93089392d9529c62e14a6e1a Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 13:11:32 2014 -0400 update changelog --- CHANGELOG | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cad40f6..537b648 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,15 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +f13269f update to 14.0.5.3 +28877b1 new strings for app conflict checker function +ac6cdb7 enable app conflict checker for samsung users +1801ec1 don't stop Tor when service is destroyed() +113b189 update to latest OpenSSL 1.0.1i for important fixes +888b7cd update version to latest OpenSSL 1.0.1i +c517d0f Notification fix and change in finding existing process - Only build expanded notification on supported platforms - If service +387e74e bump to 14.0.5.2 +5b014da update changelog + 03b39ea make sure to clean up ps process/shell e3385ab fixes for Tor processs tracking, control port, and start/stop 8481e61 update to 14.0.5.1

1 0

[orbot/master] update to 14.0.5.3
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit f13269fae2b733f1d0b3d2bcfa0dc328296ca02c Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 13:10:56 2014 -0400 update to 14.0.5.3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 14c2a21..3fd3b4f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.5.2" - android:versionCode="115" + android:versionName="14.0.5.3" + android:versionCode="116" android:installLocation="auto" >

1 0

[orbot/master] new strings for app conflict checker function
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit 28877b12e2118a25b8e13c714b1cff01f592de84 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 12:43:00 2014 -0400 new strings for app conflict checker function --- res/raw/obfsclient.mp3 | Bin 0 -> 809784 bytes res/raw/polipo.mp3 | Bin 0 -> 123237 bytes res/raw/tor.mp3 | Bin 0 -> 1694866 bytes res/raw/xtables.mp3 | Bin 0 -> 152674 bytes res/values/strings.xml | 2 ++ 5 files changed, 2 insertions(+) diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 new file mode 100644 index 0000000..4573599 Binary files /dev/null and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 new file mode 100644 index 0000000..95cb16d Binary files /dev/null and b/res/raw/polipo.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..cf441cb Binary files /dev/null and b/res/raw/tor.mp3 differ diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 new file mode 100644 index 0000000..ebef599 Binary files /dev/null and b/res/raw/xtables.mp3 differ diff --git a/res/values/strings.xml b/res/values/strings.xml index 6ee02f8..91264a8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -278,6 +278,8 @@ <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string> <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> <string name="your_tor_public_ips_">Your Tor Public IPs:</string> + <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string> + <string name="app_conflict">App Conflict</string> </resources>

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit affc7ba2ffcdff48aa89e667f6d4da8c9ebcd36a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 16:45:41 2014 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index db96aef..519f12f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -59,6 +59,6 @@ <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> -<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“transport obfs3”）。由于为了防止封锁者获取大量网桥地址，你必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。由于为了防止攻击者获取大量网桥地址，必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> -<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh(a)rt.torproject.org).xn--,-ny6a9go5tm3jb1cb9a7ykqznm8ni2c559c8l1c0mll5cfqb."> +<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。">

1 0

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

07 Aug '14

commit 31424d614444cd4e062d0643caab6bedb0d154ea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 16:45:35 2014 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index db96aef..519f12f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -59,6 +59,6 @@ <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> -<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“transport obfs3”）。由于为了防止封锁者获取大量网桥地址，你必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。由于为了防止攻击者获取大量网桥地址，必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> -<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh(a)rt.torproject.org).xn--,-ny6a9go5tm3jb1cb9a7ykqznm8ni2c559c8l1c0mll5cfqb."> +<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。">

1 0

[ooni-probe/master] The blocking/http_requests test actually requires Tor to be running.
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 570b852a8a83398e68ccd01296aa0e044ede8a58 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:46:53 2014 +0200 The blocking/http_requests test actually requires Tor to be running. (cherry picked from commit 5e06ad7c2862dd90dc8ba054de4d88abeea1fbe2) --- ooni/nettests/blocking/http_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/http_requests.py b/ooni/nettests/blocking/http_requests.py index e5524ee..dd74b6c 100644 --- a/ooni/nettests/blocking/http_requests.py +++ b/ooni/nettests/blocking/http_requests.py @@ -40,7 +40,7 @@ class HTTPRequestsTest(httpt.HTTPTest): inputFile = ['file', 'f', None, 'List of URLS to perform GET and POST requests to'] requiresRoot = False - requiresTor = False + requiresTor = True # These values are used for determining censorship based on response body # lengths

1 0

[ooni-probe/master] Fixed https://trac.torproject.org/projects/tor/ticket/11983 with the addition of some checks of incoherences in:
by art＠torproject.org 07 Aug '14

07 Aug '14

commit a49fc8391e145b0559bad4193c0e726d49d4a409 Author: kudrom <kudrom(a)riseup.net> Date: Sun Jul 13 22:49:25 2014 +0200 Fixed https://trac.torproject.org/projects/tor/ticket/11983 with the addition of some checks of incoherences in: * advanced:start_tor, tor:socks_port and tor:control_port * advanced:interface --- ooni/settings.py | 84 +++++++++++++++++++++++++++++++++----- ooni/tests/test_oonicli.py | 1 + ooni/tests/test_settings.py | 95 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 11 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index 07a0039..91d2f76 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -3,10 +3,15 @@ import sys import yaml import getpass +from twisted.internet import defer, reactor +from twisted.internet.endpoints import TCP4ClientEndpoint + from os.path import abspath, expanduser +from scapy.all import get_if_list +import txtorcon -from ooni import geoip -from ooni.utils import Storage +from ooni import otime, geoip +from ooni.utils import Storage, log class OConfig(object): @@ -93,10 +98,9 @@ class OConfig(object): else: w.write(line) + @defer.inlineCallbacks def read_config_file(self): - try: - with open(self.config_file) as f: pass - except IOError: + if not os.path.exists(self.config_file): print "Configuration file does not exist." self._create_config_file() self.read_config_file() @@ -105,12 +109,70 @@ class OConfig(object): config_file_contents = '\n'.join(f.readlines()) configuration = yaml.safe_load(config_file_contents) - for setting in ['basic', 'reports', 'advanced', 'privacy', 'tor']: - try: - for k, v in configuration[setting].items(): - getattr(self, setting)[k] = v - except AttributeError: - pass + for setting in configuration.keys(): + if setting in dir(self): + for k, v in configuration[setting].items(): + getattr(self, setting)[k] = v self.set_paths() + # The incoherent checks must be performed after OConfig is in a valid state to runWithDirector + coherent = yield self.check_incoherences(configuration) + if not coherent: + sys.exit(6) + + @defer.inlineCallbacks + def check_incoherences(self, configuration): + incoherent = [] + deferreds = [] + + if not configuration['advanced']['start_tor']: + if not 'socks_port' in configuration['tor']: + incoherent.append('tor:socks_port') + if not 'control_port' in configuration['tor']: + incoherent.append('tor:control_port') + if 'socks_port' in configuration['tor'] and 'control_port' in configuration['tor']: + # Check if tor is listening in these ports + @defer.inlineCallbacks + def cb(state): + timeout_call.cancel() + result = yield state.protocol.get_info("net/listeners/socks") + if result["net/listeners/socks"].split(':')[1] != str(configuration['tor']['socks_port']): + incoherent.append('tor:socks_port') + + def err(failure): + incoherent.append('tor:socks_port') + if timeout_call.active: + timeout_call.cancel() + + def timeout(): + incoherent.append('tor:control_port') + if not d.called: + d.errback() + + connection = TCP4ClientEndpoint(reactor, "localhost", configuration['tor']['control_port']) + d = txtorcon.build_tor_connection(connection) + d.addCallback(cb) + d.addErrback(err) + deferreds.append(d) + timeout_call = reactor.callLater(30, timeout) + + if configuration['advanced']['interface'] != 'auto' and configuration['advanced']['interface'] not in get_if_list(): + incoherent.append('advanced:interface') + + deferred_list = defer.DeferredList(deferreds) + yield deferred_list + if len(incoherent) > 0: + if len(incoherent) > 1: + incoherent_pretty = ", ".join(incoherent[:-1]) + ' and ' + incoherent[-1] + else: + incoherent_pretty = incoherent[0] + log.err("You must set properly %s in %s." % (incoherent_pretty, self.config_file)) + defer.returnValue(False) + defer.returnValue(True) + + def generate_pcap_filename(self, testDetails): + test_name, start_time = testDetails['test_name'], testDetails['start_time'] + start_time = otime.epochToTimestamp(start_time) + return "report-%s-%s.%s" % (test_name, start_time, "pcap") + config = OConfig() diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 92da134..f4b4a49 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -147,6 +147,7 @@ class TestRunDirector(ConfigTestCase): @defer.inlineCallbacks def test_http_header_field_manipulation(self): + self.skipTest("Packets to 64.9.255.221:80 seems to be filtered.") def verify_function(entry): assert 'agent' in entry assert 'requests' in entry diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py new file mode 100644 index 0000000..b28c1b2 --- /dev/null +++ b/ooni/tests/test_settings.py @@ -0,0 +1,95 @@ +import random + +from twisted.trial import unittest +from twisted.internet import defer, reactor +from twisted.internet.protocol import Protocol, Factory +from scapy.all import get_if_list +import txtorcon + +from ooni.settings import OConfig + + +class TestSettings(unittest.TestCase): + def setUp(self): + self.conf = OConfig() + self.configuration = {'advanced': {'interface': 'auto', + 'start_tor': True}, + 'tor': {}} + self.silly_listener = None + self.tor_protocol = None + + def tearDown(self): + if self.silly_listener is not None: + self.silly_listener.stopListening() + + def run_tor(self): + def progress(percent, tag, summary): + ticks = int((percent/100.0) * 10.0) + prog = (ticks * '#') + ((10 - ticks) * '.') + print '%s %s' % (prog, summary) + + config = txtorcon.TorConfig() + config.SocksPort = self.configuration['tor']['socks_port'] + config.ControlPort = self.configuration['tor']['control_port'] + d = txtorcon.launch_tor(config, reactor, progress_updates=progress) + return d + + def run_silly_server(self): + class SillyProtocol(Protocol): + def __init__(self, factory): + self.factory = factory + + class SillyFactory(Factory): + protocol = SillyProtocol + + self.silly_listener = reactor.listenTCP(self.configuration['tor']['socks_port'], SillyFactory()) + + @defer.inlineCallbacks + def test_vanilla_configuration(self): + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, True) + + @defer.inlineCallbacks + def test_check_incoherences_start_tor_missing_options(self): + self.configuration['advanced']['start_tor'] = False + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, False) + self.configuration['tor'] = {'socks_port': 9999} + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, False) + self.configuration['tor']['control_port'] = 9998 + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, False) + + @defer.inlineCallbacks + def test_check_incoherences_start_tor_correct(self): + self.configuration['advanced']['start_tor'] = False + self.configuration['tor'] = {'socks_port': 9999} + self.configuration['tor']['control_port'] = 9998 + self.tor_process = yield self.run_tor() + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, True) + self.tor_process.transport.signalProcess('TERM') + + d = defer.Deferred() + reactor.callLater(10, d.callback, None) + yield d + + @defer.inlineCallbacks + def test_check_incoherences_start_tor_silly_listener(self): + self.configuration['advanced']['start_tor'] = False + self.configuration['tor'] = {'socks_port': 9999} + self.configuration['tor']['control_port'] = 9998 + self.run_silly_server() + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, False) + + @defer.inlineCallbacks + def test_check_incoherences_interface(self): + self.configuration['advanced']['interface'] = 'funky' + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, False) + + self.configuration['advanced']['interface'] = random.choice(get_if_list()) + ret = yield self.conf.check_incoherences(self.configuration) + self.assertEqual(ret, True)

1 0

[ooni-probe/master] Check empty section in config file to avoid AttributeErrors exceptions when parsing the file.
by art＠torproject.org 07 Aug '14

07 Aug '14

commit ded4aefe260fd102d00b03371f546dca0230ea15 Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 4 19:53:34 2014 +0200 Check empty section in config file to avoid AttributeErrors exceptions when parsing the file. --- ooni/settings.py | 2 +- ooni/tests/test_oonicli.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index 5bc367e..cbf96cb 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -111,7 +111,7 @@ class OConfig(object): configuration = yaml.safe_load(config_file_contents) for setting in configuration.keys(): - if setting in dir(self): + if setting in dir(self) and configuration[setting] is not None: for k, v in configuration[setting].items(): getattr(self, setting)[k] = v self.set_paths() diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index f4b4a49..92da134 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -147,7 +147,6 @@ class TestRunDirector(ConfigTestCase): @defer.inlineCallbacks def test_http_header_field_manipulation(self): - self.skipTest("Packets to 64.9.255.221:80 seems to be filtered.") def verify_function(entry): assert 'agent' in entry assert 'requests' in entry

1 0

[ooni-probe/master] Make the filename generation unittests check for the correct filename
by art＠torproject.org 07 Aug '14

07 Aug '14

commit c82f7daefe655188dc5e4831048be9f88ad199e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:03:04 2014 +0200 Make the filename generation unittests check for the correct filename --- ooni/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index c17235a..5056b75 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -46,19 +46,19 @@ class TestUtils(unittest.TestCase): def test_generate_filename(self): filename = generate_filename(self.test_details) - self.assertEqual(filename, 'foo-1') + self.assertEqual(filename, 'foo-1970-01-01T000001Z') def test_generate_filename_with_extension(self): filename = generate_filename(self.test_details, extension=self.extension) - self.assertEqual(filename, 'foo-1.ext') + self.assertEqual(filename, 'foo-1970-01-01T000001Z.ext') def test_generate_filename_with_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix) - self.assertEqual(filename, 'prefix-foo-1') + self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z') def test_generate_filename_with_extension_and_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix, extension=self.extension) - self.assertEqual(filename, 'prefix-foo-1.ext') + self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z.ext') def test_generate_filename_with_filename(self): filename = generate_filename(self.test_details, filename=self.filename)

1 0