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

[orbot/master] add new diagnostics activity for problem childs
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit e70c8aca8795467f2e61bfdd3a07c2f14637b449 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 16 16:21:42 2014 -0400 add new diagnostics activity for problem childs --- res/layout/layout_diag.xml | 15 + res/menu/share_menu.xml | 7 + .../android/OrbotDiagnosticsActivity.java | 305 ++++++++++++++++++++ 3 files changed, 327 insertions(+) diff --git a/res/layout/layout_diag.xml b/res/layout/layout_diag.xml new file mode 100644 index 0000000..56cd8bb --- /dev/null +++ b/res/layout/layout_diag.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView android:id="@+id/aboutscrollview" + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:id="@+id/diaglog" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="15px" + android:paddingLeft="15px" + android:textStyle="bold" + android:textColor="#00ff00" /> + </ScrollView> diff --git a/res/menu/share_menu.xml b/res/menu/share_menu.xml new file mode 100644 index 0000000..2352da0 --- /dev/null +++ b/res/menu/share_menu.xml @@ -0,0 +1,7 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_item_share" + android:showAsAction="always" + android:title="Share Log" /> + +</menu> \ No newline at end of file diff --git a/src/org/torproject/android/OrbotDiagnosticsActivity.java b/src/org/torproject/android/OrbotDiagnosticsActivity.java new file mode 100644 index 0000000..71eb44f --- /dev/null +++ b/src/org/torproject/android/OrbotDiagnosticsActivity.java @@ -0,0 +1,305 @@ +package org.torproject.android; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; + +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.Toolbox; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; +import org.torproject.android.service.TorResourceInstaller; +import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.service.TorServiceUtils; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.os.Environment; +import android.os.Handler; +import android.os.Message; +import android.os.StatFs; +import android.text.format.Formatter; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.TextView; + + +public class OrbotDiagnosticsActivity extends Activity { + + private TextView mTextView = null; + private final static String TAG = "OrbotDiag"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.layout_diag); + + mTextView = (TextView)findViewById(R.id.diaglog); + + log("Hello, Orbot!"); + + log(android.os.Build.DEVICE); + log(android.os.Build.HARDWARE); + log(android.os.Build.MANUFACTURER); + log(android.os.Build.MODEL); + log(android.os.Build.VERSION.CODENAME); + log(android.os.Build.VERSION.RELEASE); + log("freemem: " + Runtime.getRuntime().freeMemory()); + log("maxmem: " + Runtime.getRuntime().maxMemory()); + log("storage: " + getFreeStorage()); + } + + private String getFreeStorage () + { + File path = Environment.getDataDirectory(); + StatFs stat = new StatFs(path.getPath()); + long blockSize = stat.getBlockSize(); + long availableBlocks = stat.getAvailableBlocks(); + return Formatter.formatFileSize(this, availableBlocks * blockSize); + } + + @Override + protected void onPause() { + // TODO Auto-generated method stub + super.onPause(); + } + + @Override + protected void onDestroy() { + + super.onDestroy(); + File appBinHome = this.getDir("bin", Context.MODE_PRIVATE); + + File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); + + try { + killAllTor (fileTor); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Override + protected void onResume() { + super.onResume(); + + showFileTree (); + + runTorTest(); + } + + private void killAllTor (File fileTor) throws IOException + { + int maxTry = 5; + int currTry = 0; + + Shell shell = Shell.startShell(); + Toolbox tb = new Toolbox(shell); + int procId; + + while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) + { + + log ("Found existing orphan Tor process; Trying to shutdown now (device restart may be needed)..."); + log("Found Tor PID=" + procId + " - attempt to shutdown now..."); + + SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); + shell.add(killCommand); + killCommand = new SimpleCommand("kill -9 " + procId); + shell.add(killCommand); + } + } + + private void runTorTest () + { + try + { + File appBinHome = this.getDir("bin", Context.MODE_PRIVATE); + File appDataHome = this.getDir("data", Context.MODE_PRIVATE); + + File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); + enableBinExec (fileTor, appBinHome); + killAllTor (fileTor); + + InputStream is = getResources().openRawResource(R.raw.torrcdiag); + File fileTorrc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY + "diag"); + TorResourceInstaller.streamToFile(is,fileTorrc, false, false); + + /** + ArrayList<String> alEnv = new ArrayList<String>(); + alEnv.add("HOME=" + appBinHome.getAbsolutePath()); + Shell shell = Shell.startShell(alEnv,appBinHome.getAbsolutePath()); + SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath()); + shell.add(cmdTor); + **/ + + String cmd = fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath(); + + log ("Executing command> " + cmd); + + Process process = Runtime.getRuntime().exec(cmd); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream())); + StreamGobbler sg = new StreamGobbler(); + sg.reader = bufferedReader; + sg.process = process; + new Thread(sg).start(); + + bufferedReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + sg = new StreamGobbler(); + sg.reader = bufferedReader; + sg.process = process; + new Thread(sg).start(); + + + } + catch (Exception e) + { + Log.d(TAG,"runTorTest exception",e); + } + + } + + class StreamGobbler implements Runnable + { + BufferedReader reader; + Process process; + + public void run () + { + String line = null; + try { + while ( (line = reader.readLine()) != null) + { + Message msg = mHandler.obtainMessage(0); + msg.getData().putString("log", line); + mHandler.sendMessage(msg); + } + + } catch (IOException e) { + Log.d(TAG, "error reading line",e); + } + + log("Tor exit code=" + process.exitValue() + ";"); + } + } + + private boolean enableBinExec (File fileBin, File appBinHome) throws Exception + { + + log(fileBin.getName() + ": PRE: Is binary exec? " + fileBin.canExecute()); + + if (!fileBin.canExecute()) + { + log("(re)Setting permission on binary: " + fileBin.getAbsolutePath()); + Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getAbsolutePath()); + + shell.add(new SimpleCommand("chmod " + TorServiceConstants.CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath())).waitForFinish(); + + File fileTest = new File(fileBin.getAbsolutePath()); + log(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute()); + + shell.close(); + } + + return fileBin.canExecute(); + } + + private void showFileTree () + { + + File fileDir = this.getDir("bin", Context.MODE_PRIVATE); + log("checking file tree: " + fileDir.getAbsolutePath()); + printDir (fileDir.getName(), fileDir); + + + fileDir = this.getDir("data", Context.MODE_PRIVATE); + log("checking file tree: " + fileDir.getAbsolutePath()); + printDir (fileDir.getName(), fileDir); + + + + } + + private void printDir (String path, File fileDir) + { + File[] files = fileDir.listFiles(); + + for (File file : files) + { + + if (file.isDirectory()) + { + printDir(path + '/' + file.getName(), file); + } + else + { + log(path + '/' + file.getName() + " len:" + file.length() + " exec:" + file.canExecute()); + + } + + } + } + + Handler mHandler = new Handler () + { + + @Override + public void handleMessage(Message msg) { + + super.handleMessage(msg); + + String logMsg = msg.getData().getString("log"); + log(logMsg); + } + + }; + + private void log (String msg) + { + Log.d(TAG, msg); + mTextView.append(msg + '\n'); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate menu resource file. + getMenuInflater().inflate(R.menu.share_menu, menu); + + // Locate MenuItem with ShareActionProvider + MenuItem item = menu.findItem(R.id.menu_item_share); + + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + + case R.id.menu_item_share: + sendLog(); + return true; + + default: + return super.onOptionsItemSelected(item); + } + } + + private void sendLog () + { + Intent sendIntent = new Intent(); + sendIntent.setAction(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_TEXT, mTextView.getText().toString()); + sendIntent.setType("text/plain"); + startActivity(sendIntent); + } + + +}

1 0

[orbot/master] small fixes for service (NPE handling) and resource installer
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit eab54f7af9f4ebecf3192d33158462ef50392922 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 16 16:22:09 2014 -0400 small fixes for service (NPE handling) and resource installer --- src/org/torproject/android/service/TorResourceInstaller.java | 6 +++--- src/org/torproject/android/service/TorService.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index d17cd70..04b7d2d 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -150,7 +150,7 @@ public class TorResourceInstaller implements TorServiceConstants { /* * Write the inputstream contents to the file */ - private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException + public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException { byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; @@ -187,7 +187,7 @@ public class TorResourceInstaller implements TorServiceConstants { } //copy the file from inputstream to File output - alternative impl - public void copyFile (InputStream is, File outputFile) + public static void copyFile (InputStream is, File outputFile) { try { @@ -230,7 +230,7 @@ public class TorResourceInstaller implements TorServiceConstants { * @throws IOException on error * @throws InterruptedException when interrupted */ - private static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException + public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException { final String abspath = file.getAbsolutePath(); // Write the iptables binary diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ecc5017..7f889c0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -199,8 +199,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void clearNotifications () { - mNotificationManager.cancelAll(); - + if (mNotificationManager != null) + mNotificationManager.cancelAll(); }

1 0

[orbot/master] fix menu to now show share
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 71de5c602af671d3f36f2aecd41b3369bcb92208 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:15:26 2014 -0400 fix menu to now show share --- res/menu/main.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/menu/main.xml b/res/menu/main.xml index 0d603c7..4cbee84 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -24,7 +24,6 @@ android:title="@string/menu_start" android:icon="@drawable/ic_action_start" yourapp:showAsAction="ifRoom" - yourapp:actionProviderClass="android.support.v7.widget.ShareActionProvider" /> <item android:id="@+id/menu_settings"

1 0

[orbot/master] use 127.0.0.1 and not localhost
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit ae906d00aca893a7bf33136fbdd2f294ab0bbf46 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:16:49 2014 -0400 use 127.0.0.1 and not localhost --- src/org/torproject/android/service/TorServiceConstants.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 98129d9..29686f9 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -15,13 +15,11 @@ public interface TorServiceConstants { //torrc (tor config file) public final static String TORRC_ASSET_KEY = "torrc"; + public final static String TORRCDIAG_ASSET_KEY = "torrcdiag"; public final static String TORRC_TETHER_KEY = "torrctether"; public final static String TOR_CONTROL_COOKIE = "control_auth_cookie"; - //how to launch tor -// public final static String TOR_COMMAND_LINE_ARGS = "-f " + TORRC_INSTALL_PATH + " || exit\n"; - //privoxy public final static String PRIVOXY_ASSET_KEY = "privoxy"; @@ -54,7 +52,7 @@ public interface TorServiceConstants { public final static int PORT_SOCKS = 9050; //what is says! - public final static String IP_LOCALHOST = "localhost"; + public final static String IP_LOCALHOST = "127.0.0.1"; public final static int TOR_CONTROL_PORT = 9051; public final static int UPDATE_TIMEOUT = 1000; public final static int TOR_TRANSPROXY_PORT = 9040;

1 0

[orbot/master] updated to 13.0.6-RC-4
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 557dabd143ff7e1bbb42b1dd15cecd7b49aa9e83 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:17:20 2014 -0400 updated to 13.0.6-RC-4 --- AndroidManifest.xml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6a888bb..694ae3d 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.6-RC-3" - android:versionCode="81" + android:versionName="13.0.6-RC-4" + android:versionCode="83" android:installLocation="auto" > @@ -67,12 +67,24 @@ </activity> + + <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag" + android:icon="@drawable/ic_launcher" + android:theme="@style/Theme.AppCompat" + android:exported="true" + android:taskAffinity="org.torproject.android.OrbotDiagnosticsActivity" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> - <activity android:name=".wizard.LotsaText"/> - <activity android:name=".wizard.Permissions"/> - <activity android:name=".wizard.TipsAndTricks"/> - <activity android:name=".wizard.ConfigureTransProxy"/> - <activity android:name=".wizard.ChooseLocaleWizardActivity"/> + <activity android:name=".wizard.LotsaText" android:exported="false"/> + <activity android:name=".wizard.Permissions" android:exported="false"/> + <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> + <activity android:name=".wizard.ConfigureTransProxy" android:exported="false"/> + <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/>

1 0

[orbot/master] check if needed ports are available
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 78e7af4372cc9dc5f5484fccd7814d1a95d728cc Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 11:34:47 2014 -0400 check if needed ports are available dont' reapply transproxy on network reconnect --- src/org/torproject/android/service/TorService.java | 41 ++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 441bd1e..48eb580 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -15,6 +15,8 @@ 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; @@ -121,8 +123,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (ENABLE_DEBUG_LOG) { Log.e(TAG,msg,e); - sendCallbackLogMessage(msg); } + + sendCallbackLogMessage(msg); + } @@ -615,6 +619,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void initTor () throws Exception { + boolean portsAvail = checkPortsAvailable(); + + if (!portsAvail) + { + logNotice("Another app is blocking Tor from starting"); + return; + } + try { initBinaries(); @@ -650,6 +662,31 @@ 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 is not available",e); + return false; + } + } + + return true; + + } + /* * activate means whether to apply the users preferences * or clear them out @@ -1576,8 +1613,6 @@ 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); - if (mHasRoot && mEnableTransparentProxy) - enableTransparentProxy(mTransProxyAll, mTransProxyTethering); } } catch (Exception e) {

1 0

[orbot/master] fixes to ensure service does not block
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 5551c59e50d70626a5cfb0f7efbffa0657498d9f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:16:56 2014 -0400 fixes to ensure service does not block --- src/org/torproject/android/service/TorService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 7f889c0..441bd1e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -738,6 +738,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); + // if (ENABLE_DEBUG_LOG) + // torrcPath = new File(appBinHome, TORRCDIAG_ASSET_KEY).getAbsolutePath(); + boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); if (transProxyTethering) @@ -745,7 +748,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); } - int procId = -1; int torRetryWaitTimeMS = 1000; @@ -759,11 +761,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " &"); shell.add(cmdTor); - if (TorService.ENABLE_DEBUG_LOG) - { - logNotice("Tor exit code=" + cmdTor.getExitCode() + ";output=" + cmdTor.getOutput()); - } - //wait a few seconds Thread.sleep(torRetryWaitTimeMS); @@ -1393,7 +1390,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (IOException ioe){ - logMessage("error requesting newny: " + ioe.getLocalizedMessage()); + logMessage("error requesting newnym: " + ioe.getLocalizedMessage()); } } }.start(); @@ -1502,7 +1499,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private synchronized void sendCallbackLogMessage (String logMessage) + private void sendCallbackLogMessage (String logMessage) { if (mCallbacks == null)

1 0

[orbot/master] improve diagnostics apps
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 1ea5281f82f2ea0df616173c2ca58aec6d7766c8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:16:25 2014 -0400 improve diagnostics apps --- .../android/OrbotDiagnosticsActivity.java | 141 +++++++++++++------- 1 file changed, 93 insertions(+), 48 deletions(-) diff --git a/src/org/torproject/android/OrbotDiagnosticsActivity.java b/src/org/torproject/android/OrbotDiagnosticsActivity.java index 71eb44f..453c0bc 100644 --- a/src/org/torproject/android/OrbotDiagnosticsActivity.java +++ b/src/org/torproject/android/OrbotDiagnosticsActivity.java @@ -42,17 +42,6 @@ public class OrbotDiagnosticsActivity extends Activity { mTextView = (TextView)findViewById(R.id.diaglog); - log("Hello, Orbot!"); - - log(android.os.Build.DEVICE); - log(android.os.Build.HARDWARE); - log(android.os.Build.MANUFACTURER); - log(android.os.Build.MODEL); - log(android.os.Build.VERSION.CODENAME); - log(android.os.Build.VERSION.RELEASE); - log("freemem: " + Runtime.getRuntime().freeMemory()); - log("maxmem: " + Runtime.getRuntime().maxMemory()); - log("storage: " + getFreeStorage()); } private String getFreeStorage () @@ -90,6 +79,23 @@ public class OrbotDiagnosticsActivity extends Activity { protected void onResume() { super.onResume(); + + log("Hello, Orbot!"); + + try + { + log(android.os.Build.DEVICE); + log(android.os.Build.HARDWARE); + log(android.os.Build.MANUFACTURER); + log(android.os.Build.MODEL); + log(android.os.Build.VERSION.CODENAME); + log(android.os.Build.VERSION.RELEASE); + } + catch (Exception e) + { + log("error getting device info"); + } + showFileTree (); runTorTest(); @@ -97,24 +103,36 @@ public class OrbotDiagnosticsActivity extends Activity { private void killAllTor (File fileTor) throws IOException { - int maxTry = 5; - int currTry = 0; - - Shell shell = Shell.startShell(); - Toolbox tb = new Toolbox(shell); - int procId; - - while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) + try { - - log ("Found existing orphan Tor process; Trying to shutdown now (device restart may be needed)..."); - log("Found Tor PID=" + procId + " - attempt to shutdown now..."); - - SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); - shell.add(killCommand); - killCommand = new SimpleCommand("kill -9 " + procId); - shell.add(killCommand); + int maxTry = 5; + int currTry = 0; + + Shell shell = Shell.startShell(); + int procId; + + while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) + { + + log ("Found existing orphan Tor process; Trying to shutdown now (device restart may be needed)..."); + log("Found Tor PID=" + procId + " - attempt to shutdown now..."); + + SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); + shell.add(killCommand); + killCommand.waitForFinish(); + log ("kill output: " + killCommand.getExitCode() + "; " + killCommand.getOutput()); + killCommand = new SimpleCommand("kill -9 " + procId); + shell.add(killCommand); + killCommand.waitForFinish(); + log ("kill output: " + killCommand.getExitCode() + "; " + killCommand.getOutput()); + } } + catch (Exception e) + { + log("error killing Tor: " + e.getLocalizedMessage()); + Log.d(TAG, "error killing Tor", e); + } + } private void runTorTest () @@ -145,17 +163,21 @@ public class OrbotDiagnosticsActivity extends Activity { log ("Executing command> " + cmd); Process process = Runtime.getRuntime().exec(cmd); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream())); StreamGobbler sg = new StreamGobbler(); sg.reader = bufferedReader; sg.process = process; new Thread(sg).start(); - bufferedReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); - sg = new StreamGobbler(); - sg.reader = bufferedReader; - sg.process = process; - new Thread(sg).start(); + if (process.getErrorStream() != null) + { + bufferedReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + sg = new StreamGobbler(); + sg.reader = bufferedReader; + sg.process = process; + new Thread(sg).start(); + } } @@ -215,14 +237,27 @@ public class OrbotDiagnosticsActivity extends Activity { { File fileDir = this.getDir("bin", Context.MODE_PRIVATE); - log("checking file tree: " + fileDir.getAbsolutePath()); - printDir (fileDir.getName(), fileDir); - - fileDir = this.getDir("data", Context.MODE_PRIVATE); - log("checking file tree: " + fileDir.getAbsolutePath()); - printDir (fileDir.getName(), fileDir); + if (fileDir.exists()) + { + log("checking file tree: " + fileDir.getAbsolutePath()); + printDir (fileDir.getName(), fileDir); + } + else + { + log("app_bin does not exist"); + } + fileDir = this.getDir("data", Context.MODE_PRIVATE); + if (fileDir.exists()) + { + log("checking file tree: " + fileDir.getAbsolutePath()); + printDir (fileDir.getName(), fileDir); + } + else + { + log ("app_data does not exist"); + } } @@ -231,19 +266,29 @@ public class OrbotDiagnosticsActivity extends Activity { { File[] files = fileDir.listFiles(); - for (File file : files) + if (files != null && files.length > 0) { - - if (file.isDirectory()) + for (File file : files) { - printDir(path + '/' + file.getName(), file); - } - else - { - log(path + '/' + file.getName() + " len:" + file.length() + " exec:" + file.canExecute()); - + + try + { + if (file.isDirectory()) + { + printDir(path + '/' + file.getName(), file); + } + else + { + log(path + '/' + file.getName() + " len:" + file.length() + " exec:" + file.canExecute()); + + } + } + catch (Exception e) + { + log("problem printing out file information"); + } + } - } }

1 0

[orbot/master] ensure ipv6 packets are dropped and shell cmds exit
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 2996fb2078cd86d101cdb32948b7d58ea5a06bca Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:16:03 2014 -0400 ensure ipv6 packets are dropped and shell cmds exit --- .../torproject/android/service/TorTransProxy.java | 96 ++++++++++++++++++-- 1 file changed, 86 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5a11ebf..aa30bd2 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -21,6 +21,8 @@ public class TorTransProxy implements TorServiceConstants { private TorService mTorService = null; private File mFileXtables = null; + private final static String ALLOW_LOCAL = " ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 "; + public TorTransProxy (TorService torService, File fileXTables) { mTorService = torService; @@ -49,7 +51,31 @@ public class TorTransProxy implements TorServiceConstants { return ipTablesPath; } + + public String getIp6TablesPath (Context context) + { + + String ipTablesPath = null; + + SharedPreferences prefs = TorService.getSharedPrefs(context.getApplicationContext()); + useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false); + + if (useSystemIpTables) + { + ipTablesPath = findSystemIP6Tables(); + } + else + { + ipTablesPath = mFileXtables.getAbsolutePath(); + ipTablesPath += " ip6tables"; //append subcommand since we are using xtables now + + } + + return ipTablesPath; + + } + private String findSystemIPTables () { if (mSysIptables != null) @@ -77,6 +103,29 @@ public class TorTransProxy implements TorServiceConstants { return mSysIptables; } + + + private String findSystemIP6Tables () + { + + //if the user wants us to use the built-in iptables, then we have to find it + File fileIpt = new File("/system/xbin/ip6tables"); + + if (fileIpt.exists()) + mSysIptables = fileIpt.getAbsolutePath(); + else + { + + fileIpt = new File("/system/bin/ip6tables"); + + if (fileIpt.exists()) + mSysIptables = fileIpt.getAbsolutePath(); + } + + + return mSysIptables; + } + /* public int flushIptablesAll(Context context) throws Exception { @@ -321,6 +370,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p tcp"); + script.append(ALLOW_LOCAL); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m tcp --syn"); @@ -335,7 +385,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p udp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); @@ -367,7 +417,6 @@ public class TorTransProxy implements TorServiceConstants { script = new StringBuilder(); } - // Allow packets to localhost (contains all the port-redirected ones) script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); @@ -387,6 +436,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -A ").append(srcChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); + script.append(ALLOW_LOCAL); script.append(" -j DROP"); lastExit = executeCommand (shell, script.toString()); @@ -403,7 +453,7 @@ public class TorTransProxy implements TorServiceConstants { private int executeCommand (Shell shell, String cmdString) throws IOException, TimeoutException { - SimpleCommand cmd = new SimpleCommand(cmdString); + SimpleCommand cmd = new SimpleCommand(cmdString + "|| exit"); shell.add(cmd); cmd.waitForFinish(); logMessage(cmdString + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); @@ -523,11 +573,36 @@ public class TorTransProxy implements TorServiceConstants { } - public int setTransparentProxyingAll(Context context) throws Exception + public int dropAllIPv6Traffic (Context context) throws Exception { + + String ip6tablesPath = getIp6TablesPath(context); + Shell shell = Shell.startRootShell(); + + StringBuilder script; + + // Allow everything for Tor - //redirectDNSResolvConf(); //not working yet + script = new StringBuilder(); + script.append(ip6tablesPath); + script.append(" -A INPUT -j DROP"); + executeCommand (shell, script.toString()); + + script = new StringBuilder(); + script.append(ip6tablesPath); + script.append(" -A OUTPUT -j DROP"); + int lastExit = executeCommand (shell, script.toString()); + + shell.close(); + + return lastExit; + } + + public int setTransparentProxyingAll(Context context) throws Exception + { + + dropAllIPv6Traffic(context); String ipTablesPath = getIpTablesPath(context); @@ -567,7 +642,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p tcp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m tcp --syn"); @@ -582,7 +657,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p udp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); @@ -684,17 +759,18 @@ public class TorTransProxy implements TorServiceConstants { script = new StringBuilder(); - // Reject all other outbound UDP packets + // Reject all other packets script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); - script.append(" -j DROP"); + script.append(ALLOW_LOCAL); //allow access to localhost + script.append(" -j REJECT"); int lastExit = executeCommand (shell, script.toString()); - fixTransproxyLeak (context); + // fixTransproxyLeak (context); shell.close();

1 0

[orbot/master] fix issues with per-app filtering and ipv6
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 2628565b45a6a757e8e8f48605b7d2f31a3b515b Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 11:34:31 2014 -0400 fix issues with per-app filtering and ipv6 --- .../torproject/android/service/TorTransProxy.java | 93 +++++++++----------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index aa30bd2..f7fd535 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -330,6 +330,8 @@ public class TorTransProxy implements TorServiceConstants { String srcChainName = "OUTPUT"; + int torUid = context.getApplicationInfo().uid; + //run the delete commands in a separate process as it might error out //String[] cmdExecClear = {script.toString()}; //code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); @@ -338,6 +340,10 @@ public class TorTransProxy implements TorServiceConstants { Shell shell = Shell.startRootShell(); int lastExit = -1; + StringBuilder script; + + + // Allow everything for Tor //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) @@ -348,10 +354,12 @@ public class TorTransProxy implements TorServiceConstants { ) //if app is set to true { - StringBuilder script = new StringBuilder(); logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); + dropAllIPv6Traffic(context, tApp.getUid()); + + script = new StringBuilder(); // Allow loopback script.append(ipTablesPath); @@ -385,7 +393,6 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p udp"); - script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); @@ -393,40 +400,6 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - - executeCommand (shell, script.toString()); - script = new StringBuilder(); - - - int[] ports = {TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; - - for (int port : ports) - { - // Allow packets to localhost (contains all the port-redirected ones) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A ").append(srcChainName); - script.append(" -p tcp"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" --dport "); - script.append(port); - script.append(" -j ACCEPT"); - - executeCommand (shell, script.toString()); - script = new StringBuilder(); - } - - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A ").append(srcChainName); - script.append(" -p udp"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" --dport "); - script.append(TOR_DNS_PORT); - script.append(" -j ACCEPT"); - executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -437,10 +410,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(ALLOW_LOCAL); - script.append(" -j DROP"); + script.append(" -j REJECT"); lastExit = executeCommand (shell, script.toString()); - script = new StringBuilder(); } @@ -455,8 +427,7 @@ public class TorTransProxy implements TorServiceConstants { { SimpleCommand cmd = new SimpleCommand(cmdString + "|| exit"); shell.add(cmd); - cmd.waitForFinish(); - logMessage(cmdString + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); + logMessage(cmdString);// + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); return cmd.getExitCode(); } @@ -543,6 +514,8 @@ public class TorTransProxy implements TorServiceConstants { int lastExit = executeCommand (shell, script.toString()); shell.close(); + + clearAllIPv6Filters(context); return lastExit; } @@ -573,7 +546,7 @@ public class TorTransProxy implements TorServiceConstants { } - public int dropAllIPv6Traffic (Context context) throws Exception + public int dropAllIPv6Traffic (Context context, int appUid) throws Exception { String ip6tablesPath = getIp6TablesPath(context); @@ -581,17 +554,39 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder script; - - // Allow everything for Tor - - script = new StringBuilder(); + + script = new StringBuilder(); script.append(ip6tablesPath); - script.append(" -A INPUT -j DROP"); - executeCommand (shell, script.toString()); + script.append(" -A OUTPUT"); + + if (appUid != -1) + { + script.append(" -m owner --uid-owner "); + script.append(appUid); + } + + script.append(" -j DROP"); + + int lastExit = executeCommand (shell, script.toString()); + + shell.close(); + + return lastExit; + } + + public int clearAllIPv6Filters (Context context) throws Exception + { + + String ip6tablesPath = getIp6TablesPath(context); + Shell shell = Shell.startRootShell(); + + + StringBuilder script; script = new StringBuilder(); script.append(ip6tablesPath); - script.append(" -A OUTPUT -j DROP"); + script.append(" -t filter"); + script.append(" -F OUTPUT"); int lastExit = executeCommand (shell, script.toString()); shell.close(); @@ -602,7 +597,7 @@ public class TorTransProxy implements TorServiceConstants { public int setTransparentProxyingAll(Context context) throws Exception { - dropAllIPv6Traffic(context); + dropAllIPv6Traffic(context,-1); String ipTablesPath = getIpTablesPath(context);

1 0