tor-commits May 2014

tor-commits@lists.torproject.org

25 participants
1732 discussions

[orbot/master] add binary stripping to makefile
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 05b6553cba52cb7721005af087ec2a8b33ee88b8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 25 12:45:11 2014 -0400 add binary stripping to makefile --- external/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/external/Makefile b/external/Makefile index 899bb2f..96b75ed 100644 --- a/external/Makefile +++ b/external/Makefile @@ -58,6 +58,7 @@ STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ CFLAGS = -DANDROID $(TARGET_CFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) + # change 'release' to 'debug' for unoptimized debug builds ifeq ($(APP_ABI),armeabi-v7a) CFLAGS += $(TARGET_arm_release_CFLAGS) @@ -324,9 +325,13 @@ jtorctl-clean: assets: tor polipo jtorctl iptables obfsclient install bin/jtorctl.jar ../libs install -d ../res/raw + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/polipo -zip ../res/raw/polipo.mp3 bin/polipo + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/obfsclient -zip ../res/raw/obfsclient.mp3 bin/obfsclient + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor -zip ../res/raw/tor.mp3 bin/tor + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables -zip ../res/raw/xtables.mp3 bin/xtables assets-clean:

1 0

[orbot/master] fixes for preference handling in multi process context
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 144460beed66ee595f37cbbc87b2245420dad128 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 25 12:44:21 2014 -0400 fixes for preference handling in multi process context --- src/org/torproject/android/OnBootReceiver.java | 6 +- src/org/torproject/android/OrbotApp.java | 4 +- src/org/torproject/android/service/TorService.java | 115 ++++++++++++-------- .../android/service/TorServiceConstants.java | 4 +- .../android/service/TorServiceUtils.java | 15 +++ .../torproject/android/service/TorTransProxy.java | 4 +- .../torproject/android/settings/AppManager.java | 5 +- .../android/settings/SettingsPreferences.java | 21 +++- 8 files changed, 115 insertions(+), 59 deletions(-) diff --git a/src/org/torproject/android/OnBootReceiver.java b/src/org/torproject/android/OnBootReceiver.java index a5ca1d6..92104e0 100644 --- a/src/org/torproject/android/OnBootReceiver.java +++ b/src/org/torproject/android/OnBootReceiver.java @@ -1,12 +1,12 @@ package org.torproject.android; import org.torproject.android.service.TorService; +import org.torproject.android.service.TorServiceUtils; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.preference.PreferenceManager; public class OnBootReceiver extends BroadcastReceiver { @@ -16,7 +16,8 @@ public class OnBootReceiver extends BroadcastReceiver { if (intent.getAction() != null && intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) { - SharedPreferences prefs = TorService.getSharedPrefs(context.getApplicationContext()); + + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context.getApplicationContext()); boolean startOnBoot = prefs.getBoolean("pref_start_boot",false); @@ -34,5 +35,6 @@ public class OnBootReceiver extends BroadcastReceiver { } + } diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java index d470afb..cb1824c 100644 --- a/src/org/torproject/android/OrbotApp.java +++ b/src/org/torproject/android/OrbotApp.java @@ -2,6 +2,8 @@ package org.torproject.android; import java.util.Locale; +import org.torproject.android.service.TorServiceUtils; + import android.app.Application; import android.content.SharedPreferences; import android.content.res.Configuration; @@ -18,7 +20,7 @@ public class OrbotApp extends Application implements TorConstants public void onCreate() { super.onCreate(); - settings = PreferenceManager.getDefaultSharedPreferences(this); + settings = TorServiceUtils.getSharedPrefs(getApplicationContext()); Configuration config = getResources().getConfiguration(); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5264370..4f897e9 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -292,7 +292,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { - boolean startOnBoot = getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); + boolean startOnBoot = TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); if (startOnBoot) { @@ -308,7 +308,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst // We want this service to continue running until it is explicitly // stopped, so return sticky. - return START_STICKY; + return START_NOT_STICKY; } catch (Exception e) @@ -319,14 +319,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public static SharedPreferences getSharedPrefs (Context context) - { - if (Build.VERSION.SDK_INT>=11) - return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_MULTI_PROCESS); - else - return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE); - - } + public void run () @@ -341,11 +334,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - logException("Unable to start Tor: " + e.getMessage(),e); - sendCallbackStatusMessage(getString(R.string.unable_to_start_tor) + ' ' + e.getMessage()); + + logException("Unable to start Tor: " + e.toString(),e); currentStatus = STATUS_OFF; this.showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); - Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -404,7 +396,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private String getHiddenServiceHostname () { - SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); @@ -538,7 +530,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst fileXtables = new File(appBinHome, IPTABLES_ASSET_KEY); - SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); logNotice("checking binary version: " + version); @@ -595,7 +587,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void updateSettings () { - SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); mHasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); mEnableTransparentProxy = prefs.getBoolean("pref_transparent", false); @@ -611,8 +603,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void initTor () throws Exception { - boolean portsAvail = checkPortsAvailable(); - try { initBinaries(); @@ -645,6 +635,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //checkAddressAndCountry(); } + /** private boolean checkPortsAvailable () { int[] ports = {9050,9051,8118}; @@ -669,6 +660,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } + */ /* * activate means whether to apply the users preferences @@ -703,7 +695,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); - code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this, getSharedPrefs(getApplicationContext()))); + code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext()))); } @@ -752,7 +744,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void runTorShellCmd() throws Exception { - SharedPreferences prefs =getSharedPrefs(getApplicationContext()); + SharedPreferences prefs =TorServiceUtils.getSharedPrefs(getApplicationContext()); String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); @@ -1360,8 +1352,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (IOException ioe) { - Log.e(TAG, "Unable to update Tor configuration", ioe); - logNotice("Unable to update Tor configuration: " + ioe.getMessage()); + + logException("Unable to get Tor configuration: " + ioe.getMessage(),ioe); } return null; @@ -1442,8 +1434,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception ioe) { - Log.e(TAG, "Unable to update Tor configuration", ioe); - logNotice("Unable to update Tor configuration: " + ioe.getMessage()); + + logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe); + if (configBuffer != null) + for (String config : configBuffer) + { + logNotice("Error applying config: " + config); + } + } return false; @@ -1569,13 +1567,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst @Override public void onReceive(Context context, Intent intent) { - SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); mConnectivity = !intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false); - boolean disableNetwork = prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true); + boolean doNetworKSleep = prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true); - if (currentStatus == STATUS_ON && disableNetwork) + if (doNetworKSleep && mBinder != null) { try { mBinder.updateConfiguration("DisableNetwork", mConnectivity ? "0" : "1", false); @@ -1591,13 +1589,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("Network connectivity is good. Waking Tor up..."); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor,-1,prefPersistNotifications); - + } } catch (Exception e) { logException ("error updating state after network restart",e); } } + } }; @@ -1605,8 +1604,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("updating settings in Tor service"); - SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + enableSocks ("127.0.0.1",9050,false); + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); @@ -1685,14 +1686,33 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (useBridges) { - String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,getString(R.string.default_bridges)); + + logMessage ("Using bridges"); + boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); + String bridgeCfgKey = "Bridge"; + + + if (obfsBridges) + { + String bridgeConfig = "obfs2,obfs3,scramblesuit exec " + fileObfsclient.getAbsolutePath(); + + logMessage ("Using OBFUSCATED bridges: " + bridgeConfig); + + mBinder.updateConfiguration("ClientTransportPlugin",bridgeConfig, false); + } + else + { + logMessage ("Using standard bridges"); + } + + String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,null); if (bridgeList == null || bridgeList.length() == 0) { String msgBridge = getString(R.string.bridge_requires_ip) + getString(R.string.send_email_for_bridges); showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); - + logMessage(msgBridge); return false; } @@ -1708,25 +1728,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); - boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); - String bridgeCfgKey = "bridge"; - - if (obfsBridges) - { - bridgeCfgKey = bridgeCfgKey + " obfsclient"; - } - + + StringTokenizer st = new StringTokenizer(bridgeList,bridgeDelim); while (st.hasMoreTokens()) { + String bridgeConfigLine = st.nextToken().trim(); + logMessage("Adding bridge: " + bridgeConfigLine); + mBinder.updateConfiguration(bridgeCfgKey, bridgeConfigLine, false); - mBinder.updateConfiguration(bridgeCfgKey, st.nextToken(), false); - - } - - if (obfsBridges) - { - mBinder.updateConfiguration("ClientTransportPlugin","obfsclient exec " + fileObfsclient.getAbsolutePath(), false); } mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); @@ -1813,6 +1823,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst hsPortConfig = hsPortConfig + " 0.0.0.0:" + hsPortConfig; } + logMessage("Adding hidden service on port: " + hsPortConfig); + mBinder.updateConfiguration("HiddenServicePort",hsPortConfig, false); hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); @@ -1837,6 +1849,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } + private void enableSocks (String ip, int port, boolean safeSocks) throws RemoteException + { + mBinder.updateConfiguration("SOCKSPort", port + "", false); + mBinder.updateConfiguration("SOCKSListenAddress", ip, false); + mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); + mBinder.updateConfiguration("TestSocks", "1", false); + mBinder.updateConfiguration("WarnUnsafeSocks", "1", false); + + + } + //using Google DNS for now as the public DNS server private String writeDNSFile () throws IOException { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 2fe9ff8..1b2fa5d 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -77,10 +77,8 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-if8"; - public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; + public static final String BINARY_TOR_VERSION = "0.2.5.3-alpha-openssl1.0.1g-b87a"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; - public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INSTALLED"; //obfsproxy public static final String OBFSCLIENT_ASSET_KEY = "obfsclient"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 5e87cb5..fe6ad01 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -11,6 +11,11 @@ import java.util.StringTokenizer; import org.torproject.android.TorConstants; +import android.annotation.SuppressLint; +import android.annotation.TargetApi; +import android.content.Context; +import android.content.SharedPreferences; +import android.os.Build; import android.util.Log; public class TorServiceUtils implements TorServiceConstants { @@ -95,4 +100,14 @@ public class TorServiceUtils implements TorServiceConstants { return procId; } + + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + public static SharedPreferences getSharedPrefs (Context context) + { + if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.HONEYCOMB) + return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); + else + return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE); + + } } diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index f7fd535..5722612 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -34,7 +34,7 @@ public class TorTransProxy implements TorServiceConstants { String ipTablesPath = null; - SharedPreferences prefs = TorService.getSharedPrefs(context.getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false); @@ -57,7 +57,7 @@ public class TorTransProxy implements TorServiceConstants { String ipTablesPath = null; - SharedPreferences prefs = TorService.getSharedPrefs(context.getApplicationContext()); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false); diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 6e2b90b..b80fccd 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -14,6 +14,7 @@ import java.util.StringTokenizer; import org.torproject.android.R; import org.torproject.android.TorConstants; import org.torproject.android.service.TorService; +import org.torproject.android.service.TorServiceUtils; import android.app.Activity; import android.content.Context; @@ -22,6 +23,7 @@ import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -50,7 +52,6 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } - @Override protected void onResume() { super.onResume(); @@ -65,7 +66,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } }); - mPrefs = TorService.getSharedPrefs(getApplicationContext()); + mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); loadApps(mPrefs); } diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 84b8c91..57d3fc4 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -9,6 +9,7 @@ import org.sufficientlysecure.rootcommands.RootCommands; import org.torproject.android.R; import org.torproject.android.service.TorServiceUtils; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; @@ -42,8 +43,8 @@ public class SettingsPreferences super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); hasRoot = prefs.getBoolean("has_root",false); @@ -104,6 +105,20 @@ public class SettingsPreferences + @Override + protected void onPause() { + + super.onPause(); + + + + + + + + } + + /* (non-Javadoc) * @see android.app.Activity#onStop() */ @@ -147,7 +162,7 @@ public class SettingsPreferences } else if (preference == prefLocale) { - SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + SharedPreferences settings = TorServiceUtils.getSharedPrefs(getApplicationContext()); Configuration config = getResources().getConfiguration();

1 0

[orbot/master] update binaries and torrc for obfs/PT work
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 21c1cadccab8076481260e072b676ca870cadeb1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 25 12:44:37 2014 -0400 update binaries and torrc for obfs/PT work --- res/raw/obfsclient.mp3 | Bin 3318009 -> 807052 bytes res/raw/polipo.mp3 | Bin 312051 -> 123224 bytes res/raw/tor.mp3 | Bin 1815448 -> 1708250 bytes res/raw/torrc | 5 ----- res/raw/xtables.mp3 | Bin 166343 -> 152674 bytes 5 files changed, 5 deletions(-) diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 index da065cb..1782cde 100644 Binary files a/res/raw/obfsclient.mp3 and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 index 69fdf9f..6f0fc28 100644 Binary files a/res/raw/polipo.mp3 and b/res/raw/polipo.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 56bd825..dc4266e 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ diff --git a/res/raw/torrc b/res/raw/torrc index 85d6b86..e68d169 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,8 +1,3 @@ -SocksPort 9050 -SOCKSListenAddress 127.0.0.1 -SafeSocks 0 -TestSocks 1 -WarnUnsafeSocks 1 Log notice stdout ControlListenAddress 127.0.0.1 ControlPort 9051 diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 index 4bd634b..caab569 100644 Binary files a/res/raw/xtables.mp3 and b/res/raw/xtables.mp3 differ

1 0

[orbot/master] update manifest for v14-alpha-1
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 2b6ff4e64cae4bdcec0c4aa5feeffddb5ee8fc03 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 25 12:45:34 2014 -0400 update manifest for v14-alpha-1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index deaad72..779b1cd 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="13.0.7" - android:versionCode="86" + android:versionName="14.0.0-ALPHA-1" + android:versionCode="87" android:installLocation="auto" >

1 0

[orbot/master] updated icons with dark background
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b31c11f3cb2c27c826c102e0203eb7d95415ea34 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu May 1 16:15:25 2014 -0400 updated icons with dark background --- res/drawable-hdpi/ic_launcher.png | Bin 6094 -> 7854 bytes res/drawable-mdpi/ic_launcher.png | Bin 3102 -> 3993 bytes res/drawable-xhdpi/ic_launcher.png | Bin 9158 -> 12380 bytes res/drawable-xxhdpi/ic_launcher.png | Bin 18172 -> 24708 bytes res/drawable-xxxhdpi/ic_launcher.png | Bin 28466 -> 40755 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index fce00b3..e4887e7 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index 1a439a3..2ed1f96 100644 Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index 0bb0317..d2aac93 100644 Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png index 2c37faf..6182ce4 100644 Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png index 7512663..501cd32 100644 Binary files a/res/drawable-xxxhdpi/ic_launcher.png and b/res/drawable-xxxhdpi/ic_launcher.png differ

1 0

[orbot/master] remove debug waiter
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b056e7f6cdf26ffb0a13d4b34d129a74d4949315 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu May 1 21:37:36 2014 -0400 remove debug waiter --- src/org/torproject/android/service/TorService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 05f4376..21c6247 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -274,8 +274,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst * @see android.app.Service#onStart(android.content.Intent, int) */ public int onStartCommand(Intent intent, int flags, int startId) { - - android.os.Debug.waitForDebugger(); try {

1 0

[orbot/master] updated to v14-alpha-2
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b2d4bb350777d820db74c82fcbe53b8e7620e445 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu May 1 21:37:01 2014 -0400 updated to v14-alpha-2 --- AndroidManifest.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 779b1cd..9b4bee9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,9 +1,10 @@ <?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.0-ALPHA-1" - android:versionCode="87" + android:versionName="14.0.0-ALPHA-2" + android:versionCode="89" android:installLocation="auto" + > <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/> @@ -21,6 +22,7 @@ android:theme="@style/Theme.AppCompat" android:allowBackup="false" android:allowClearUserData="true" + android:largeHeap="true" > <activity android:name=".Orbot" android:configChanges="orientation|screenSize"

1 0

[orbot/master] improve how we start/stop Tor, Polipo
by n8fr8＠torproject.org 02 May '14

02 May '14

commit cbbc5e45e18bef6ad40d1a61bf31a4917110c0f7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu May 1 21:36:03 2014 -0400 improve how we start/stop Tor, Polipo to find process id, do ps of all, then filter (most compat) use async service for Tor start/stop instead of threads --- src/org/torproject/android/service/TorService.java | 140 +++++++++----------- .../android/service/TorServiceConstants.java | 2 +- .../android/service/TorServiceUtils.java | 6 +- 3 files changed, 67 insertions(+), 81 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4f897e9..05f4376 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -15,8 +15,6 @@ import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.net.InetSocketAddress; -import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; @@ -29,7 +27,6 @@ import net.freehaven.tor.control.EventHandler; import net.freehaven.tor.control.TorControlConnection; import org.sufficientlysecure.rootcommands.Shell; -import org.sufficientlysecure.rootcommands.Toolbox; import org.sufficientlysecure.rootcommands.command.SimpleCommand; import org.torproject.android.Orbot; import org.torproject.android.R; @@ -50,15 +47,16 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.graphics.Color; import android.net.ConnectivityManager; -import android.os.Build; +import android.os.AsyncTask; import android.os.IBinder; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; import android.util.Log; +import android.widget.TextView; -public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler +public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler { public static boolean ENABLE_DEBUG_LOG = false; @@ -136,7 +134,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { - int procId = initControlConnection(1); @@ -278,6 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst */ public int onStartCommand(Intent intent, int flags, int startId) { + android.os.Debug.waitForDebugger(); try { @@ -321,34 +319,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst - - public void run () - { - - if (currentStatus == STATUS_CONNECTING) - { - - try - { - initTor(); - } - catch (Exception e) - { - - logException("Unable to start Tor: " + e.toString(),e); - currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); - } - - } - else if (currentStatus == STATUS_OFF) - { - - stopTor(); - - } - } - public void onDestroy () { @@ -634,33 +604,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //checkAddressAndCountry(); } - - /** - private boolean checkPortsAvailable () - { - int[] ports = {9050,9051,8118}; - - for (int port: ports) - { - try - { - logNotice("checking local port is available: " + port); - - ServerSocket ss = new ServerSocket(); - ss.bind(new InetSocketAddress(IP_LOCALHOST,port)); - ss.close(); - } - catch (Exception e) - { - logException ("Tor socket " + port + " is not available",e); - return false; - } - } - - return true; - - } - */ + /* * activate means whether to apply the users preferences @@ -773,7 +717,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (procId == -1) { - logNotice(getString(R.string.couldn_t_start_tor_process_) + "; exit=" + cmdTor.getExitCode() + ": " + cmdTor.getOutput()); sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); @@ -786,6 +729,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettingsImpl(); } + + shell.close(); } private void runPolipoShellCmd () throws Exception @@ -898,7 +843,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); - Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + // Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); } sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); @@ -1011,25 +956,66 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (profile == PROFILE_ON) { - currentStatus = STATUS_CONNECTING; - sendCallbackStatusMessage (getString(R.string.status_starting_up)); - - Thread thread = new Thread(this); - thread.start(); - + + new StartStopTorOperation().execute(true); } else if (profile == PROFILE_OFF) { - currentStatus = STATUS_OFF; - sendCallbackStatusMessage (getString(R.string.status_shutting_down)); - - Thread thread = new Thread(this); - thread.start(); - + + new StartStopTorOperation().execute(false); } } + private class StartStopTorOperation extends AsyncTask<Boolean, Void, Boolean> { + @Override + protected Boolean doInBackground(Boolean... params) { + + if (params[0].booleanValue() == true) + { + + currentStatus = STATUS_CONNECTING; + sendCallbackStatusMessage (getString(R.string.status_starting_up)); + + try + { + initTor(); + } + catch (Exception e) + { + + logException("Unable to start Tor: " + e.toString(),e); + currentStatus = STATUS_OFF; + showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); + } + } + else + { + currentStatus = STATUS_OFF; + sendCallbackStatusMessage (getString(R.string.status_shutting_down)); + + stopTor(); + + } + + + return true; + } + + @Override + protected void onPostExecute(Boolean result) { + } + + @Override + protected void onPreExecute() { + } + + @Override + protected void onProgressUpdate(Void... values) { + } + } + + @@ -1622,14 +1608,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst String excludeNodes = prefs.getString("pref_exclude_nodes", ""); String proxyType = prefs.getString("pref_proxy_type", null); - if (proxyType != null) + if (proxyType != null && proxyType.length() > 0) { String proxyHost = prefs.getString("pref_proxy_host", null); String proxyPort = prefs.getString("pref_proxy_port", null); String proxyUser = prefs.getString("pref_proxy_username", null); String proxyPass = prefs.getString("pref_proxy_password", null); - if (proxyHost != null && proxyPort != null) + if ((proxyHost != null && proxyHost.length()>0) && (proxyPort != null && proxyPort.length() > 0)) { mBinder.updateConfiguration(proxyType + "Proxy", proxyHost + ':' + proxyPort, false); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 1b2fa5d..f89a892 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -77,7 +77,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.5.3-alpha-openssl1.0.1g-b87a"; + public static final String BINARY_TOR_VERSION = "0.2.5.3-alpha-openssl1.0.1g-b88"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index fe6ad01..be1694e 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -78,16 +78,16 @@ public class TorServiceUtils implements TorServiceConstants { Process procPs = null; - String processKey = new File(command).getName(); + //String processKey = new File(command).getName(); - procPs = r.exec(SHELL_CMD_PS + ' ' + processKey); // this is the android ps <name> command + procPs = r.exec(SHELL_CMD_PS); // this is the android ps <name> command BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); String line = reader.readLine(); //read first line "headers" USER PID PPID etc while ((line = reader.readLine())!=null) { - if (line.contains(processKey)) + if (line.contains(command)) { String[] lineParts = line.split("\\s+");

1 0

[orbot/master] add log max size feature
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 0dc50cc4927180d078a60a0ff40e6c3e23991ba0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 00:39:59 2014 -0400 add log max size feature --- src/org/torproject/android/Orbot.java | 4 ++++ src/org/torproject/android/TorConstants.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 4524857..21f304d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -178,6 +178,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void appendLogTextAndScroll(String text) { if(mTxtOrbotLog != null){ + + if (mTxtOrbotLog.getText().length() > MAX_LOG_LENGTH) + mTxtOrbotLog.setText(""); + mTxtOrbotLog.append(text + "\n"); final Layout layout = mTxtOrbotLog.getLayout(); if(layout != null){ diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 834f20d..36cdf48 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -53,4 +53,7 @@ public interface TorConstants { public final static String PREF_DISABLE_NETWORK = "pref_disable_network"; public final static String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences"; + + public final static int MAX_LOG_LENGTH = 10000; + }

1 0

[orbot/master] ensure setConft on control port works consistently
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b9f14b318b581f10de867d1533bacf0678d7fe55 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 00:39:37 2014 -0400 ensure setConft on control port works consistently --- src/org/torproject/android/service/TorService.java | 65 ++++++++++++++------ 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 21c6247..5075116 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -18,6 +18,7 @@ import java.io.PrintWriter; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -75,8 +76,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int MAX_START_TRIES = 3; - private ArrayList<String> configBuffer = null; - private ArrayList<String> resetBuffer = null; + private LinkedHashMap<String,String> configBuffer = null; + private LinkedHashMap<String,String> resetBuffer = null; // private String appHome; private File appBinHome; @@ -144,7 +145,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettingsImpl(); - currentStatus = STATUS_ON; + String state = conn.getInfo("dormant"); + if (state != null && Integer.parseInt(state) == 0) + currentStatus = STATUS_ON; + else + currentStatus = STATUS_CONNECTING; return true; } @@ -1188,7 +1193,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(sb.toString()); } + + /** + if (currentStatus != STATUS_ON) + { + try { + String state; + + state = conn.getInfo("dormant"); + if (state != null && Integer.parseInt(state) == 0) + currentStatus = STATUS_ON; + else + currentStatus = STATUS_CONNECTING; + + } catch (IOException e) { + logException("Error getting state from Tor control port",e); + } + }*/ } @@ -1349,19 +1371,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst public boolean updateConfiguration (String name, String value, boolean saveToDisk) { if (configBuffer == null) - configBuffer = new ArrayList<String>(); + configBuffer = new LinkedHashMap<String,String>(); if (resetBuffer == null) - resetBuffer = new ArrayList<String>(); + resetBuffer = new LinkedHashMap<String,String>(); if (value == null || value.length() == 0) { - resetBuffer.add(name); + resetBuffer.put(name,""); } else { - configBuffer.add(name + ' ' + value); + configBuffer.put(name,value); } return false; @@ -1398,14 +1420,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (resetBuffer != null && resetBuffer.size() > 0) { - conn.resetConf(resetBuffer); + conn.resetConf(resetBuffer.keySet()); resetBuffer = null; } if (configBuffer != null && configBuffer.size() > 0) { - conn.setConf(configBuffer); + for (String key : configBuffer.keySet()) + { + + String value = configBuffer.get(key); + + if (TorService.ENABLE_DEBUG_LOG) + logMessage("Setting conf: " + key + "=" + value); + + conn.setConf(key, value); + + } configBuffer = null; } @@ -1420,11 +1452,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe); - if (configBuffer != null) - for (String config : configBuffer) - { - logNotice("Error applying config: " + config); - } } @@ -1701,8 +1728,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst return false; } - mBinder.updateConfiguration("UseBridges", "1", false); - String bridgeDelim = "\n"; if (bridgeList.indexOf(",") != -1) @@ -1724,6 +1749,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst } mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); + + + mBinder.updateConfiguration("UseBridges", "1", false); + + } else { @@ -1835,8 +1865,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void enableSocks (String ip, int port, boolean safeSocks) throws RemoteException { - mBinder.updateConfiguration("SOCKSPort", port + "", false); - mBinder.updateConfiguration("SOCKSListenAddress", ip, false); + mBinder.updateConfiguration("SOCKSPort", ip + ":" + port + "", false); mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); mBinder.updateConfiguration("TestSocks", "1", false); mBinder.updateConfiguration("WarnUnsafeSocks", "1", false);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2014