tor-commits August 2014

tor-commits@lists.torproject.org

21 participants
1599 discussions

[bridgedb/develop] Only run test_https.py tests if a BridgeDB process is already running.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 1bfb9c5fce4b47bc7990a2565cbb153c991cfeb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:42:56 2014 +0000 Only run test_https.py tests if a BridgeDB process is already running. --- lib/bridgedb/test/test_https.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 7b1c8c8..176b769 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -26,6 +26,10 @@ from __future__ import print_function from twisted.trial import unittest from BeautifulSoup import BeautifulSoup import mechanize +import os + +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID HTTPS_ROOT = 'https://127.0.0.1:6789' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -33,6 +37,11 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): + here = os.getcwd() + topdir = here.rstrip('_trial_temp') + self.rundir = os.path.join(topdir, 'run') + self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') + self.pid = getBridgeDBPID(self.pidfile) self.br = None def tearDown(self): @@ -132,6 +141,9 @@ class HTTPTests(unittest.TestCase): return bridges def test_get_obfs2_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -144,6 +156,9 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -156,6 +171,9 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -168,6 +186,9 @@ class HTTPTests(unittest.TestCase): self.assertTrue(bridge != None) def test_get_scramblesuit_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage()

1 0

[bridgedb/develop] Move getBridgeDBPID() from test_bridgedb.py to bridgedb.test.util.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit c9db4818c890429e699f81723ca98c663388ec0f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:18:06 2014 +0000 Move getBridgeDBPID() from test_bridgedb.py to bridgedb.test.util. --- lib/bridgedb/test/test_bridgedb.py | 25 ++----------------------- lib/bridgedb/test/util.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 0d53fef..8627aed 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -21,6 +21,7 @@ from twisted.trial import unittest from twisted.trial.unittest import SkipTest from bridgedb.test.util import pidExists +from bridgedb.test.util import getBridgeDBPID class BridgeDBCliTest(unittest.TestCase): @@ -31,31 +32,9 @@ class BridgeDBCliTest(unittest.TestCase): topdir = here.rstrip('_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') - self.pid = self.getBridgeDBPID(self.pidfile) + self.pid = getBridgeDBPID(self.pidfile) self.assignmentsFile = os.path.join(self.rundir, 'assignments.log') - def getBridgeDBPID(self, pidfile="bridgedb.pid"): - """Read the ``bridgedb.pid`` file in **rundir**, if it exists, to get - the PID. - - :param str pidfile: The path to the BridgeDB pidfile. - :rtype: int - :returns: The process ID, if available, otherwise ``0``. - """ - fh = None - try: - fh = open(pidfile) - except (IOError, OSError) as err: - print(err) - pid = 0 - else: - pid = int(fh.read()) - - if fh: - fh.close() - - return pid - def doSleep(self): """Sleep for some ammount of time. diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 1067526..287fa26 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -87,6 +87,28 @@ def pidExists(pid): else: return True +def getBridgeDBPID(pidfile="bridgedb.pid"): + """Read the ``bridgedb.pid`` file in **rundir**, if it exists, to get the + PID. + + :param str pidfile: The path to the BridgeDB pidfile. + :rtype: int + :returns: The process ID, if available, otherwise ``0``. + """ + fh = None + try: + fh = open(pidfile) + except (IOError, OSError) as err: + print(err) + pid = 0 + else: + pid = int(fh.read()) + + if fh: + fh.close() + + return pid + #: Mixin class for use with :api:`~twisted.trial.unittest.TestCase`. A #: ``TestCaseMixin`` can be used to add additional methods, which should be

1 0

[bridgedb/develop] Rename pidExists() to processExists() in bridgedb.test.util.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit e4a406b9533e8e1e9295a9369ebb796e7655691e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:31:39 2014 +0000 Rename pidExists() to processExists() in bridgedb.test.util. --- lib/bridgedb/test/test_bridgedb.py | 2 +- lib/bridgedb/test/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 8627aed..750ddd4 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -20,7 +20,7 @@ import time from twisted.trial import unittest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import pidExists +from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 287fa26..8627281 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -65,7 +65,7 @@ def fileCheckDecorator(func): % (str(description), dst, src)) return wrapper -def pidExists(pid): +def processExists(pid): """Test if **pid** exists. :raises: OSError, if ``OSError.errno`` wasn't an expected errno (according

1 0

[bridgedb/develop] Bump Leekspin requirement to version 0.2.1.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 41410f917297a8e667bfabf899477c300254c20f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 03:22:40 2014 +0000 Bump Leekspin requirement to version 0.2.1. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index 12dfb7b..f1f85ab 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==0.2.0 +leekspin==0.2.1 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 37b7bfe..b84396b 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==0.2.0 +leekspin==0.2.1 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/setup.py b/setup.py index cc2bd32..e3463c9 100644 --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7.1", - "leekspin==0.2.0"]}, + "leekspin==0.2.1"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[obfs4/master] Display a more useful error on JSON Unmarshall failure.
by yawning＠torproject.org 27 Aug '14

27 Aug '14

commit 468cd4bde80419824beb20d02c32315f46288d13 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Aug 27 03:52:22 2014 +0000 Display a more useful error on JSON Unmarshall failure. --- transports/obfs4/statefile.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 378eefa..7949dd9 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -98,7 +98,8 @@ func serverStateFromJSONServerState(js *jsonServerState) (*obfs4ServerState, err } func jsonServerStateFromFile(stateDir string, js *jsonServerState) error { - f, err := ioutil.ReadFile(path.Join(stateDir, stateFile)) + fPath := path.Join(stateDir, stateFile) + f, err := ioutil.ReadFile(fPath) if err != nil { if os.IsNotExist(err) { if err = newJSONServerState(stateDir, js); err == nil { @@ -109,7 +110,7 @@ func jsonServerStateFromFile(stateDir string, js *jsonServerState) error { } if err = json.Unmarshal(f, js); err != nil { - return err + return fmt.Errorf("failed to load statefile '%s': %s", fPath, err) } return nil

1 0

[obfs4/master] Add a ChangeLog and dump the version when invoked with "-v".
by yawning＠torproject.org 27 Aug '14

27 Aug '14

commit 83c9e3b9a0dada08712c8edb6cab3fda6d0a8a8b Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Aug 27 03:46:23 2014 +0000 Add a ChangeLog and dump the version when invoked with "-v". --- ChangeLog | 2 ++ obfs4proxy/obfs4proxy.go | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..1442903 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,2 @@ +Changes in version 0.0.1 - NOT YET RELEASED + - Initial release. diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 7ba0e93..c67bb21 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,6 +51,7 @@ import ( ) const ( + obfs4proxyVersion = "0.0.1" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" elidedAddr = "[scrubbed]" @@ -374,13 +375,23 @@ func ptInitializeLogging(enable bool) error { return nil } +func version() { + fmt.Printf("obfs4proxy-%s\n", obfs4proxyVersion) + os.Exit(0) +} + func main() { // Handle the command line arguments. _, execName := path.Split(os.Args[0]) + showVer := flag.Bool("v", false, "Print version and exit") flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber") flag.Parse() + if *showVer { + version() + } + // Determine if this is a client or server, initialize logging, and finish // the pt configuration. var ptListeners []net.Listener

1 0

[orbot/master] ensure settings are updated and binary paths are on service restart
by n8fr8＠torproject.org 27 Aug '14

27 Aug '14

commit 6e6546972a6adedb72a90333eb9fe12ab87aa41f Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:01:46 2014 -0400 ensure settings are updated and binary paths are on service restart --- src/org/torproject/android/service/TorService.java | 43 +++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index af41960..8a43dba 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -340,6 +340,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { + + if (fileTor == null) + initBinariesAndDirectories(); + + updateSettings (); + mExecutor.execute (new TorStarter(intent)); return Service.START_STICKY; @@ -568,6 +574,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { initBinariesAndDirectories(); + updateSettings(); + + new Thread(new Runnable () + { + public void run () + { + try + { + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + } + }).start(); + } catch (Exception e) { @@ -576,21 +600,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("There was an error installing Orbot binaries"); } - new Thread(new Runnable () - { - public void run () - { - try - { - findExistingProc (); - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - } - }).start(); } @@ -712,6 +721,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void updateSettings () throws TimeoutException, IOException { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); mHasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); @@ -736,6 +746,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst currentStatus = STATUS_CONNECTING; + if (fileTor == null) + initBinariesAndDirectories(); + enableBinExec(fileTor); enableBinExec(filePolipo); enableBinExec(fileObfsclient);

1 0

[orbot/master] update change log
by n8fr8＠torproject.org 27 Aug '14

27 Aug '14

commit 9879b53932719946af2f97d22f7ede1fb0bdf4ca Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:15:27 2014 -0400 update change log --- CHANGELOG | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c48a798..12af565 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,32 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +d2c71d7 update to 14.0.7.2 +6e65469 ensure settings are updated and binary paths are on service restart +af433d3 remove unused variables/patterns +b76be6d disable stdout log by default and enable daemon mode +dafd295 simplify process reconnect and transproxy setup - on reconnect to service, don't require call to getInfo before STATUS_ON is s +390b89e remove debug file logging for now until we can improve it +e53e03a tuning Orbot app conflict checker code + +c2672cc update to 14.0.7.1 +eaccf77 don't call handle intents twice! + +24a3db8 update to 14.0.7 +add04f2 exit menu option should be a menu +186e74b add new transproxy flush pref and strings +c78a822 add transproxy flush option to settings +68495c3 make delete iptables rules process match add for specific behavior no more drop all output tables, etc +25bc4c0 add new flush transproxy interface method +79a32e6 make sure control connection is not null on rebind - also tune app conflict checker code for Samsung Link +b307d51 make default SOCKs port auto, and THEN try to set specified port - also remove exit IP lookup loop bad code +9cc5f98 don't obfuscate class names; we just need to remove unused classes +3698e46 create new thread for connecting to existing process don't rely on executor yet, as we need it to happen fast +ea37b44 create new thread to just for existing process dont' rely on executor there yet +3a82421 no need for asynctask - just grab the status directly +e2f4f5f don't make these final, because the user might change them +7d243af update changelog + +56dfff0 bumped to 14.0.6 05dd331 update to latest jtorctl with patches for thread, error handling 73d4297 bump to 14.0.5.4

1 0

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

27 Aug '14

commit d2c71d7268470e8474c5bd1404c2bf34b54fb333 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:14:17 2014 -0400 update to 14.0.7.2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2146b4a..7841cf8 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.7.1" - android:versionCode="120" + android:versionName="14.0.7.2" + android:versionCode="121" android:installLocation="auto" >

1 0

[orbot/master] disable stdout log by default and enable daemon mode
by n8fr8＠torproject.org 27 Aug '14

27 Aug '14

commit b76be6dee0f08e406e7dd8e801a38706dc8916d5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 22:43:09 2014 -0400 disable stdout log by default and enable daemon mode --- res/raw/torrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/raw/torrc b/res/raw/torrc index 1661704..e5a4c49 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,4 +1,5 @@ -Log notice stdout +RunAsDaemon 1 +AvoidDiskWrites 1 ControlPort auto SOCKSPort 0 DNSPort 0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2014