- tor-commits - lists.torproject.org

[orbot/master] updated version, minSDK = 8 or 2.2
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit b03cd1a57f5ecd15489376829e8ee155fb7acc35 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 22:55:25 2012 -0500 updated version, minSDK = 8 or 2.2 --- AndroidManifest.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ed6d4e8..6c935ad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,12 +5,11 @@ android:versionCode="28" android:installLocation="auto" > - <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" - android:label="@string/app_name" android:debuggable="true"> + android:label="@string/app_name" android:debuggable="false"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar"> @@ -62,6 +61,6 @@ </application> - <uses-sdk android:minSdkVersion="4"/> + <uses-sdk android:minSdkVersion="8"/> </manifest>

1 0

[orbot/master] a few more useful values
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit ee2053ab83795f84f4d55bf71d02d7b829c7cb20 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:45:32 2012 -0500 a few more useful values --- .../android/service/TorServiceConstants.java | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index bd60c1e..c9d0cb4 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -39,14 +39,9 @@ public interface TorServiceConstants { public final static String SHELL_CMD_PS = "ps"; public final static String SHELL_CMD_PIDOF = "pidof"; - public final static String CHMOD_EXE_VALUE = "777"; - - //path of the installed APK file - //public final static String APK_PATH = "/data/app/org.torproject.android.apk"; - //public final static String APK_PATH_BASE = "/data/app"; + public final static String CHMOD_EXE_VALUE = "700"; - public final static int FILE_WRITE_BUFFER_SIZE = 2048; //HTTP Proxy server port @@ -65,10 +60,6 @@ public interface TorServiceConstants { //path to check Tor against public final static String URL_TOR_CHECK = "https://check.torproject.org"; - - //IPTABLES -// public final static String CMD_IPTABLES_PREROUTING = "iptables -t nat -A OUTPUT -p tcp --dport 80 -j DNAT --to 127.0.0.1:8118 || exit\n"; - //public final static String CMD_IPTABLES_PREROUTING_FLUSH = "iptables -t nat -F || exit\n"; //control port public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; @@ -86,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.3.10-alpha"; + public static final String BINARY_TOR_VERSION = "0.2.3.10-openssl-1.0.0f"; public static final String BINARY_PRIVOXY_VERSION = "1.4.13"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

1 0

[orbot/master] more updates to limit localhost port access
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 2b15ff66ecc2d528a546af266dffeb49404369aa Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:45:18 2012 -0500 more updates to limit localhost port access --- .../torproject/android/service/TorTransProxy.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index aed3a02..e5ba732 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -454,6 +454,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT"); + script.append(" -m owner ! --uid-owner "); + script.append(torUid); script.append(" -p tcp"); script.append(" -d 127.0.0.1"); script.append(" --dport ");

1 0

[orbot/master] solved NPE issue for null intent
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 93f242d66bf8f2cfd93087ddb38b320ea37830ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 23:41:25 2012 -0500 solved NPE issue for null intent --- src/org/torproject/android/service/TorService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 099024f..0132418 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -255,7 +255,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst - if (intent.getAction()!=null && intent.getAction().equals("onboot")) + if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

1 0

[orbot/master] cleanup notifications; fixes for binary checking
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 512f3d6dbd92efa750ac44774d6a2e54205f9b84 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 22:56:50 2012 -0500 cleanup notifications; fixes for binary checking --- src/org/torproject/android/service/TorService.java | 230 ++++++++++---------- 1 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a61bb30..099024f 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -55,6 +55,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static TorService _torInstance; private static final int NOTIFY_ID = 1; + private static final int TRANSPROXY_NOTIFY_ID = 2; + private static final int ERROR_NOTIFY_ID = 3; + private static final int HS_NOTIFY_ID = 3; + private static final int MAX_START_TRIES = 3; @@ -66,14 +70,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File appBinHome; private File appDataHome; - private String torBinaryPath; - private String privoxyPath; + private File fileTor; + private File filePrivoxy; /** Called when the activity is first created. */ public void onCreate() { super.onCreate(); - - logMessage("serviced created"); } @@ -92,7 +94,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean findExistingProc () { - int procId = TorServiceUtils.findProcessId(torBinaryPath); + int procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); if (procId != -1) { @@ -200,7 +202,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void onRebind(Intent intent) { super.onRebind(intent); + initTorPaths(); + + if (!fileTor.exists()) + { + new Thread () + { + + public void run () + { + try { + checkTorBinaries (false); + } catch (Exception e) { + logNotice("unable to find tor binaries: " + e.getMessage()); + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + + Log.e(TAG, "error checking tor binaries", e); + } + } + }.start(); + } } @@ -212,24 +234,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; - Thread thread = new Thread () - { - - public void run () - { + initTorPaths(); + + new Thread () + { + + public void run () + { try { checkTorBinaries (false); } catch (Exception e) { - + logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr, -1); - + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + Log.e(TAG, "error checking tor binaries", e); } - } - }; - - thread.start(); + } + }.start(); + + if (intent.getAction()!=null && intent.getAction().equals("onboot")) { @@ -260,7 +284,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID, R.drawable.tornotificationerr, -1); + this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -290,7 +314,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst clearNotifications(); - //showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); disableTransparentProxy(); @@ -344,7 +367,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, NOTIFY_ID, R.drawable.tornotification, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.tornotification, Notification.FLAG_ONGOING_EVENT); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -352,13 +375,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); return; } } else { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.tornotificationerr, -1); } @@ -392,7 +415,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; } - while ((procId = TorServiceUtils.findProcessId(torBinaryPath)) != -1) + while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1) { logNotice("Found Tor PID=" + procId + " - killing now..."); @@ -403,7 +426,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e){} } - while ((procId = TorServiceUtils.findProcessId(privoxyPath)) != -1) + while ((procId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath())) != -1) { logNotice("Found Privoxy PID=" + procId + " - killing now..."); @@ -427,20 +450,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - - private boolean checkTorBinaries (boolean forceInstall) throws Exception + private void initTorPaths () { - //android.os.Debug.waitForDebugger(); - - //check and install iptables - TorBinaryInstaller.assertIpTablesBinaries(this, true); appBinHome = getDir("bin",0); appDataHome = getCacheDir(); - File fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); - File filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); + fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); + filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); + + + } + public boolean checkTorBinaries (boolean forceInstall) throws Exception + { + //check and install iptables + TorBinaryInstaller.assertIpTablesBinaries(this, true); + + initTorPaths(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); String currTorBinary = prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); String currPrivoxyBinary = prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); @@ -495,8 +523,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); - torBinaryPath = fileTor.getAbsolutePath(); - privoxyPath = filePrivoxy.getAbsolutePath(); } else { @@ -509,24 +535,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - else - { - logNotice("Found Tor binary: " + torBinaryPath); - logNotice("Found Privoxy binary: " + privoxyPath); - - - torBinaryPath = fileTor.getAbsolutePath(); - privoxyPath = filePrivoxy.getAbsolutePath(); - } StringBuilder log = new StringBuilder (); logNotice("(re)Setting permission on Tor binary"); - String[] cmd1 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + torBinaryPath}; + String[] cmd1 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + fileTor.getAbsolutePath()}; TorServiceUtils.doShellCommand(cmd1, log, false, true); logNotice("(re)Setting permission on Privoxy binary"); - String[] cmd2 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + privoxyPath}; + String[] cmd2 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + filePrivoxy.getAbsolutePath()}; TorServiceUtils.doShellCommand(cmd2, log, false, true); @@ -535,27 +552,29 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void initTor () throws Exception { - + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - currentStatus = STATUS_CONNECTING; + currentStatus = STATUS_CONNECTING; - logNotice(getString(R.string.status_starting_up)); - - sendCallbackStatusMessage(getString(R.string.status_starting_up)); - - killTorProcess (); - - try { + logNotice(getString(R.string.status_starting_up)); + + sendCallbackStatusMessage(getString(R.string.status_starting_up)); + + killTorProcess (); + + try { - enableTransparentProxy(); - runTorShellCmd(); - runPrivoxyShellCmd(); + enableTransparentProxy(); + runTorShellCmd(); + runPrivoxyShellCmd(); - } catch (Exception e) { - logException("Unable to start Tor: " + e.getMessage(),e); - sendCallbackStatusMessage(getString(R.string.unable_to_start_tor) + ' ' + e.getMessage()); - - } + } catch (Exception e) { + logException("Unable to start Tor: " + e.getMessage(),e); + sendCallbackStatusMessage(getString(R.string.unable_to_start_tor) + ' ' + e.getMessage()); + + } } @@ -593,7 +612,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if(transProxyPortFallback) { - showAlert(getString(R.string.status), getString(R.string.setting_up_port_based_transparent_proxying_)); + + showToolbarNotification(getString(R.string.setting_up_port_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); StringTokenizer st = new StringTokenizer(portProxyList, ","); int status = code; while (st.hasMoreTokens()) @@ -607,12 +627,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if(transProxyAll) { - showAlert(getString(R.string.status), getString(R.string.setting_up_full_transparent_proxying_)); + showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + code = ttProxy.setTransparentProxyingAll(this); } else { - showAlert(getString(R.string.status), getString(R.string.setting_up_app_based_transparent_proxying_)); + showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + code = ttProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } @@ -622,13 +644,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (code == 0) { - showAlert(getString(R.string.status), getString(R.string.transparent_proxying_enabled)); - + showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); - if (transProxyTethering) { - showAlert(getString(R.string.status), getString(R.string.transproxy_enabled_for_tethering_)); + showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); ttProxy.enableTetheringRules(this); @@ -636,7 +656,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showAlert(getString(R.string.status), getString(R.string.warning_error_starting_transparent_proxying_)); + showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + } return true; @@ -666,7 +687,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst new TorTransProxy().flushIptables(this); - showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); + showToolbarNotification(getString(R.string.transproxy_rules_cleared), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + return true; } @@ -689,7 +711,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); } - String[] torCmd = {torBinaryPath + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n"}; + String[] torCmd = {fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n"}; boolean runAsRootFalse = false; boolean waitForProcess = false; @@ -710,19 +732,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst Thread.sleep(torRetryWaitTimeMS); - procId = TorServiceUtils.findProcessId(torBinaryPath); + procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); logNotice("got tor proc id: " + procId); if (procId == -1) { - sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_) + log.toString()); + sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); Thread.sleep(torRetryWaitTimeMS); attempts++; } - - logNotice(log.toString()); + + if (waitForProcess) + logNotice(log.toString()); } if (procId == -1) @@ -747,7 +770,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice( "Starting privoxy process"); - int privoxyProcId = TorServiceUtils.findProcessId(privoxyPath); + int privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath()); StringBuilder log = null; @@ -760,7 +783,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String privoxyConfigPath = new File(appBinHome, PRIVOXYCONFIG_ASSET_KEY).getAbsolutePath(); String[] cmds = - { privoxyPath + " " + privoxyConfigPath + " &" }; + { filePrivoxy.getAbsolutePath() + " " + privoxyConfigPath + " &" }; logNotice (cmds[0]); @@ -772,7 +795,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //wait one second to make sure it has started up Thread.sleep(1000); - while ((privoxyProcId = TorServiceUtils.findProcessId(privoxyPath)) == -1 && attempts < MAX_START_TRIES) + while ((privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath())) == -1 && attempts < MAX_START_TRIES) { logNotice("Couldn't find Privoxy process... retrying...\n" + log); Thread.sleep(3000); @@ -981,12 +1004,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void showAlert(String title, String msg) - { - //showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); - sendCallbackStatusMessage(msg); - - } + //showToolbarNotification(msg, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification); public void newDescriptors(List<String> orList) { @@ -1072,36 +1090,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst } public IBinder onBind(Intent intent) { - // Select the interface to return. If your service only implements - // a single interface, you can just return it here without checking - // the Intent. - _torInstance = this; - /* - try - { - - checkTorBinaries(false); - - } - catch (Exception e) - { - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(e.getMessage(), NOTIFY_ID, R.drawable.tornotificationerr); - - Log.d(TAG,"Unable to check for Tor binaries",e); - return null; - }*/ + _torInstance = this; + initTorPaths(); findExistingProc (); if (ITorService.class.getName().equals(intent.getAction())) { return mBinder; } - - - return null; + else + return null; } /** @@ -1346,7 +1346,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean applyPreferences () throws RemoteException { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); @@ -1393,10 +1392,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (bridgeList == null || bridgeList.length() == 0) { - - showAlert(getString(R.string.bridge_error),getString(R.string.bridge_requires_ip) + - getString(R.string.send_email_for_bridges)); - + String msgBridge = getString(R.string.bridge_requires_ip) + + getString(R.string.send_email_for_bridges); + showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.tornotification, -1); + return false; } @@ -1445,8 +1444,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert(getString(R.string.error),getString(R.string.your_reachableaddresses_settings_caused_an_exception_)); - + showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + return false; } @@ -1471,7 +1470,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert(getString(R.string.error),getString(R.string.your_relay_settings_caused_an_exception_)); + showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + return false; }

1 0

[orbot/master] minor code format change
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 63c4e973557eef7975d0d2b3eac3fb1a91a6e7d8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:03:54 2012 -0500 minor code format change --- .../torproject/android/service/TorTransProxy.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index b013045..dbb955b 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -273,9 +273,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --dport "); script.append(port); script.append(" -j ACCEPT"); - script.append(" || exit\n"); - + script.append(" || exit\n"); } + // Allow loopback script.append(ipTablesPath); script.append(" -t filter"); @@ -310,8 +310,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(" || exit\n"); } - } - + } + // Allow everything for Tor script.append(ipTablesPath);

1 0

[orbot/master] opt persistent notifications & geoip not default
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 1e3f6bbddfe5e6810581994914c2c0534e23ed53 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:04:41 2012 -0500 opt persistent notifications & geoip not default --- src/org/torproject/android/service/TorService.java | 77 ++++++++++++++------ 1 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0132418..e56539d 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -28,6 +28,7 @@ import org.torproject.android.TorConstants; import org.torproject.android.Utils; import org.torproject.android.settings.AppManager; +import android.app.Application; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -59,6 +60,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int ERROR_NOTIFY_ID = 3; private static final int HS_NOTIFY_ID = 3; + private boolean prefPersistNotifications = true; private static final int MAX_START_TRIES = 3; @@ -178,7 +180,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst Notification notification = new Notification(icon, tickerText, when); - if (flags != -1) + if (prefPersistNotifications && flags != -1) notification.flags |= flags; Context context = getApplicationContext(); @@ -204,11 +206,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst initTorPaths(); + //if Tor was deleted for some reason, do this again! if (!fileTor.exists()) { new Thread () - { - + { public void run () { try { @@ -272,21 +274,30 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void run () { - boolean isRunning = _torInstance.findExistingProc (); - - if (!isRunning) + if (currentStatus == STATUS_CONNECTING) + { + boolean isRunning = _torInstance.findExistingProc (); + + if (!isRunning) + { + try + { + initTor(); + isRunning = true; + } + catch (Exception e) + { + currentStatus = STATUS_OFF; + this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); + } + } + } + else if (currentStatus == STATUS_OFF) { - try - { - initTor(); - isRunning = true; - } - catch (Exception e) - { - currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); - Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); - } + + _torInstance.stopTor(); + } } @@ -452,8 +463,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void initTorPaths () { - - appBinHome = getDir("bin",0); + + appBinHome = getDir("bin",Application.MODE_PRIVATE); appDataHome = getCacheDir(); fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); @@ -975,9 +986,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst { currentStatus = STATUS_OFF; sendCallbackStatusMessage (getString(R.string.status_shutting_down)); + + Thread thread = new Thread(this); + thread.start(); - _torInstance.stopTor(); - } } @@ -1346,9 +1358,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean applyPreferences () throws RemoteException { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - + + prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); @@ -1378,7 +1393,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst { //only apple GeoIP if you need it File fileGeoIP = new File(appBinHome,"geoip"); - mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + + try + { + if (!fileGeoIP.exists()) + { + TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); + boolean success = installer.installGeoIP(); + } + + mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + } + catch (IOException e) + { + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + + return false; + } } mBinder.updateConfiguration("EntryNodes", entranceNodes, false);

1 0

[orbot/master] cleaned up notify icons
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 08a0376410df43ba720e9032aff4e4b9dd3658bf Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:05:43 2012 -0500 cleaned up notify icons --- res/drawable/tornotification.png | Bin 828 -> 779 bytes res/drawable/tornotificationerr.png | Bin 794 -> 751 bytes res/drawable/tornotificationon.png | Bin 875 -> 826 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png index 7992965..068c3b9 100644 Binary files a/res/drawable/tornotification.png and b/res/drawable/tornotification.png differ diff --git a/res/drawable/tornotificationerr.png b/res/drawable/tornotificationerr.png index 7e09074..90603f8 100644 Binary files a/res/drawable/tornotificationerr.png and b/res/drawable/tornotificationerr.png differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png index 01ab68a..68e8a34 100644 Binary files a/res/drawable/tornotificationon.png and b/res/drawable/tornotificationon.png differ

1 0

[orbot/master] updated version string in text for about dialog
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 71e79ea56cc0f4cf9f1acf910a00911c1befec8e Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 23:41:38 2012 -0500 updated version string in text for about dialog --- res/values/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 797e8a7..6d3f0f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -237,7 +237,7 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> -<string name="tor_version">Tor v0.2.3.7: https://www.torproject.org</string> +<string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>

1 0

[orbot/master] removed whispersys stuff for now
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit e6d65dbae92e19ab34ee10e468812bd106b92051 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:06:09 2012 -0500 removed whispersys stuff for now --- libs/whispercore.jar | Bin 9849 -> 0 bytes .../torproject/android/service/WhisperManager.java | 93 -------------------- 2 files changed, 0 insertions(+), 93 deletions(-) diff --git a/libs/whispercore.jar b/libs/whispercore.jar deleted file mode 100644 index 914e033..0000000 Binary files a/libs/whispercore.jar and /dev/null differ diff --git a/src/org/torproject/android/service/WhisperManager.java b/src/org/torproject/android/service/WhisperManager.java deleted file mode 100644 index d858af3..0000000 --- a/src/org/torproject/android/service/WhisperManager.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.torproject.android.service; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import com.whispersys.providers.Netfilter; - -/* - * Supports interaction with private APIs provided by WhisperSystems SDK - */ -public class WhisperManager { - - - Context context; - - - public boolean isWhisperCore () - { - boolean result = false; - - Cursor cursor = null; - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, Netfilter.Filter.Chains.OUTPUT); - - try { - cursor = context.getContentResolver().query(uri, null, null, null, null); - cursor.moveToFirst(); - result = true; - } - catch (Exception e) - { - result = false; - } - - return result; - } - /* - * Usage - The Netfilter provider allows you to query, update, insert, or delete rules from a chain of a table. Callers must provide a CONTENT_URI which specifies the chain of the table they would like to query or modify. - - To query and print the INPUT rules for the filter table, for instance, would look like this: - */ - - public void query () - { - Cursor cursor = null; - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, Netfilter.Filter.Chains.OUTPUT); - - try { - cursor = context.getContentResolver().query(uri, null, null, null, null); - - while (cursor.moveToNext()) - for (int i=0;i<cursor.getColumnCount();i++) - Log.w("TestApp", "Column: " + cursor.getColumnName(i) + " , value: " + cursor.getString(i)); - } finally { - if (cursor != null) - cursor.close(); - } - } - - /* - To append a rule that dropped all UDP traffic to the end of the OUTPUT chain would look like this: - */ - - public void append () - { - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, - Netfilter.Filter.Chains.OUTPUT); - ContentValues values = new ContentValues(); - values.put(Netfilter.Filter.TARGET, Netfilter.Targets.DROP); - values.put(Netfilter.Filter.PROTOCOL, Netfilter.Protocols.UDP); - - context.getContentResolver().insert(uri, values); - } - - /* - iptables rule indexes start at 1. To insert the same rule in the first position of the OUTPUT chain, rather than appending it to the end of the chain, would look like this: - */ - public void insert () - { - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, - Netfilter.Filter.Chains.OUTPUT); - ContentValues values = new ContentValues(); - values.put(Netfilter.Filter.TARGET, Netfilter.Targets.DROP); - values.put(Netfilter.Filter.PROTOCOL, Netfilter.Protocols.UDP); - values.put(Netfilter.Filter.ROW_ID, 1); - - context.getContentResolver().insert(uri, values); - } -} -

1 0