dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for transproxy rule adding/deleting

This commit is contained in:
n8fr8 2012-10-01 13:46:08 +05:30
parent 5363355d42
commit 9de420e124
4 changed files with 68 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/torproject/android/Orbot.java
View File

@ -32,6 +32,7 @@ import android.os.Message;
import android.os.RemoteException; import android.os.RemoteException;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.ClipboardManager; import android.text.ClipboardManager;
import android.text.Layout;
import android.text.method.ScrollingMovementMethod; import android.text.method.ScrollingMovementMethod;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -40,15 +41,11 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener; import android.view.View.OnLongClickListener;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.SlidingDrawer; import android.widget.SlidingDrawer;
import android.widget.SlidingDrawer.OnDrawerCloseListener;
import android.widget.SlidingDrawer.OnDrawerOpenListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -126,7 +123,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
}); });
mTxtOrbotLog.setMovementMethod(new ScrollingMovementMethod()); ScrollingMovementMethod smm = new ScrollingMovementMethod();
mTxtOrbotLog.setMovementMethod(smm);
mTxtOrbotLog.setOnLongClickListener(new View.OnLongClickListener() { mTxtOrbotLog.setOnLongClickListener(new View.OnLongClickListener() {
@ -144,6 +143,20 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
} }
private void appendLogTextAndScroll(String text)
{
if(mTxtOrbotLog != null){
mTxtOrbotLog.append(text + "\n");
final Layout layout = mTxtOrbotLog.getLayout();
if(layout != null){
int scrollDelta = layout.getLineBottom(mTxtOrbotLog.getLineCount() - 1)
- mTxtOrbotLog.getScrollY() - mTxtOrbotLog.getHeight();
if(scrollDelta > 0)
mTxtOrbotLog.scrollBy(0, scrollDelta);
}
}
}
/* /*
* Create the UI Options Menu (non-Javadoc) * Create the UI Options Menu (non-Javadoc)
* @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
@ -574,7 +587,7 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
if (torServiceMsg != null && torServiceMsg.length() > 0) if (torServiceMsg != null && torServiceMsg.length() > 0)
{ {
// showAlert("Update", torServiceMsg,xte // showAlert("Update", torServiceMsg,xte
mTxtOrbotLog.append(torServiceMsg + "\n"); appendLogTextAndScroll(torServiceMsg);
} }
boolean showFirstTime = prefs.getBoolean("connect_first_time",true); boolean showFirstTime = prefs.getBoolean("connect_first_time",true);
@ -605,7 +618,7 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
// if (progressDialog != null) // if (progressDialog != null)
// progressDialog.setMessage(torServiceMsg); // progressDialog.setMessage(torServiceMsg);
mTxtOrbotLog.append(torServiceMsg + '\n'); appendLogTextAndScroll(torServiceMsg);
if (mItemOnOff != null) if (mItemOnOff != null)
mItemOnOff.setTitle(R.string.menu_stop); mItemOnOff.setTitle(R.string.menu_stop);

2
src/org/torproject/android/service/TorService.java
View File

@ -993,7 +993,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
} }
public void setTorProfile(int profile) { public void setTorProfile(int profile) {
logNotice("Tor profile set to " + profile); // logNotice("Tor profile set to " + profile);
if (profile == PROFILE_ON) if (profile == PROFILE_ON)
{ {

2
src/org/torproject/android/service/TorServiceConstants.java
View File

@ -77,7 +77,7 @@ public interface TorServiceConstants {
public static final int DISABLE_TOR_MSG = 3; public static final int DISABLE_TOR_MSG = 3;
public static final int LOG_MSG = 4; public static final int LOG_MSG = 4;
public static final String BINARY_TOR_VERSION = "0.2.3.17-beta"; public static final String BINARY_TOR_VERSION = "0.2.4.3-alpha";
public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12";
public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; 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"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

252
src/org/torproject/android/service/TorTransProxy.java
View File

@ -65,6 +65,7 @@ public class TorTransProxy implements TorServiceConstants {
return path; return path;
} }
/*
public int flushIptablesAll(Context context) throws Exception { public int flushIptablesAll(Context context) throws Exception {
String ipTablesPath = getIpTablesPath(context); String ipTablesPath = getIpTablesPath(context);
@ -91,7 +92,7 @@ public class TorTransProxy implements TorServiceConstants {
return code; return code;
} }*/
/* /*
public static int purgeIptablesByApp(Context context, TorifiedApp[] apps) throws Exception { public static int purgeIptablesByApp(Context context, TorifiedApp[] apps) throws Exception {
@ -210,9 +211,17 @@ public class TorTransProxy implements TorServiceConstants {
return code; return code;
} }
public int setTransparentProxyingByApp (Context context, ArrayList<TorifiedApp> apps) throws Exception public int setTransparentProxyingByApp (Context context, ArrayList<TorifiedApp> apps) throws Exception
{
return modifyTransparentProxyingByApp(context, "A", apps);
}
public int clearTransparentProxyingByApp (Context context, ArrayList<TorifiedApp> apps) throws Exception
{
return modifyTransparentProxyingByApp(context, "D", apps);
}
public int modifyTransparentProxyingByApp(Context context, String cmd, ArrayList<TorifiedApp> apps) throws Exception
{ {
boolean runRoot = true; boolean runRoot = true;
@ -227,6 +236,8 @@ public class TorTransProxy implements TorServiceConstants {
StringBuilder res = new StringBuilder(); StringBuilder res = new StringBuilder();
int code = -1; int code = -1;
String modCmd = " -" + cmd + " OUTPUT";
// flushIptables(context); // flushIptables(context);
int torUid = context.getApplicationInfo().uid; int torUid = context.getApplicationInfo().uid;
@ -245,7 +256,7 @@ public class TorTransProxy implements TorServiceConstants {
// Set up port redirection // Set up port redirection
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t nat"); script.append(" -t nat");
script.append(" -p tcp"); script.append(" -p tcp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" ! -d 127.0.0.1"); //allow access to localhost
@ -258,7 +269,7 @@ public class TorTransProxy implements TorServiceConstants {
// Same for DNS // Same for DNS
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t nat"); script.append(" -t nat");
script.append(" -p udp -m owner --uid-owner "); script.append(" -p udp -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -274,7 +285,7 @@ public class TorTransProxy implements TorServiceConstants {
{ {
// Allow packets to localhost (contains all the port-redirected ones) // Allow packets to localhost (contains all the port-redirected ones)
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -288,7 +299,7 @@ public class TorTransProxy implements TorServiceConstants {
// Allow loopback // Allow loopback
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -299,7 +310,7 @@ public class TorTransProxy implements TorServiceConstants {
// Reject DNS that is not from Tor (order is important - first matched rule counts!) // Reject DNS that is not from Tor (order is important - first matched rule counts!)
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -311,7 +322,7 @@ public class TorTransProxy implements TorServiceConstants {
// Reject all other outbound TCP packets // Reject all other outbound TCP packets
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -321,7 +332,7 @@ public class TorTransProxy implements TorServiceConstants {
// Reject all other outbound UDP packets // Reject all other outbound UDP packets
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
@ -332,15 +343,16 @@ public class TorTransProxy implements TorServiceConstants {
} }
} }
/*
// Allow everything for Tor // Allow everything for Tor
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -A OUTPUT"); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(torUid); script.append(torUid);
script.append(" -j ACCEPT"); script.append(" -j ACCEPT");
script.append(" || exit\n"); script.append(" || exit\n");
*/
String[] cmdAdd = {script.toString()}; String[] cmdAdd = {script.toString()};
@ -351,113 +363,6 @@ public class TorTransProxy implements TorServiceConstants {
return code; return code;
} }
public int clearTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps) throws Exception
{
boolean runRoot = true;
boolean waitFor = true;
//redirectDNSResolvConf(); //not working yet
String ipTablesPath = getIpTablesPath(context);
StringBuilder script = new StringBuilder();
StringBuilder res = new StringBuilder();
int code = -1;
int torUid = context.getApplicationInfo().uid;
//build up array of shell cmds to execute under one root context
for (TorifiedApp tApp:apps)
{
if (tApp.isTorified()
&& (!tApp.getUsername().equals(TorServiceConstants.TOR_APP_USERNAME))
&& (!tApp.getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME))
) //if app is set to true
{
TorService.logMessage("clear transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")");
// Set up port redirection
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t nat");
script.append(" -p tcp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -m owner --uid-owner ");
script.append(tApp.getUid());
script.append(" -m tcp --syn");
script.append(" -j REDIRECT --to-ports ");
script.append(TOR_TRANSPROXY_PORT);
script.append(" || exit\n");
// Same for DNS
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t nat");
script.append(" -p udp -m owner --uid-owner ");
script.append(tApp.getUid());
script.append(" -m udp --dport ");
script.append(STANDARD_DNS_PORT);
script.append(" -j REDIRECT --to-ports ");
script.append(TOR_DNS_PORT);
script.append(" || exit\n");
// Reject DNS that is not from Tor (order is important - first matched rule counts!)
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -m owner --uid-owner ");
script.append(tApp.getUid());
script.append(" -p udp");
script.append(" --dport ");
script.append(STANDARD_DNS_PORT);
script.append(" -j REJECT");
script.append(" || exit\n");
// Reject all other outbound TCP packets
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -m owner --uid-owner ");
script.append(tApp.getUid());
script.append(" -p tcp");
script.append(" -j REJECT");
script.append(" || exit\n");
// Reject all other outbound TCP packets
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -m owner --uid-owner ");
script.append(tApp.getUid());
script.append(" -p udp");
script.append(" -j REJECT");
script.append(" || exit\n");
}
}
// Allow everything for Tor
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -m owner --uid-owner ");
script.append(torUid);
script.append(" -j ACCEPT");
script.append(" || exit\n");
String[] cmdAdd = {script.toString()};
code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
String msg = res.toString();
TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
return code;
}
/* /*
// this is a bad idea so removing // this is a bad idea so removing
public int setTransparentProxyingByPort(Context context, int port) throws Exception public int setTransparentProxyingByPort(Context context, int port) throws Exception
@ -561,6 +466,17 @@ public class TorTransProxy implements TorServiceConstants {
} }
public int setTransparentProxyingAll(Context context) throws Exception public int setTransparentProxyingAll(Context context) throws Exception
{
return modifyTransparentProxyingAll(context, "A");
}
public int clearTransparentProxyingAll(Context context) throws Exception
{
return modifyTransparentProxyingAll(context, "D");
}
public int modifyTransparentProxyingAll(Context context, String cmd) throws Exception
{ {
boolean runRoot = true; boolean runRoot = true;
boolean waitFor = true; boolean waitFor = true;
@ -580,8 +496,9 @@ public class TorTransProxy implements TorServiceConstants {
// Set up port redirection // Set up port redirection
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t nat"); script.append(" -t nat");
script.append(" -A OUTPUT -p tcp"); script.append(" -p tcp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -m owner ! --uid-owner "); script.append(" -m owner ! --uid-owner ");
script.append(torUid); script.append(torUid);
@ -592,8 +509,9 @@ public class TorTransProxy implements TorServiceConstants {
// Same for DNS // Same for DNS
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t nat"); script.append(" -t nat");
script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); script.append(" -p udp -m owner ! --uid-owner ");
script.append(torUid); script.append(torUid);
script.append(" -m udp --dport "); script.append(" -m udp --dport ");
script.append(STANDARD_DNS_PORT); script.append(STANDARD_DNS_PORT);
@ -607,8 +525,8 @@ public class TorTransProxy implements TorServiceConstants {
{ {
// Allow packets to localhost (contains all the port-redirected ones) // Allow packets to localhost (contains all the port-redirected ones)
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -m owner ! --uid-owner "); script.append(" -m owner ! --uid-owner ");
script.append(torUid); script.append(torUid);
script.append(" -p tcp"); script.append(" -p tcp");
@ -622,8 +540,8 @@ public class TorTransProxy implements TorServiceConstants {
// Allow loopback // Allow loopback
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -p tcp"); script.append(" -p tcp");
script.append(" -o lo"); script.append(" -o lo");
script.append(" -j ACCEPT"); script.append(" -j ACCEPT");
@ -631,8 +549,8 @@ public class TorTransProxy implements TorServiceConstants {
// Allow everything for Tor // Allow everything for Tor
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(torUid); script.append(torUid);
script.append(" -j ACCEPT"); script.append(" -j ACCEPT");
@ -642,8 +560,8 @@ public class TorTransProxy implements TorServiceConstants {
{ {
//XXX: Comment the following rules for non-debug builds //XXX: Comment the following rules for non-debug builds
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -p udp"); script.append(" -p udp");
script.append(" --dport "); script.append(" --dport ");
script.append(STANDARD_DNS_PORT); script.append(STANDARD_DNS_PORT);
@ -663,8 +581,8 @@ public class TorTransProxy implements TorServiceConstants {
// Reject DNS that is not from Tor (order is important - first matched rule counts!) // Reject DNS that is not from Tor (order is important - first matched rule counts!)
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -p udp"); script.append(" -p udp");
script.append(" --dport "); script.append(" --dport ");
script.append(STANDARD_DNS_PORT); script.append(STANDARD_DNS_PORT);
@ -673,16 +591,16 @@ public class TorTransProxy implements TorServiceConstants {
// Reject all other outbound TCP packets // Reject all other outbound TCP packets
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -p tcp"); script.append(" -p tcp");
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
// Reject all other outbound UDP packets // Reject all other outbound UDP packets
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -A OUTPUT");
script.append(" -p udp"); script.append(" -p udp");
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
@ -696,83 +614,5 @@ public class TorTransProxy implements TorServiceConstants {
return code; return code;
} }
public int clearTransparentProxyingAll(Context context) throws Exception
{
boolean runRoot = true;
boolean waitFor = true;
//redirectDNSResolvConf(); //not working yet
String ipTablesPath = getIpTablesPath(context);
StringBuilder script = new StringBuilder();
StringBuilder res = new StringBuilder();
int code = -1;
int torUid = context.getApplicationInfo().uid;
// Set up port redirection
script.append(ipTablesPath);
script.append(" -D OUTPUT -p tcp");
script.append(" -t nat");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -m owner ! --uid-owner ");
script.append(torUid);
script.append(" -m tcp --syn");
script.append(" -j REDIRECT --to-ports ");
script.append(TOR_TRANSPROXY_PORT);
script.append(" || exit\n");
// Same for DNS
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t nat");
script.append(" -p udp -m owner ! --uid-owner ");
script.append(torUid);
script.append(" -m udp --dport ");
script.append(STANDARD_DNS_PORT);
script.append(" -j REDIRECT --to-ports ");
script.append(TOR_DNS_PORT);
script.append(" || exit\n");
// Reject DNS that is not from Tor (order is important - first matched rule counts!)
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -p udp");
script.append(" --dport ");
script.append(STANDARD_DNS_PORT);
script.append(" -j REJECT");
script.append(" || exit\n");
// Reject all other outbound TCP packets
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -p tcp");
script.append(" -j REJECT");
script.append(" || exit\n");
// Reject all other outbound TCP packets
script.append(ipTablesPath);
script.append(" -D OUTPUT");
script.append(" -t filter");
script.append(" -p udp");
script.append(" -j REJECT");
script.append(" || exit\n");
String[] cmdAdd = {script.toString()};
code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
String msg = res.toString();
TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
return code;
}
} }