- tor-commits - lists.torproject.org

[orbot/master] new file for background binary check
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 98029168fbee991a371e2bfb10a85fe61aa0d77e Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:42:34 2012 -0500 new file for background binary check --- .../android/service/CheckBinariesAsyncTask.java | 32 ++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/service/CheckBinariesAsyncTask.java b/src/org/torproject/android/service/CheckBinariesAsyncTask.java new file mode 100644 index 0000000..7ab0c50 --- /dev/null +++ b/src/org/torproject/android/service/CheckBinariesAsyncTask.java @@ -0,0 +1,32 @@ +package org.torproject.android.service; + +import org.torproject.android.service.TorService; + +import android.os.AsyncTask; +import android.os.RemoteException; + +public class CheckBinariesAsyncTask extends AsyncTask<TorService, Integer, Long> +{ + + + @Override + protected Long doInBackground(TorService... torService) { + + try { + torService[0].checkTorBinaries(false); + } catch (Exception e) { + e.printStackTrace(); + } + + return 100L; + } + + protected void onProgressUpdate(Integer... progress) { + + } + + protected void onPostExecute(Long result) { + + } + +}

1 0

[orbot/master] added new class for OrbotApp
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 5c6f58cf574d80178c59b7a7ef83a99badba5aa5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:22:43 2012 -0500 added new class for OrbotApp --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1850135..808fe37 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.11-alpha-1.0.8a-OBFS" + android:versionName="0.2.3.11-alpha-1.0.7.1-OBFS-FA" android:versionCode="33" android:installLocation="auto" > @@ -9,7 +9,7 @@ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-sdk android:minSdkVersion="4"/> - <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" + <application android:name=".OrbotApp" android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> <activity android:name=".Orbot"

1 0

[orbot/master] added support for obfsproxy start/stop/kill
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 258217d03112e3274054bbf50d85b98ec165d95d Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:24:28 2012 -0500 added support for obfsproxy start/stop/kill --- src/org/torproject/android/service/TorService.java | 42 ++++++++++++++------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 91e5e96..80daaab 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -70,10 +70,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst // private String appHome; private File appBinHome; - private File appDataHome; + private File appCacheHome; private File fileTor; private File filePrivoxy; + private File fileObfsProxy; /** Called when the activity is first created. */ public void onCreate() { @@ -372,7 +373,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (enableHiddenServices) { - File file = new File(appDataHome, "hostname"); + File file = new File(appCacheHome, "hostname"); if (file.exists()) { @@ -426,6 +427,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; } + int killDelayMs = 300; + while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1) { @@ -433,7 +436,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; TorServiceUtils.doShellCommand(cmd,log, false, false); - try { Thread.sleep(500); } + try { Thread.sleep(killDelayMs); } catch (Exception e){} } @@ -444,7 +447,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; TorServiceUtils.doShellCommand(cmd,log, false, false); - try { Thread.sleep(500); } + try { Thread.sleep(killDelayMs); } + catch (Exception e){} + } + + while ((procId = TorServiceUtils.findProcessId(fileObfsProxy.getAbsolutePath())) != -1) + { + + logNotice("Found ObfsProxy PID=" + procId + " - killing now..."); + String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; + + TorServiceUtils.doShellCommand(cmd,log, false, false); + try { Thread.sleep(killDelayMs); } catch (Exception e){} } @@ -465,10 +479,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst { appBinHome = getDir("bin",Application.MODE_PRIVATE); - appDataHome = getCacheDir(); + appCacheHome = getCacheDir(); fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); + fileObfsProxy = new File(appBinHome, OBFSPROXY_ASSET_KEY); } @@ -557,6 +572,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] cmd2 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + filePrivoxy.getAbsolutePath()}; TorServiceUtils.doShellCommand(cmd2, log, false, true); + logNotice("(re)Setting permission on Obfsproxy binary"); + String[] cmd3 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + fileObfsProxy.getAbsolutePath()}; + TorServiceUtils.doShellCommand(cmd3, log, false, true); return true; } @@ -724,7 +742,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] torCmd = { "export HOME=" + appBinHome.getAbsolutePath(), - fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" + fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" }; boolean runAsRootFalse = false; @@ -739,7 +757,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { log = new StringBuilder(); - logNotice(torCmd[0]); sendCallbackStatusMessage(getString(R.string.status_starting_up)); TorServiceUtils.doShellCommand(torCmd, log, runAsRootFalse, waitForProcess); @@ -856,7 +873,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice( "SUCCESS connected to control port"); - String torAuthCookie = new File(appDataHome, TOR_CONTROL_COOKIE).getAbsolutePath(); + String torAuthCookie = new File(appCacheHome, TOR_CONTROL_COOKIE).getAbsolutePath(); File fileCookie = new File(torAuthCookie); @@ -1367,7 +1384,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); - boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, true); //default true for using bridges //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); @@ -1422,7 +1439,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (useBridges) { - String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,""); + String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,getString(R.string.default_bridges)); if (bridgeList == null || bridgeList.length() == 0) { @@ -1434,7 +1451,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst return false; } - mBinder.updateConfiguration("UseBridges", "1", false); String bridgeDelim = "\n"; @@ -1444,6 +1460,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst bridgeDelim = ","; } + showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + StringTokenizer st = new StringTokenizer(bridgeList,bridgeDelim); while (st.hasMoreTokens()) { @@ -1512,7 +1530,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (enableHiddenServices) { - mBinder.updateConfiguration("HiddenServiceDir",appDataHome.getAbsolutePath(), false); + mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getAbsolutePath(), false); String hsPorts = prefs.getString("pref_hs_ports","");

1 0

[orbot/master] added app class to handle language settings
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 411dcea837f8058904efc2bb53ffcbb0abfc597d Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:23:29 2012 -0500 added app class to handle language settings --- src/org/torproject/android/OrbotApp.java | 48 ++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java new file mode 100644 index 0000000..10eff32 --- /dev/null +++ b/src/org/torproject/android/OrbotApp.java @@ -0,0 +1,48 @@ +package org.torproject.android; + +import java.util.Locale; + +import android.app.Application; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.preference.PreferenceManager; + +public class OrbotApp extends Application implements TorConstants +{ + + private Locale locale; + private final static String DEFAULT_LOCALE = "fa"; + + @Override + public void onCreate() { + super.onCreate(); + + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + + Configuration config = getResources().getConfiguration(); + + String lang = settings.getString(PREF_DEFAULT_LOCALE, DEFAULT_LOCALE); + + if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang)) + { + locale = new Locale(lang); + Locale.setDefault(locale); + config.locale = locale; + getResources().updateConfiguration(config, getResources().getDisplayMetrics()); + } + + } + + @Override + public void onConfigurationChanged(Configuration newConfig) + { + super.onConfigurationChanged(newConfig); + + if (locale != null) + { + newConfig.locale = locale; + Locale.setDefault(locale); + getResources().updateConfiguration(newConfig, getResources().getDisplayMetrics()); + } + } +}

1 0

[orbot/master] improved logging of cmd exec
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit ebb7535b0f2e71810cd9543a864e2e3e64431841 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:25:02 2012 -0500 improved logging of cmd exec --- .../android/service/TorServiceUtils.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index cd4429d..08517d0 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -161,7 +161,6 @@ public class TorServiceUtils implements TorServiceConstants { public static int doShellCommand(String[] cmds, StringBuilder log, boolean runAsRoot, boolean waitFor) throws Exception { - TorService.logMessage("executing shell cmds: " + cmds[0] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); Process proc = null; int exitCode = -1; @@ -176,6 +175,8 @@ public class TorServiceUtils implements TorServiceConstants { for (int i = 0; i < cmds.length; i++) { + TorService.logMessage("executing shell cmd: " + cmds[i] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); + out.write(cmds[i]); out.write("\n"); }

1 0

[orbot/master] tweaked bindService call
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit bfaf01203e647bcaa5c63c9d6ec8b8758d06ed14 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:25:33 2012 -0500 tweaked bindService call --- src/org/torproject/android/Orbot.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index b54c05e..96a54e7 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -3,6 +3,8 @@ package org.torproject.android; +import java.util.Locale; + import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; @@ -22,6 +24,7 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -40,7 +43,8 @@ import android.widget.TextView; public class Orbot extends Activity implements OnLongClickListener, TorConstants { - + + /* Useful UI bits */ // so this is probably pretty obvious, here, but also an area // which we might see quite a bit of change+complexity was the main screen @@ -72,7 +76,9 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants //if Tor binary is not running, then start the service up //might want to look at whether we need to call this every time //or whether binding to the service is enough - //bindService(); + + + bindService(); startService(new Intent(INTENT_TOR_SERVICE)); @@ -339,9 +345,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants protected void onResume() { super.onResume(); - if (!mIsBound) - bindService(); - if (getIntent() == null) return; @@ -896,4 +899,5 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } + }

1 0

[orbot/master] added new pref string key
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 7ea83429679688cfed99c7c111e7817e80bd6634 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:25:41 2012 -0500 added new pref string key --- src/org/torproject/android/TorConstants.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index ae84e61..8b44281 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -47,4 +47,6 @@ public interface TorConstants { public final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications"; + public final static String PREF_DEFAULT_LOCALE = "pref_default_locale"; + }

1 0

[orbot/master] Add correct torrc entries for obfuscated bridges
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit ab4f789eff85ab148ea6f3ba19c8aaa576864fe7 Author: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Date: Fri Feb 10 23:12:54 2012 +0100 Add correct torrc entries for obfuscated bridges The lines have the following form: Bridge obfs2 ${IP address of bridge} ... ClientTransportPlugin obfs2 exec ${/path/to/obfsproxy} --managed --- src/org/torproject/android/service/TorService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 80daaab..70f29a1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1462,16 +1462,28 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); + String bridgeCfgKey = "bridge"; + + if (obfsBridges) + { + bridgeCfgKey = bridgeCfgKey + " obfs2"; + } + StringTokenizer st = new StringTokenizer(bridgeList,bridgeDelim); while (st.hasMoreTokens()) { - mBinder.updateConfiguration("bridge", st.nextToken(), false); + mBinder.updateConfiguration(bridgeCfgKey, st.nextToken(), false); } - + + if (obfsBridges) + { + mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec " + fileObfsProxy.getAbsolutePath() + " --managed", false); + } + mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); - } else {

1 0

[orbot/master] updated default string values
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit bf92bd1cf3fa6263d8995bbacc4ce3be422b4982 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:26:54 2012 -0500 updated default string values --- res/values/strings.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 94299a1..9da8b98 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -257,6 +257,5 @@ <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> -<string name="default_bridges">obfs2 146.185.23.182:8080,obfs2 108.166.107.30:42396,obfs2 18.85.35.209:49937,obfs2 143.215.129.51:35777,obfs2 68.22.187.113:45672,obfs2 209.176.111.36:38297,obfs2 195.43.157.80:51715,obfs2 128.31.0.34:1051,obfs2 184.73.35.40:8080,obfs2 141.201.27.48:37708</string> <string name="notification_using_bridges">Bridges enabled!</string> </resources>

1 0

[orbot/master] Add constants related to obfuscated bridges
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit c21be28cf3bc5b575605939f5d2c1e8fd74ca8d1 Author: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Date: Fri Feb 10 23:10:00 2012 +0100 Add constants related to obfuscated bridges --- src/org/torproject/android/TorConstants.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 8b44281..2574c6a 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -32,6 +32,7 @@ public interface TorConstants { public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_LIST = "pref_bridges_list"; + public final static String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated"; public final static String PREF_OR = "pref_or"; public final static String PREF_OR_PORT = "pref_or_port"; public final static String PREF_OR_NICKNAME = "pref_or_nickname";

1 0