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

[ooni-probe/master] Add support to the sniffer subsystem in the vagrant and requirements file
by art＠torproject.org 05 Aug '14

05 Aug '14

commit 33c25f08b6fe7f655a54495c8762f9503949e5ea Author: kudrom <kudrom(a)riseup.net> Date: Sat Jul 19 19:04:51 2014 +0200 Add support to the sniffer subsystem in the vagrant and requirements file --- Vagrantfile | 3 +++ requirements.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 3d4b81d..419f0c6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -32,6 +32,9 @@ apt-get update apt-get install -y tor deb.torproject.org-keyring apt-get install -y ooniprobe geoip-database-contrib +# Setup for sniffer subsystem +apt-get install -y build-essential libdnet-dev libpcap-dev python-dev python-pip python-networkx +pip install PyDNET graphillion echo "Login using 'vagrant ssh', and dont forget to run ooniprobe as root." echo "First run: 'sudo ooniprobe -i /usr/share/ooni/decks/fast.deck'" diff --git a/requirements.txt b/requirements.txt index 3fb0142..719d994 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,6 @@ txsocksx>=0.0.2 parsley>=1.1 scapy-real>=2.2.0-dev pypcap>=1.1 +PyDNET +graphillion +networkx

1 0

[ooni-probe/master] Added tests to the sniffer subsystem
by art＠torproject.org 05 Aug '14

05 Aug '14

commit 9b27ebd5ccd1b75e8f7fb2c5acc00d35da6bd70d Author: kudrom <kudrom(a)riseup.net> Date: Sun Jul 20 20:09:24 2014 +0200 Added tests to the sniffer subsystem --- ooni/director.py | 21 ++++++-------- ooni/reporter.py | 13 +++------ ooni/settings.py | 2 +- ooni/tests/test_director.py | 54 +++++++++++++++++++++++++++++++++++ ooni/tests/test_nettest.py | 4 +-- ooni/tests/test_oonicli.py | 65 +++++++++++++++++++++++++++++++++++++------ ooni/tests/test_reporter.py | 3 +- ooni/utils/__init__.py | 29 ++++++++++++++++--- 8 files changed, 154 insertions(+), 37 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 3634115..d48c18f 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -1,14 +1,13 @@ import os -import otime -from psutil import Process from ooni.managers import ReportEntryManager, MeasurementManager from ooni.reporter import Report -from ooni.utils import log, pushFilenameStack +from ooni.utils import log, generate_filename from ooni.utils.net import randomFreePort from ooni.nettest import NetTest, getNetTestInformation from ooni.settings import config from ooni import errors +from ooni.nettest import test_class_name_to_name from txtorcon import TorConfig, TorState, launch_tor, build_tor_connection @@ -191,7 +190,7 @@ class Director(object): self.totalMeasurementRuntime += measurement.runtime self.successfulMeasurements += 1 measurement.result = result - test_name = measurement.testInstance.__class__.__name__ + test_name = test_class_name_to_name(measurement.testInstance.name) sniffer = self.sniffers[test_name] config.scapyFactory.unRegisterProtocol(sniffer) sniffer.close() @@ -264,16 +263,14 @@ class Director(object): """ from ooni.utils.txscapy import ScapySniffer - test_name, start_time = testDetails['test_name'], testDetails['start_time'] - start_time = otime.epochToTimestamp(start_time) - suffix = "%s-%s.%s" % (test_name, start_time, "pcap") if not config.reports.pcap: - filename_pcap= "%s-%s" % ("report", suffix) + prefix = 'report' else: - filename_pcap = "%s-%s" % (config.reports.pcap, suffix) - - if len(self.sniffers) > 1: - pcap_filenames = set(sniffer.pcapwriter.filename for sniffer in self.sniffers) + prefix = config.reports.pcap + filename = config.global_options['reportfile'] if 'reportfile' in config.global_options.keys() else None + filename_pcap = generate_filename(testDetails, filename=filename, prefix=prefix, extension='pcap') + if len(self.sniffers) > 0: + pcap_filenames = set(sniffer.pcapwriter.filename for sniffer in self.sniffers.values()) pcap_filenames.add(filename_pcap) log.msg("pcap files %s can be messed up because several netTests are being executed in parallel." % ','.join(pcap_filenames)) diff --git a/ooni/reporter.py b/ooni/reporter.py index 44e6b96..5497ed5 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -30,7 +30,7 @@ except ImportError: from ooni import errors from ooni import otime -from ooni.utils import pushFilenameStack +from ooni.utils import pushFilenameStack, generate_filename from ooni.utils.net import BodyReceiver, StringProducer from ooni.settings import config @@ -171,17 +171,13 @@ class YAMLReporter(OReporter): """ - def __init__(self, test_details, report_destination='.', - report_filename=None): + def __init__(self, test_details, report_destination='.', report_filename=None): self.reportDestination = report_destination if not os.path.isdir(report_destination): raise errors.InvalidDestination - if not report_filename: - report_filename = "report-" + \ - test_details['test_name'] + "-" + \ - otime.timestamp() + ".yamloo" + report_filename = generate_filename(test_details, filename=report_filename, prefix='report', extension='yamloo') report_path = os.path.join(self.reportDestination, report_filename) @@ -553,8 +549,7 @@ class Report(object): self.report_log = OONIBReportLog() - self.yaml_reporter = YAMLReporter(test_details, - report_filename=report_filename) + self.yaml_reporter = YAMLReporter(test_details, report_filename=report_filename) self.report_filename = self.yaml_reporter.report_path self.oonib_reporter = None diff --git a/ooni/settings.py b/ooni/settings.py index 5bebc05..07a0039 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -5,7 +5,7 @@ import getpass from os.path import abspath, expanduser -from ooni import otime, geoip +from ooni import geoip from ooni.utils import Storage diff --git a/ooni/tests/test_director.py b/ooni/tests/test_director.py index da81731..38e8481 100644 --- a/ooni/tests/test_director.py +++ b/ooni/tests/test_director.py @@ -1,3 +1,5 @@ +import time + from mock import patch, MagicMock from ooni.settings import config @@ -51,3 +53,55 @@ class TestDirector(ConfigTestCase): assert config.tor.control_port == 4242 return director_start_tor() + + +class TestStartSniffing(unittest.TestCase): + def setUp(self): + self.director = Director() + self.testDetails = { + 'test_name': 'foo', + 'start_time': time.time() + } + + # Each NetTestCase has a name attribute + class FooTestCase(object): + name = 'foo' + self.FooTestCase = FooTestCase + + def test_start_sniffing_once(self): + with patch('ooni.settings.config.scapyFactory') as mock_scapy_factory: + with patch('ooni.utils.txscapy.ScapySniffer') as mock_scapy_sniffer: + self.director.startSniffing(self.testDetails) + sniffer = mock_scapy_sniffer.return_value + mock_scapy_factory.registerProtocol.assert_called_once_with(sniffer) + + def test_start_sniffing_twice(self): + with patch('ooni.settings.config.scapyFactory') as mock_scapy_factory: + with patch('ooni.utils.txscapy.ScapySniffer') as mock_scapy_sniffer: + sniffer = mock_scapy_sniffer.return_value + sniffer.pcapwriter.filename = 'foo1_filename' + self.director.startSniffing(self.testDetails) + self.assertEqual(len(self.director.sniffers), 1) + + self.testDetails = { + 'test_name': 'bar', + 'start_time': time.time() + } + with patch('ooni.utils.txscapy.ScapySniffer') as mock_scapy_sniffer: + sniffer = mock_scapy_sniffer.return_value + sniffer.pcapwriter.filename = 'foo2_filename' + self.director.startSniffing(self.testDetails) + self.assertEqual(len(self.director.sniffers), 2) + + def test_measurement_succeeded(self): + with patch('ooni.settings.config.scapyFactory') as mock_scapy_factory: + with patch('ooni.utils.txscapy.ScapySniffer') as mock_scapy_sniffer: + self.director.startSniffing(self.testDetails) + self.assertEqual(len(self.director.sniffers), 1) + measurement = MagicMock() + measurement.testInstance = self.FooTestCase() + self.director.measurementSucceeded('awesome', measurement) + self.assertEqual(len(self.director.sniffers), 0) + sniffer = mock_scapy_sniffer.return_value + mock_scapy_factory.unRegisterProtocol.assert_called_once_with(sniffer) + diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 7828c4b..5015c64 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -242,7 +242,7 @@ class TestNetTest(unittest.TestCase): ntl.checkOptions() director = Director() - self.filename = 'dummy_report.yaml' + self.filename = 'dummy_report.yamloo' d = director.startNetTest(ntl, self.filename) @d.addCallback @@ -306,7 +306,7 @@ class TestNettestTimeout(ConfigTestCase): ntl.checkOptions() director = Director() - self.filename = 'dummy_report.yaml' + self.filename = 'dummy_report.yamloo' d = director.startNetTest(ntl, self.filename) @d.addCallback diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index dd41c1d..3b37af0 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -2,15 +2,13 @@ import os import sys import yaml -from twisted.internet import defer -from twisted.trial import unittest +from twisted.internet import defer, reactor from ooni.tests import is_internet_connected from ooni.tests.bases import ConfigTestCase from ooni.settings import config from ooni.oonicli import runWithDirector - def verify_header(header): assert 'input_hashes' in header.keys() assert 'options' in header.keys() @@ -26,6 +24,34 @@ def verify_header(header): def verify_entry(entry): assert 'input' in entry +config_includepcap = """ +basic: + logfile: ~/.ooni/ooniprobe.log +privacy: + includeip: false + includeasn: true + includecountry: true + includecity: false + includepcap: true +reports: + pcap: null + collector: null +advanced: + geoip_data_dir: /usr/share/ooni/geoip + debug: false + interface: auto + start_tor: true + measurement_timeout: 60 + measurement_retries: 2 + measurement_concurrency: 10 + reporting_timeout: 80 + reporting_retries: 3 + reporting_concurrency: 15 + data_dir: /usr/share/ooni + oonid_api_port: 8042 +tor: +""" + class TestRunDirector(ConfigTestCase): def setUp(self): @@ -43,14 +69,18 @@ class TestRunDirector(ConfigTestCase): super(TestRunDirector, self).tearDown() if len(self.filenames) > 0: for filename in self.filenames: - os.remove(filename) + if os.path.exists(filename): + os.remove(filename) @defer.inlineCallbacks - def run_helper(self, test_name, args, verify_function): - output_file = 'test_report.yaml' + def run_helper(self, test_name, nettest_args, verify_function, ooni_args=[]): + output_file = 'test_report.yamloo' self.filenames.append(output_file) - sys.argv = ['', '-n', '-o', output_file, test_name] - sys.argv.extend(args) + oldargv = sys.argv + sys.argv = [''] + sys.argv.extend(ooni_args) + sys.argv.extend(['-n', '-o', output_file, test_name]) + sys.argv.extend(nettest_args) yield runWithDirector(False, False) with open(output_file) as f: entries = yaml.safe_load_all(f) @@ -62,6 +92,7 @@ class TestRunDirector(ConfigTestCase): verify_header(header) verify_entry(first_entry) verify_function(first_entry) + sys.argv = oldargv @defer.inlineCallbacks def test_http_requests(self): @@ -125,3 +156,21 @@ class TestRunDirector(ConfigTestCase): yield self.run_helper('manipulation/http_header_field_manipulation', ['-b', 'http://64.9.225.221'], verify_function) + + @defer.inlineCallbacks + def test_sniffing_activated(self): + filename = 'test_report.pcap' + self.filenames.append(filename) + conf_file = 'fake_config.conf' + with open(conf_file, 'w') as cfg: + cfg.writelines(config_includepcap) + self.filenames.append(conf_file) + + def verify_function(_): + assert os.path.exists(filename) + self.assertGreater(os.stat(filename).st_size, 0) + yield self.run_helper('blocking/http_requests', + ['-f', 'example-input.txt'], + verify_function, ooni_args=['-f', conf_file]) + + config.scapyFactory.connectionLost('') diff --git a/ooni/tests/test_reporter.py b/ooni/tests/test_reporter.py index a499eb3..06659fd 100644 --- a/ooni/tests/test_reporter.py +++ b/ooni/tests/test_reporter.py @@ -25,7 +25,8 @@ test_details = { 'software_name': 'spam', 'software_version': '1.0', 'input_hashes': [], - 'probe_asn': 'AS0' + 'probe_asn': 'AS0', + 'start_time': time.time() } oonib_new_report_message = { diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py index 3f47bd1..767e6d2 100644 --- a/ooni/utils/__init__.py +++ b/ooni/utils/__init__.py @@ -1,12 +1,9 @@ -import logging import string import random import glob -import yaml -import imp import os -from ooni import errors +from ooni import errors, otime class Storage(dict): """ @@ -102,3 +99,27 @@ def pushFilenameStack(filename): new_filename = "%s.%s" % (c_filename, new_idx) os.rename(f, new_filename) os.rename(filename, filename+".1") + + +def generate_filename(testDetails, prefix=None, extension=None, filename=None): + """ + Returns a filename for every test execution. + + It's used to assure that all files of a certain test have a common basename but different + extension. + """ + if filename is None: + test_name, start_time = testDetails['test_name'], testDetails['start_time'] + start_time = otime.epochToTimestamp(start_time) + suffix = "%s-%s" % (test_name, start_time) + basename = '%s-%s' % (prefix, suffix) if prefix is not None else suffix + final_filename = '%s.%s' % (basename, extension) if extension is not None else basename + else: + if extension is not None: + basename = filename.split('.')[0] if '.' in filename else filename + final_filename = '%s.%s' % (basename, extension) + else: + final_filename = filename + + return final_filename +

1 0

[ooni-probe/master] Detect default interface with the one that is the default gateway.
by art＠torproject.org 05 Aug '14

05 Aug '14

commit 34d402d34cc2a610538f8603809dd6753e48c783 Author: kudrom <kudrom(a)riseup.net> Date: Sun Jul 20 21:27:13 2014 +0200 Detect default interface with the one that is the default gateway. --- ooni/utils/txscapy.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 340885a..54b4102 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -124,13 +124,9 @@ def getAddresses(): def getDefaultIface(): """ Return the default interface or raise IfaceError """ - # XXX: currently broken on OpenVZ environments, because - # the routing table does not contain a default route - # Workaround: Set the default interface in ooniprobe.conf - networks = getNetworksFromRoutes() - for net in networks: - if net.is_private: - return net.iface + for route in read_routes(): + if route[2] == '0.0.0.0' and route[3] != 'lo': + return route[3] raise IfaceError

1 0

[ooni-probe/master] Run the unittests as root so that the scapy tests get run by travis
by art＠torproject.org 05 Aug '14

05 Aug '14

commit 7ab4ccd65259f618bcb2397bc0b58e82b28b5a04 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Aug 5 12:32:52 2014 +0200 Run the unittests as root so that the scapy tests get run by travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6bce942..6e5069b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ install: - pip install -r requirements-dev.txt # command to run tests, e.g. python setup.py test script: - - coverage run $(which trial) ooni + - sudo coverage run $(which trial) ooni after_success: - coveralls

1 0

[ooni-probe/master] Added tests to generate_filename
by art＠torproject.org 05 Aug '14

05 Aug '14

commit d3110ed5baaa5fb11eb85c5a844041f41de780b8 Author: kudrom <kudrom(a)riseup.net> Date: Sun Jul 20 20:40:40 2014 +0200 Added tests to generate_filename --- ooni/tests/test_utils.py | 40 +++++++++++++++++++++++++++++++++++++++- ooni/utils/__init__.py | 3 +-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index 7c2ab2d..c17235a 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -1,10 +1,20 @@ import os from twisted.trial import unittest -from ooni.utils import pushFilenameStack, log +from ooni.utils import pushFilenameStack, log, generate_filename class TestUtils(unittest.TestCase): + def setUp(self): + self.test_details = { + 'test_name': 'foo', + 'start_time': 1 + } + self.extension = 'ext' + self.prefix = 'prefix' + self.basename = 'filename' + self.filename = 'filename.txe' + def test_pushFilenameStack(self): basefilename = os.path.join(os.getcwd(), 'dummyfile') f = open(basefilename, "w+") @@ -33,3 +43,31 @@ class TestUtils(unittest.TestCase): ) for encoded_logmsg, logmsg in logmsgs: self.assertEqual(log.log_encode(logmsg), encoded_logmsg) + + def test_generate_filename(self): + filename = generate_filename(self.test_details) + self.assertEqual(filename, 'foo-1') + + def test_generate_filename_with_extension(self): + filename = generate_filename(self.test_details, extension=self.extension) + self.assertEqual(filename, 'foo-1.ext') + + def test_generate_filename_with_prefix(self): + filename = generate_filename(self.test_details, prefix=self.prefix) + self.assertEqual(filename, 'prefix-foo-1') + + 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') + + def test_generate_filename_with_filename(self): + filename = generate_filename(self.test_details, filename=self.filename) + self.assertEqual(filename, 'filename.txe') + + def test_generate_filename_with_extension_and_filename(self): + filename = generate_filename(self.test_details, extension=self.extension, filename=self.filename) + self.assertEqual(filename, 'filename.ext') + + def test_generate_filename_with_extension_and_basename(self): + filename = generate_filename(self.test_details, extension=self.extension, filename=self.basename) + self.assertEqual(filename, 'filename.ext') diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py index 14fe667..f770c02 100644 --- a/ooni/utils/__init__.py +++ b/ooni/utils/__init__.py @@ -3,7 +3,7 @@ import random import glob import os -from ooni import errors, otime +from ooni import errors class Storage(dict): @@ -117,7 +117,6 @@ def generate_filename(testDetails, prefix=None, extension=None, filename=None): """ if filename is None: test_name, start_time = testDetails['test_name'], testDetails['start_time'] - start_time = otime.epochToTimestamp(start_time) suffix = "%s-%s" % (test_name, start_time) basename = '%s-%s' % (prefix, suffix) if prefix is not None else suffix final_filename = '%s.%s' % (basename, extension) if extension is not None else basename

1 0

[ooni-probe/master] Detect default interface with active probing.
by art＠torproject.org 05 Aug '14

05 Aug '14

commit 1a661944c8fde17d37f4306a1da67229996e163e Author: kudrom <kudrom(a)riseup.net> Date: Sun Jul 20 21:43:25 2014 +0200 Detect default interface with active probing. --- Vagrantfile | 2 +- ooni/utils/txscapy.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 419f0c6..74fe50f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant.configure("2") do |config| config.vm.synced_folder ".", "/ooni" # Place the ooni-backend source code in ../ooni-backend to sync it with the vagrant instance - # config.vm.synced_folder "../ooni-backend", "/oonib" + config.vm.synced_folder "../ooni-backend", "/oonib" end diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 54b4102..1cd4d46 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -10,7 +10,7 @@ from twisted.internet import defer, abstract from scapy.config import conf from scapy.supersocket import L3RawSocket -from scapy.all import RandShort, IP, IPerror, ICMP, ICMPerror, TCP, TCPerror, UDP, UDPerror, read_routes +from scapy.all import RandShort, IP, IPerror, ICMP, ICMPerror, TCP, TCPerror, UDP, UDPerror from ooni.utils import log from ooni.settings import config @@ -124,9 +124,9 @@ def getAddresses(): def getDefaultIface(): """ Return the default interface or raise IfaceError """ - for route in read_routes(): - if route[2] == '0.0.0.0' and route[3] != 'lo': - return route[3] + iface = conf.route.route('0.0.0.0', verbose=0)[0] + if len(iface) > 0: + return iface raise IfaceError

1 0

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

05 Aug '14

commit 5b014da6216b681ec799dc2563d7b67b897f72a8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 5 06:19:59 2014 -0400 update changelog --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 78b2d54..cad40f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,13 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +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 +8036209 fixes for transparent proxy tethering +0709b0e remove this, as torrc.custom is built at runtime +754139a add new strings +31cf981 Address issues related to onionoo relay/node info lookup -Ensure streams, files are closed -Add timeout values to socket, stre + 668ed68 update to 14.0.5-RC1 7ff49ff update Tor binary version number 6626b65 update strings, localisations

1 0

[orbot/master] bump to 14.0.5.2
by n8fr8＠torproject.org 05 Aug '14

05 Aug '14

commit 387e74ec7cd5854c68fb4133177bcd91dab064ab Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 5 06:20:12 2014 -0400 bump to 14.0.5.2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 337db43..14c2a21 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.1" - android:versionCode="114" + android:versionName="14.0.5.2" + android:versionCode="115" android:installLocation="auto" >

1 0

[orbot/master] make sure to clean up ps process/shell
by n8fr8＠torproject.org 05 Aug '14

05 Aug '14

commit 03b39eae7a07d4451e1d6516527546f97dd5fa56 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 5 06:14:27 2014 -0400 make sure to clean up ps process/shell --- src/org/torproject/android/service/TorServiceConstants.java | 2 ++ src/org/torproject/android/service/TorServiceUtils.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 0e14c15..432f6c7 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -36,6 +36,8 @@ public interface TorServiceConstants { public final static String SHELL_CMD_KILL = "kill -9"; public final static String SHELL_CMD_RM = "rm"; public final static String SHELL_CMD_PS = "toolbox ps"; + public final static String SHELL_CMD_PS_ALT = "ps"; + //public final static String SHELL_CMD_PIDOF = "pidof"; public final static String SHELL_CMD_LINK = "ln -s"; public final static String SHELL_CMD_CP = "cp"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 18ae550..0038a5c 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -107,6 +107,8 @@ public class TorServiceUtils implements TorServiceConstants { break; } } + + procPs.destroy(); return procId;

1 0

[orbot/master] fixes for Tor processs tracking, control port, and start/stop
by n8fr8＠torproject.org 05 Aug '14

05 Aug '14

commit e3385ab137e3cba06da7c9afea9ba29df06941db Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Aug 3 14:39:01 2014 -0400 fixes for Tor processs tracking, control port, and start/stop --- src/org/torproject/android/service/TorService.java | 188 +++++++++----------- 1 file changed, 85 insertions(+), 103 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index dc67433..9f05351 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -411,7 +411,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - killTorProcess (); + shutdownTorProcess (); //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); @@ -504,11 +504,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void killTorProcess () throws Exception + private void shutdownTorProcess () throws Exception { - //stopTorMinder(); - if (conn != null) { @@ -519,9 +517,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("sending HALT signal to Tor process"); conn.shutdownTor("HALT"); - //logNotice("closing tor socket"); - // torConnSocket.close(); - } catch (Exception e) { Log.d(TAG,"error shutting down Tor via connection",e); } @@ -852,42 +847,36 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } + Shell mShellTor; + private void runTorShellCmd() throws Exception { - SharedPreferences prefs =TorServiceUtils.getSharedPrefs(getApplicationContext()); - String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); - int torRetryWaitTimeMS = 1000; - sendCallbackStatusMessage(getString(R.string.status_starting_up)); + + if (mShellTor != null) + mShellTor.close(); //start Tor in the background - Shell shell = Shell.startShell(); - + mShellTor = Shell.startShell(); - SimpleCommand cmdTor = new SimpleCommand(fileTor.getCanonicalPath() + SimpleCommand shellTorCommand = new SimpleCommand(fileTor.getCanonicalPath() + " DataDirectory " + appCacheHome.getCanonicalPath() + " --defaults-torrc " + torrcPath - + " -f " + torrcPath + ".custom" - + " &"); + + " -f " + torrcPath + ".custom"); - shell.add(cmdTor); - - Thread.sleep(torRetryWaitTimeMS); + mShellTor.add(shellTorCommand); //now try to connect - mLastProcessId = initControlConnection (3); + mLastProcessId = initControlConnection (100); if (mLastProcessId == -1) { - logNotice(getString(R.string.couldn_t_start_tor_process_) + "; exit=" + cmdTor.getExitCode() + ": " + cmdTor.getOutput()); + logNotice(getString(R.string.couldn_t_start_tor_process_) + "; exit=" + shellTorCommand.getExitCode() + ": " + shellTorCommand.getOutput()); sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); - logNotice("Tor exit code: " + cmdTor.getExitCode()); - - throw new Exception ("Unable to start Tor"); } else @@ -897,11 +886,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettingsImpl(); - // startTorMinder (); } - shell.close(); } @@ -981,14 +968,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst return null; }*/ - private synchronized int initControlConnection (int maxAttempts) throws Exception, RuntimeException + private synchronized int initControlConnection (int maxTries) throws Exception, RuntimeException { int i = 0; - + int controlPort = getControlPort(); + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + if (conn != null) { - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - + if (fileCookie.exists()) { byte[] cookie = new byte[(int)fileCookie.length()]; @@ -996,91 +984,87 @@ public class TorService extends Service implements TorServiceConstants, TorConst fis.read(cookie); fis.close(); conn.authenticate(cookie); - - } - - String torProcId = conn.getInfo("process/pid"); - return Integer.parseInt(torProcId); + + String torProcId = conn.getInfo("process/pid"); + return Integer.parseInt(torProcId); + + } } - else + + int attempt = 0; + + while (conn == null && attempt++ < maxTries) { - while (conn == null && i++ < maxAttempts) + try { - try + + controlPort = getControlPort(); + + if (controlPort != -1) { + logNotice( "Connecting to control port: " + controlPort); - int controlPort = getControlPort(); + torConnSocket = new Socket(IP_LOCALHOST, controlPort); + torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); - if (controlPort == -1 && i == maxAttempts) - controlPort = DEFAULT_CONTROL_PORT; - - if (controlPort != -1) - { - logNotice( "Connecting to control port: " + controlPort); - - torConnSocket = new Socket(IP_LOCALHOST, controlPort); - torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); - - conn = TorControlConnection.getConnection(torConnSocket); - - - logNotice( "SUCCESS connected to Tor control port"); + conn = TorControlConnection.getConnection(torConnSocket); + + logNotice( "SUCCESS connected to Tor control port"); + + fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + + if (fileCookie.exists()) + { + byte[] cookie = new byte[(int)fileCookie.length()]; + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); + conn.authenticate(cookie); + + logNotice( "SUCCESS - authenticated to control port"); - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); + + addEventHandler(); + + String torProcId = conn.getInfo("process/pid"); - if (fileCookie.exists()) + if (ENABLE_DEBUG_LOG) { - byte[] cookie = new byte[(int)fileCookie.length()]; - DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); - fis.read(cookie); - fis.close(); - conn.authenticate(cookie); - - logNotice( "SUCCESS - authenticated to control port"); - - sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); - - addEventHandler(); - - String torProcId = conn.getInfo("process/pid"); - - if (ENABLE_DEBUG_LOG) - { - //File fileLog = new File(getFilesDir(),"orbot-control-log.txt"); - //PrintWriter pr = new PrintWriter(new FileWriter(fileLog,true)); - //conn.setDebugging(pr); - - File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); - conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); - - } - - return Integer.parseInt(torProcId); - + //File fileLog = new File(getFilesDir(),"orbot-control-log.txt"); + //PrintWriter pr = new PrintWriter(new FileWriter(fileLog,true)); + //conn.setDebugging(pr); + + File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); + conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); + } - else - { - logNotice ("Tor authentication cookie does not exist yet"); - conn = null; - - } - } + return Integer.parseInt(torProcId); + + } + else + { + logNotice ("Tor authentication cookie does not exist yet"); + conn = null; + + } } - catch (Exception ce) - { - conn = null; - logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); - - } - - try { - logNotice("waiting..."); - Thread.sleep(5000); } - catch (Exception e){} + + } + catch (Exception ce) + { + conn = null; + logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); } - } + + try { + logNotice("waiting..."); + Thread.sleep(5000); } + catch (Exception e){} + + } return -1; @@ -1098,8 +1082,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort)); String line = bufferedReader.readLine(); - //PORT=127.0.0.1:45051 - if (line != null) { String[] lineParts = line.split(":");

1 0