August 2013 - tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 24 Aug '13

24 Aug '13

commit e0b10dccef5b6c232d231addfcb522c6d39cca47 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 24 05:46:26 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 2 +- zh_CN/torbirdy.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index ed53b30..be84a75 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "取消"> <!ENTITY torbirdy.prefs.extra1.button "恢复默认值"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "测试代理设置"> <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "代理设置"> <!ENTITY torbirdy.prefs.privacy.label "隐私设置"> diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 468a3f2..e11825c 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=请注意：建议不要修改高级设置！\n\n除非 torbirdy.email.advanced.nextwarning=下次显示此警告 torbirdy.email.advanced.title=TorBirdy 高级设置 -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=您必须重新启动 Thunderbird 才能使时区设置生效。 torbirdy.firstrun=当前正在运行 TorBirdy。\n\n为了保护用户的匿名性，TorBirdy 强制设定了 Thunderbird 设置，以便防止用户或其他任何附加组件对其进行修改。某些设置可通过 TorBirdy 选项对话框访问并修改。卸载或禁用 TorBirdy 之后，该组件对设置所作的全部修改将重置未默认指（即在安装 TorBirdy 之前的值）。\n\n如果你是新用户，建议查阅 TorBirdy 网站，以理解用户可通过 TorBirdy 到达何种目的。 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[tor/master] fix typos
by arma＠torproject.org 24 Aug '13

24 Aug '13

commit 0fd8f5781b8535c1735d9f984ff833a3024ddc95 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Aug 23 21:43:57 2013 -0400 fix typos --- src/or/onion.c | 4 ++-- src/or/onion_fast.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 5542854..1c35b59 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -50,7 +50,7 @@ static void onion_queue_entry_remove(onion_queue_t *victim); * MAX_ONIONSKIN_CHALLENGE/REPLY_LEN." Also, make sure that we can pass * over-large values via EXTEND2/EXTENDED2, for future-compatibility.*/ -/** Return true iff we have room to queue another oninoskin of type +/** Return true iff we have room to queue another onionskin of type * <b>type</b>. */ static int have_room_for_onionskin(uint16_t type) @@ -727,7 +727,7 @@ extend_cell_parse(extend_cell_t *cell_out, const uint8_t command, cell_out->cell_type = RELAY_COMMAND_EXTEND2; ++payload; /* Parse the specifiers. We'll only take the first IPv4 and first IPv6 - * addres, and the node ID, and ignore everything else */ + * address, and the node ID, and ignore everything else */ for (i = 0; i < n_specs; ++i) { if (eop - payload < 2) return -1; diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c index aa034a8..8e778db 100644 --- a/src/or/onion_fast.c +++ b/src/or/onion_fast.c @@ -22,7 +22,7 @@ fast_handshake_state_free(fast_handshake_state_t *victim) tor_free(victim); } -/** Create the state needed to perform a CREATE_FAST hasnshake. Return 0 +/** Create the state needed to perform a CREATE_FAST handshake. Return 0 * on success, -1 on failure. */ int fast_onionskin_create(fast_handshake_state_t **handshake_state_out,

1 0

[orbot/master] adding raw design resources
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 4407257e1c8f206666d162c5ffecca3aa3081916 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:26:39 2013 -0400 adding raw design resources --- docs/orbotnewicons.xcf | Bin 0 -> 874078 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/orbotnewicons.xcf b/docs/orbotnewicons.xcf new file mode 100644 index 0000000..e744085 Binary files /dev/null and b/docs/orbotnewicons.xcf differ

1 0

[orbot/master] add new Root utility for checking if root is possible
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit cea338dab26ad4df684f0eb5c7789ea8363a95cf Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:26:04 2013 -0400 add new Root utility for checking if root is possible --- src/org/torproject/android/service/Root.java | 107 ++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/src/org/torproject/android/service/Root.java b/src/org/torproject/android/service/Root.java new file mode 100644 index 0000000..d41b48c --- /dev/null +++ b/src/org/torproject/android/service/Root.java @@ -0,0 +1,107 @@ +package org.torproject.android.service; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.util.ArrayList; + +import org.torproject.android.service.ExecShell.SHELL_CMD; + +import android.util.Log; + +/** + * @author Kevin Kowalewski + * + */ +public class Root { + + private static String LOG_TAG = Root.class.getName(); + + public boolean isDeviceRooted() { + if (checkRootMethod1()){return true;} + if (checkRootMethod2()){return true;} + if (checkRootMethod3()){return true;} + return false; + } + + public boolean checkRootMethod1(){ + String buildTags = android.os.Build.TAGS; + + if (buildTags != null && buildTags.contains("test-keys")) { + return true; + } + return false; + } + + public boolean checkRootMethod2(){ + try { + File file = new File("/system/app/Superuser.apk"); + if (file.exists()) { + return true; + } + } catch (Exception e) { } + + return false; + } + + public boolean checkRootMethod3() { + if (new ExecShell().executeCommand(SHELL_CMD.check_su_binary) != null){ + return true; + }else{ + return false; + } + } +} + + +/** + * @author Kevin Kowalewski + * + */ +class ExecShell { + + private static String LOG_TAG = ExecShell.class.getName(); + + public static enum SHELL_CMD { + check_su_binary(new String[] {"/system/xbin/which","su"}), + ; + + String[] command; + + SHELL_CMD(String[] command){ + this.command = command; + } + } + + public ArrayList<String> executeCommand(SHELL_CMD shellCmd){ + String line = null; + ArrayList<String> fullResponse = new ArrayList<String>(); + Process localProcess = null; + + try { + localProcess = Runtime.getRuntime().exec(shellCmd.command); + } catch (Exception e) { + return null; + //e.printStackTrace(); + } + + BufferedWriter out = new BufferedWriter(new OutputStreamWriter(localProcess.getOutputStream())); + BufferedReader in = new BufferedReader(new InputStreamReader(localProcess.getInputStream())); + + try { + while ((line = in.readLine()) != null) { + Log.d(LOG_TAG, "--> Line received: " + line); + fullResponse.add(line); + } + } catch (Exception e) { + e.printStackTrace(); + } + + Log.d(LOG_TAG, "--> Full response was: " + fullResponse); + + return fullResponse; + } + +} \ No newline at end of file

1 0

[orbot/master] removed unneeded old iptables binaries
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 9d6f3c836b5c81c2565ff5744955129fc370a5ed Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:25:23 2013 -0400 removed unneeded old iptables binaries --- res/raw/iptables_g1 | Bin 130204 -> 0 bytes res/raw/iptables_n1 | Bin 134308 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/iptables_g1 b/res/raw/iptables_g1 deleted file mode 100644 index 0bb3f22..0000000 Binary files a/res/raw/iptables_g1 and /dev/null differ diff --git a/res/raw/iptables_n1 b/res/raw/iptables_n1 deleted file mode 100644 index 50776a8..0000000 Binary files a/res/raw/iptables_n1 and /dev/null differ

1 0

[orbot/master] new green/tor on mode
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 5930964362108398756632cc2d96a6db380b09b0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:26:19 2013 -0400 new green/tor on mode --- res/drawable/toron.png | Bin 74095 -> 83816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/toron.png b/res/drawable/toron.png index 5f6eed6..5922997 100644 Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ

1 0

[orbot/master] fixes for superuser and iptables check code
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 82fcea0dab3b242047c54b64f1bbfde7e30ec95c Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:25:42 2013 -0400 fixes for superuser and iptables check code --- .../android/service/TorBinaryInstaller.java | 18 +------ .../android/service/TorServiceUtils.java | 53 -------------------- .../torproject/android/service/TorTransProxy.java | 23 ++------- src/org/torproject/android/wizard/Permissions.java | 17 +++---- 4 files changed, 15 insertions(+), 96 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index ffaeab3..6a6ca8a 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -253,22 +253,8 @@ public class TorBinaryInstaller implements TorServiceConstants { // Check iptables_g1 File file = new File(ctx.getDir("bin",0), "iptables"); - - if ((!file.exists()) && isARMv6()) { - copyRawFile(ctx, R.raw.iptables_g1, file, CHMOD_EXEC, false); - - - changed = true; - } - - // Check iptables_n1 - file = new File(ctx.getDir("bin",0), "iptables"); - if ((!file.exists()) && (!isARMv6())) { - copyRawFile(ctx, R.raw.iptables_n1, file, CHMOD_EXEC, false); - changed = true; - } - - + copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false); + return true; } diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index e21b745..e9e929e 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -16,59 +16,6 @@ import android.util.Log; public class TorServiceUtils implements TorServiceConstants { - public static boolean isRootPossible() - { - - StringBuilder log = new StringBuilder(); - - try { - - // Check if Superuser.apk exists - File fileSU = new File("/system/app/Superuser.apk"); - if (fileSU.exists()) - return true; - - fileSU = new File("/system/app/superuser.apk"); - if (fileSU.exists()) - return true; - - fileSU = new File("/system/bin/su"); - if (fileSU.exists()) - { - String[] cmd = {"su"}; - int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); - if (exitCode != 0) - return false; - else - return true; - } - - //Check for 'su' binary - String[] cmd = {"which su"}; - int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); - - if (exitCode == 0) { - Log.d(TorConstants.TAG,"root exists, but not sure about permissions"); - return true; - - } - - } catch (IOException e) { - //this means that there is no root to be had (normally) so we won't log anything - Log.e(TorConstants.TAG,"Error checking for root access",e); - - } - catch (Exception e) { - Log.e(TorConstants.TAG,"Error checking for root access",e); - //this means that there is no root to be had (normally) - } - - Log.e(TorConstants.TAG,"Could not acquire root permissions"); - - - return false; - } - public static int findProcessId(String command) { diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 76741b1..1528f9a 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -14,7 +14,6 @@ import android.util.Log; public class TorTransProxy implements TorServiceConstants { private boolean useSystemIpTables = false; - private boolean mBundledFailed = false; private String mSysIptables = null; private TorService mTorService = null; @@ -35,7 +34,7 @@ public class TorTransProxy implements TorServiceConstants { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()); useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false); - if (useSystemIpTables || mBundledFailed) + if (useSystemIpTables) { ipTablesPath = findSystemIPTables(); } @@ -45,19 +44,6 @@ public class TorTransProxy implements TorServiceConstants { ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); - try - { - if (testOwnerModule(context,ipTablesPath) != 0) - { - mBundledFailed = true; - ipTablesPath = findSystemIPTables(); - } - } - catch (Exception e) - { - ipTablesPath = findSystemIPTables(); - mBundledFailed = true; - } } return ipTablesPath; @@ -73,14 +59,14 @@ public class TorTransProxy implements TorServiceConstants { { //if the user wants us to use the built-in iptables, then we have to find it - File fileIpt = new File("/system/bin/iptables"); + File fileIpt = new File("/system/xbin/iptables"); if (fileIpt.exists()) mSysIptables = fileIpt.getAbsolutePath(); else { - fileIpt = new File("/system/xbin/iptables"); + fileIpt = new File("/system/bin/iptables"); if (fileIpt.exists()) mSysIptables = fileIpt.getAbsolutePath(); @@ -201,7 +187,7 @@ public class TorTransProxy implements TorServiceConstants { return code; } */ - + /* public int testOwnerModule(Context context, String ipTablesPath) throws Exception { @@ -245,6 +231,7 @@ public class TorTransProxy implements TorServiceConstants { return code; } + */ public int setTransparentProxyingByApp (Context context, ArrayList<TorifiedApp> apps) throws Exception { diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index b93ba19..91e93db 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -2,10 +2,7 @@ package org.torproject.android.wizard; import org.torproject.android.R; import org.torproject.android.TorConstants; -import org.torproject.android.R.drawable; -import org.torproject.android.R.id; -import org.torproject.android.R.layout; -import org.torproject.android.R.string; +import org.torproject.android.service.Root; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorTransProxy; @@ -22,8 +19,8 @@ import android.view.View; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.ImageView; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -69,7 +66,7 @@ public class Permissions extends Activity implements TorConstants { private void stepThree(){ - boolean isRootPossible = TorServiceUtils.isRootPossible(); + boolean isRootPossible = new Root().isDeviceRooted(); if (isRootPossible) { @@ -150,9 +147,8 @@ public class Permissions extends Activity implements TorConstants { if (!hasRoot) { - - hasRoot = TorServiceUtils.isRootPossible(); - + hasRoot = new Root().isDeviceRooted(); + Editor pEdit = prefs.edit(); pEdit.putBoolean(PREF_HAS_ROOT,hasRoot); pEdit.commit(); @@ -162,7 +158,9 @@ public class Permissions extends Activity implements TorConstants { if (hasRoot) { try { + /* TorTransProxy ttProxy = new TorTransProxy(); + int resp = ttProxy.testOwnerModule(context,ttProxy.getIpTablesPath(context)); if (resp != 0) @@ -173,6 +171,7 @@ public class Permissions extends Activity implements TorConstants { Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available"); stepFour(); } + */ } catch (Exception e) {

1 0

[orbot/master] added GUI support for flinging to a newnym identity
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit e84ee7101d50ba94aea419a9c2044eeab693c534 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Aug 23 12:47:31 2013 -0400 added GUI support for flinging to a newnym identity --- res/drawable/torstarting.png | Bin 74011 -> 77523 bytes res/raw/torrc | 6 ++- res/values/strings.xml | 1 + src/org/torproject/android/Orbot.java | 68 +++++++++++++++++++++++++++++++-- 4 files changed, 70 insertions(+), 5 deletions(-) diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png index 31c4dd7..7cbf9fe 100644 Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ diff --git a/res/raw/torrc b/res/raw/torrc index fd5b506..e7dc4b2 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -4,11 +4,13 @@ SafeSocks 0 TestSocks 1 WarnUnsafeSocks 1 Log notice stdout -ControlPort 9051 ControlListenAddress 127.0.0.1 +ControlPort 9051 CookieAuthentication 1 TransPort 9040 TransListenAddress 127.0.0.1 DNSPort 5400 DNSListenAddress 127.0.0.1 -AvoidDiskWrites 1 \ No newline at end of file +AvoidDiskWrites 1 +AutomapHostsOnResolve 1 +VirtualAddrNetwork 10.192.0.0/10 \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index bca3086..2d0c671 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -240,4 +240,5 @@ <string name="up">up</string> <string name="pref_disable_network_title">Network Auto-Sleep</string> <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> + <string name="newnym">You\'ve switched to a new Tor identity!</string> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 9f4229b..1ac1656 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -27,7 +27,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; -import android.drm.DrmStore.Action; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -39,11 +38,15 @@ import android.text.ClipboardManager; import android.text.Layout; import android.text.method.ScrollingMovementMethod; import android.util.Log; +import android.view.GestureDetector; +import android.view.GestureDetector.SimpleOnGestureListener; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; +import android.view.animation.AccelerateInterpolator; +import android.view.animation.Animation; import android.widget.Button; import android.widget.SlidingDrawer; import android.widget.TextView; @@ -55,7 +58,7 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -public class Orbot extends SherlockActivity implements TorConstants, OnLongClickListener, OnSharedPreferenceChangeListener +public class Orbot extends SherlockActivity implements TorConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener { /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget @@ -125,6 +128,8 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); + imgStatus.setOnTouchListener(this); + downloadText = (TextView)findViewById(R.id.trafficDown); uploadText = (TextView)findViewById(R.id.trafficUp); mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); @@ -168,8 +173,22 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick uploadText.setText(formatCount(0) + " / " + formatTotal(0)); updateStatus(""); + + + // Gesture detection + mGestureDetector = new GestureDetector(this, new MyGestureDetector()); + } + + GestureDetector mGestureDetector; + + @Override + public boolean onTouch(View v, MotionEvent event) { + return mGestureDetector.onTouchEvent(event); + + } + private void appendLogTextAndScroll(String text) { if(mTxtOrbotLog != null){ @@ -1202,5 +1221,48 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } - + + private static final float ROTATE_FROM = 0.0f; + private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f; + + public void spinOrbot (float direction) + { + try { + mService.newIdentity(); //request a new identity + + Toast.makeText(this, R.string.newnym, Toast.LENGTH_SHORT).show(); + + // Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); + Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, imgStatus.getWidth()/2f,imgStatus.getWidth()/2f,20f,false); + rotation.setFillAfter(true); + rotation.setInterpolator(new AccelerateInterpolator()); + rotation.setDuration((long) 2*1000); + rotation.setRepeatCount(0); + imgStatus.startAnimation(rotation); + + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + class MyGestureDetector extends SimpleOnGestureListener { + @Override + public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { + try { + if (torStatus == TorServiceConstants.STATUS_ON) + { + float direction = 1f; + if (velocityX < 0) + direction = -1f; + spinOrbot (direction); + } + } catch (Exception e) { + // nothing + } + return false; + } + + } + }

1 0

[orbot/master] updated transproxy iptables rules to ensure clear/flush
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 9dacb5be7317154d13812df9f3c75f7b7ec97ca5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Aug 23 12:46:54 2013 -0400 updated transproxy iptables rules to ensure clear/flush --- .../torproject/android/service/TorTransProxy.java | 244 ++++++++++++-------- 1 file changed, 148 insertions(+), 96 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 1528f9a..3798710 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -233,24 +233,51 @@ public class TorTransProxy implements TorServiceConstants { } */ - 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); + boolean runRoot = true; + boolean waitFor = true; + + String ipTablesPath = getIpTablesPath(context); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + String chainName = "ORBOT"; + String jumpChainName = "OUTPUT"; + + script.append(ipTablesPath); + script.append(" --flush ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -D ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -X ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + + logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + + return code; } - public int modifyTransparentProxyingByApp(Context context, String cmd, ArrayList<TorifiedApp> apps) throws Exception + public int setTransparentProxyingByApp(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(); @@ -261,20 +288,35 @@ public class TorTransProxy implements TorServiceConstants { String chainName = "ORBOT"; String jumpChainName = "OUTPUT"; - if (cmd.equals("A")) //only if we are adding rules - { - script.append(ipTablesPath); - script.append(" -N ").append(chainName); //create user-defined chain - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -A ").append(jumpChainName); - script.append(" -j ").append(chainName); - script.append(" || exit\n"); - } + script.append(ipTablesPath); + script.append(" --flush ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -D ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); - String modCmd = " -" + cmd + " " + chainName; - + script.append(ipTablesPath); + script.append(" -X ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + //run the delete commands in a separate process as it might error out + String[] cmdExecClear = {script.toString()}; + code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); + + //reset script + script = new StringBuilder(); + + script.append(ipTablesPath); + script.append(" -N ").append(chainName); //create user-defined chain + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -A ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); + //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -289,8 +331,8 @@ public class TorTransProxy implements TorServiceConstants { // Set up port redirection script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(jumpChainName); - script.append(" -t nat"); + script.append(" -t nat"); + script.append(" -A ").append(jumpChainName); script.append(" -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner --uid-owner "); @@ -302,8 +344,8 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(jumpChainName); - script.append(" -t nat"); + script.append(" -t nat"); + script.append(" -A ").append(jumpChainName); script.append(" -p udp -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); @@ -318,8 +360,8 @@ public class TorTransProxy implements TorServiceConstants { { // Allow packets to localhost (contains all the port-redirected ones) script.append(ipTablesPath); - script.append(modCmd); script.append(" -t filter"); + script.append(" -A ").append(jumpChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); @@ -332,19 +374,19 @@ public class TorTransProxy implements TorServiceConstants { // Allow loopback script.append(ipTablesPath); - script.append(modCmd); script.append(" -t filter"); + script.append(" -A ").append(jumpChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); script.append(" -o lo"); script.append(" -j ACCEPT"); script.append(" || exit\n"); - + // Reject all other outbound TCP packets script.append(ipTablesPath); - script.append(modCmd); script.append(" -t filter"); + script.append(" -A ").append(jumpChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); @@ -354,8 +396,8 @@ public class TorTransProxy implements TorServiceConstants { // Reject all other outbound UDP packets script.append(ipTablesPath); - script.append(modCmd); script.append(" -t filter"); + script.append(" -A ").append(jumpChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p udp"); @@ -366,24 +408,6 @@ public class TorTransProxy implements TorServiceConstants { } } - if (cmd.equals("D")) - { - - script.append(ipTablesPath); - script.append(" --flush ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -D ").append(jumpChainName); - script.append(" -j ").append(chainName); - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -X ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - - } - String[] cmdAdd = {script.toString()}; code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); @@ -394,7 +418,6 @@ public class TorTransProxy implements TorServiceConstants { return code; } - public int enableTetheringRules (Context context) throws Exception { @@ -446,18 +469,48 @@ public class TorTransProxy implements TorServiceConstants { Log.w(TorConstants.TAG,msg); } - public int setTransparentProxyingAll(Context context) throws Exception - { - return modifyTransparentProxyingAll(context, "A"); - } - public int clearTransparentProxyingAll(Context context) throws Exception { - return modifyTransparentProxyingAll(context, "D"); + 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; + + String chainName = "ORBOT"; + String jumpChainName = "OUTPUT"; + + script.append(ipTablesPath); + script.append(" --flush ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -D ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -X ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + String[] cmdExec = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdExec, res, runRoot, waitFor); + String msg = res.toString(); + + logMessage("Exec resp: errCode=" + code + ";resp=" + msg); + + return code; } - public int modifyTransparentProxyingAll(Context context, String cmd) throws Exception + public int setTransparentProxyingAll(Context context) throws Exception { boolean runRoot = true; @@ -476,32 +529,49 @@ public class TorTransProxy implements TorServiceConstants { String chainName = "ORBOT"; String jumpChainName = "OUTPUT"; + + script.append(ipTablesPath); + script.append(" --flush ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -D ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -X ").append(chainName); //delete previous user-defined chain + script.append(" || exit\n"); - if (cmd.equals("A")) //only if we are adding rules - { - script.append(ipTablesPath); - script.append(" -N ").append(chainName); //create user-defined chain - script.append(" || exit\n"); + //run the delete commands in a separate process as it might error out + String[] cmdExecClear = {script.toString()}; + code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); + + //reset script + script = new StringBuilder(); + + script.append(ipTablesPath); + script.append(" -N ").append(chainName); //create user-defined chain + script.append(" || exit\n"); - script.append(ipTablesPath); - script.append(" -A ").append(jumpChainName); - script.append(" -j ").append(chainName); - script.append(" || exit\n"); - } + script.append(ipTablesPath); + script.append(" -A ").append(jumpChainName); + script.append(" -j ").append(chainName); + script.append(" || exit\n"); // Allow everything for Tor script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -m owner --uid-owner "); script.append(torUid); script.append(" -j ACCEPT"); script.append(" || exit\n"); - // Set up port redirection - script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(jumpChainName); + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); + script.append(" -A ").append(jumpChainName); script.append(" -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner ! --uid-owner "); @@ -513,8 +583,8 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(jumpChainName); script.append(" -t nat"); + script.append(" -A ").append(jumpChainName); script.append(" -p udp -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); @@ -529,8 +599,8 @@ public class TorTransProxy implements TorServiceConstants { { // Allow packets to localhost (contains all the port-redirected ones) script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -p tcp"); @@ -544,8 +614,8 @@ public class TorTransProxy implements TorServiceConstants { // Allow loopback script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -p tcp"); script.append(" -o lo"); script.append(" -j ACCEPT"); @@ -556,8 +626,8 @@ public class TorTransProxy implements TorServiceConstants { { //XXX: Comment the following rules for non-debug builds script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -p udp"); script.append(" --dport "); script.append(STANDARD_DNS_PORT); @@ -567,8 +637,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(" || exit\n"); script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); - script.append(" -t filter"); + script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -p tcp"); script.append(" -j LOG"); script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); @@ -579,8 +649,8 @@ public class TorTransProxy implements TorServiceConstants { // Reject all other outbound TCP packets script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -p tcp"); @@ -590,32 +660,14 @@ public class TorTransProxy implements TorServiceConstants { // Reject all other outbound UDP packets script.append(ipTablesPath); - script.append(" -" + cmd + " ").append(chainName); script.append(" -t filter"); + script.append(" -A ").append(chainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -p udp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); script.append(" || exit\n"); - - if (cmd.equals("D")) - { - - script.append(ipTablesPath); - script.append(" --flush ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -D ").append(jumpChainName); - script.append(" -j ").append(chainName); - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -X ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - - } String[] cmdExec = {script.toString()};

1 0

[orbot/master] updated to 12.0.4
by n8fr8＠torproject.org 23 Aug '13

23 Aug '13

commit 965dab26a96d901f457632d1c785a62c469b4402 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 20 13:37:57 2013 -0400 updated to 12.0.4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5d7a573..c86a2d4 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="12.0.3" - android:versionCode="59" + android:versionName="12.0.4" + android:versionCode="60" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0