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

allows UDP packets to localhost for DNS

This commit is contained in:
n8fr8 2012-10-04 11:27:17 +05:30
parent db128fbc2a
commit 6e45cab8ee
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,6 +309,7 @@ public class TorTransProxy implements TorServiceConstants {
script.append(" || exit\n"); script.append(" || exit\n");
// 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(modCmd); script.append(modCmd);
script.append(" -t filter"); script.append(" -t filter");
@ -319,6 +320,7 @@ public class TorTransProxy implements TorServiceConstants {
script.append(STANDARD_DNS_PORT); script.append(STANDARD_DNS_PORT);
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
*/
// Reject all other outbound TCP packets // Reject all other outbound TCP packets
script.append(ipTablesPath); script.append(ipTablesPath);
@ -327,6 +329,7 @@ public class TorTransProxy implements TorServiceConstants {
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
script.append(" -p tcp"); script.append(" -p tcp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
@ -337,6 +340,7 @@ public class TorTransProxy implements TorServiceConstants {
script.append(" -m owner --uid-owner "); script.append(" -m owner --uid-owner ");
script.append(tApp.getUid()); script.append(tApp.getUid());
script.append(" -p udp"); script.append(" -p udp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
@ -493,7 +497,7 @@ public class TorTransProxy implements TorServiceConstants {
//flushIptables(context); //flushIptables(context);
int torUid = context.getApplicationInfo().uid; int torUid = context.getApplicationInfo().uid;
// Set up port redirection // Set up port redirection
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT"); script.append(" -" + cmd + " OUTPUT");
@ -580,20 +584,27 @@ 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(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner ! --uid-owner ");
script.append(torUid);
script.append(" -p udp"); script.append(" -p udp");
script.append(" --dport "); script.append(" --dport ");
script.append(STANDARD_DNS_PORT); script.append(STANDARD_DNS_PORT);
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
*/
// Reject all other outbound TCP packets // Reject all other outbound TCP packets
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT"); script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner ! --uid-owner ");
script.append(torUid);
script.append(" -p tcp"); script.append(" -p tcp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");
@ -601,7 +612,10 @@ public class TorTransProxy implements TorServiceConstants {
script.append(ipTablesPath); script.append(ipTablesPath);
script.append(" -" + cmd + " OUTPUT"); script.append(" -" + cmd + " OUTPUT");
script.append(" -t filter"); script.append(" -t filter");
script.append(" -m owner ! --uid-owner ");
script.append(torUid);
script.append(" -p udp"); script.append(" -p udp");
script.append(" ! -d 127.0.0.1"); //allow access to localhost
script.append(" -j REJECT"); script.append(" -j REJECT");
script.append(" || exit\n"); script.append(" || exit\n");