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

[bridgedb/develop] Add missing errno module import to bridgedb.test.util.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 0075c560e9b2360cba56a244b0a5684540c919f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:52:47 2014 +0000 Add missing errno module import to bridgedb.test.util. --- lib/bridgedb/test/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 4c6f795..bec590d 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -14,6 +14,7 @@ from __future__ import print_function from __future__ import unicode_literals +import errno import os from functools import wraps

1 0

[bridgedb/develop] Add missing SkipTest import in test_https.py.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 4deffa3ebdd6214714ad106ed6e342fecb53b087 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:58:25 2014 +0000 Add missing SkipTest import in test_https.py. --- lib/bridgedb/test/test_https.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 95c2be8..b8034d8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -28,7 +28,9 @@ import mechanize import os from BeautifulSoup import BeautifulSoup + from twisted.trial import unittest +from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID

1 0

[bridgedb/develop] Merge branch 'fix/9874-email' into develop
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 9729bd102a81bba3cddfaf51526e99610b2f3cf5 Merge: 0075c56 82f4654 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:54:39 2014 +0000 Merge branch 'fix/9874-email' into develop lib/bridgedb/test/test_smtp.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/9874-https' into develop
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit a580c4ba0d30f55546d3d181d7ea878e6a13133c Merge: 9729bd1 4deffa3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:59:17 2014 +0000 Merge branch 'fix/9874-https' into develop lib/bridgedb/test/test_https.py | 2 ++ 1 file changed, 2 insertions(+)

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] simplify process reconnect and transproxy setup
by n8fr8＠torproject.org 27 Aug '14

27 Aug '14

commit dafd295b97b0db060202e8e46f9b80667dedfad9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 22:41:20 2014 -0400 simplify process reconnect and transproxy setup - on reconnect to service, don't require call to getInfo before STATUS_ON is set - transproxy should always delete/flush before adding in order to make sure old rules are cleared --- src/org/torproject/android/service/TorService.java | 43 ++++++++------------ 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4ed89f9..7340a0e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -185,11 +185,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - - String msg = conn.getInfo("status/circuit-established"); - sendCallbackLogMessage(msg); - currentStatus = STATUS_ON; + currentStatus = STATUS_ON; return true; } @@ -756,7 +753,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst runPolipoShellCmd(); if (mHasRoot && mEnableTransparentProxy) - enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + { + disableTransparentProxy(); + enableTransparentProxy(); + } getHiddenServiceHostname (); @@ -789,7 +789,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean enableTransparentProxy (boolean proxyAll, boolean enableTether) throws Exception + private boolean enableTransparentProxy () throws Exception { if (mTransProxy == null) @@ -823,7 +823,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //clear rules first // mTransProxy.clearTransparentProxyingAll(this); - if(proxyAll) + if(mTransProxyAll) { // showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor); @@ -849,7 +849,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (code == 0) { - if (enableTether) + if (mTransProxyTethering) { showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor); @@ -1054,8 +1054,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); fileLog2.setReadable(true); - conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); - + conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); }*/ currentStatus = STATUS_CONNECTING; @@ -1462,7 +1461,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { hmBuiltNodes.remove(node.id); - } } @@ -1494,9 +1492,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void run () { - if (mNode.ipAddress != null) - return; - for (int i = 0; i < MAX_ATTEMPTS; i++) { if (conn != null) @@ -1525,15 +1520,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString()); JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays"); + if (jsonRelays.length() > 0) { mNode.ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0]; - mNode.country = jsonRelays.getJSONObject(0).getString("country_name"); mNode.organization = jsonRelays.getJSONObject(0).getString("as_name"); - - } reader.close(); @@ -1912,7 +1905,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mHasRoot && mEnableTransparentProxy && mTransProxyNetworkRefresh) { disableTransparentProxy(); - enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + enableTransparentProxy(); } } @@ -2243,7 +2236,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { case TRIM_MEMORY_BACKGROUND: - logNotice("trim memory requested: app in the background"); + debug("trim memory requested: app in the background"); return; /** @@ -2255,7 +2248,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst case TRIM_MEMORY_COMPLETE: - logNotice("trim memory requested: cleanup all memory"); + debug("trim memory requested: cleanup all memory"); return; /** public static final int TRIM_MEMORY_COMPLETE @@ -2265,7 +2258,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst */ case TRIM_MEMORY_MODERATE: - logNotice("trim memory requested: clean up some memory"); + debug("trim memory requested: clean up some memory"); return; /** @@ -2277,7 +2270,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst case TRIM_MEMORY_RUNNING_CRITICAL: - logNotice("trim memory requested: memory on device is very low and critical"); + debug("trim memory requested: memory on device is very low and critical"); return; /** public static final int TRIM_MEMORY_RUNNING_CRITICAL @@ -2288,7 +2281,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst case TRIM_MEMORY_RUNNING_LOW: - logNotice("trim memory requested: memory on device is running low"); + debug("trim memory requested: memory on device is running low"); return; /** public static final int TRIM_MEMORY_RUNNING_LOW @@ -2298,7 +2291,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst */ case TRIM_MEMORY_RUNNING_MODERATE: - logNotice("trim memory requested: memory on device is moderate"); + debug("trim memory requested: memory on device is moderate"); return; /** public static final int TRIM_MEMORY_RUNNING_MODERATE @@ -2308,7 +2301,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst */ case TRIM_MEMORY_UI_HIDDEN: - logNotice("trim memory requested: app is not showing UI anymore"); + debug("trim memory requested: app is not showing UI anymore"); return; /**

1 0

[orbot/master] remove unused variables/patterns
by n8fr8＠torproject.org 27 Aug '14

27 Aug '14

commit af433d37ba03a91f371aee66fc4a2a517171453a Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 22:43:58 2014 -0400 remove unused variables/patterns --- src/org/torproject/android/service/TorService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 7340a0e..af41960 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -102,9 +102,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int HS_NOTIFY_ID = 4; private boolean prefPersistNotifications = true; - private static final String IPADDRESS_PATTERN = - "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; - private final static Pattern pattern = Pattern.compile(IPADDRESS_PATTERN); private static final int MAX_START_TRIES = 3;

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