January 2012 - tor-commits - lists.torproject.org

[orbot/master] small changes to naming of iptables methods
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 2b1969fea075de5a3441c5394d1b6d0b61a60be3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:23:54 2012 -0500 small changes to naming of iptables methods --- .../android/service/TorBinaryInstaller.java | 18 ++++++++++++++++-- src/org/torproject/android/service/TorService.java | 8 ++++---- .../android/service/TorServiceUtils.java | 4 ++-- .../torproject/android/service/TorTransProxy.java | 9 ++++----- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index a3b1995..ff1e720 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -10,6 +10,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -65,7 +66,20 @@ public class TorBinaryInstaller implements TorServiceConstants { return true; } - + private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException + { + + DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); + InputStream is = new GZIPInputStream(ctx.getAssets().open(asset)); + + byte buf[] = new byte[8172]; + int len; + while ((len = is.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + is.close(); + } /* * Write the inputstream contents to the file */ @@ -97,7 +111,7 @@ public class TorBinaryInstaller implements TorServiceConstants { } stmOut.close(); - + stm.close(); return true; diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 25d415b..df2990d 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -275,7 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); - clearTransparentProxy(); + disableTransparentProxy(); } catch (Exception e) { @@ -597,7 +597,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean clearTransparentProxy () throws Exception + private boolean disableTransparentProxy () throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -609,7 +609,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorService.logMessage ("Clearing TransProxy rules"); - TorTransProxy.purgeIptables(this); + TorTransProxy.flushIptables(this); showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); @@ -1095,7 +1095,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - clearTransparentProxy(); + disableTransparentProxy(); enableTransparentProxy(); } catch (Exception e) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 51d6378..fa27c58 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -24,13 +24,13 @@ public class TorServiceUtils implements TorServiceConstants { try { // Check if Superuser.apk exists - File file = new File("/system/app/Superuser.apk"); + //File file = new File("/system/app/Superuser.apk"); //Check for 'su' binary String[] cmd = {"which su"}; int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); - if (file.exists() && exitCode == 0) { + if (exitCode == 0) { TorService.logMessage("Can acquire root permissions"); return true; diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 73dac7c..bf5fee2 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -13,7 +13,7 @@ public class TorTransProxy implements TorServiceConstants { private final static String TAG = TorConstants.TAG; - public static int purgeIptables(Context context) throws Exception { + public static int flushIptables(Context context) throws Exception { String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); @@ -21,7 +21,6 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - script.append(ipTablesPath); script.append(" -t nat"); @@ -177,7 +176,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //build up array of shell cmds to execute under one root context for (int i = 0; i < apps.length; i++) @@ -276,7 +275,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //TCP //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe @@ -375,7 +374,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); int torUid = context.getApplicationInfo().uid;

1 0

[orbot/master] removed tor and geoip binary
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit de440d398ea35b8f48db94c289bd691e9f23cbd2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:21:11 2012 -0500 removed tor and geoip binary --- res/raw/geoip.zip | Bin 966562 -> 0 bytes res/raw/tor.zip | Bin 1553272 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.zip b/res/raw/geoip.zip deleted file mode 100644 index e3f1d8f..0000000 Binary files a/res/raw/geoip.zip and /dev/null differ diff --git a/res/raw/tor.zip b/res/raw/tor.zip deleted file mode 100644 index 6ad8f33..0000000 Binary files a/res/raw/tor.zip and /dev/null differ

1 0

[orbot/master] updating project files
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit ce5a1c7d7f612ee5e432f30ed52602d543c9202a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:56:25 2012 -0500 updating project files --- AndroidManifest.xml | 2 -- project.properties | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6ce88e..c8f2801 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,4 @@ <uses-sdk android:minSdkVersion="4"/> - - </manifest> diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..1960895 --- /dev/null +++ b/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Indicates whether an apk should be generated for each density. +split.density=false +# Project target. +target=android-4 +apk-configurations=

1 0

[orbot/master] removing build files to see if that fixes CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 70d805d177ec76b93fd1460356e0b85f2d0852af Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:04:34 2012 -0500 removing build files to see if that fixes CI --- build.xml | 85 ---------------------------------------------------- project.properties | 14 -------- 2 files changed, 0 insertions(+), 99 deletions(-) diff --git a/build.xml b/build.xml deleted file mode 100644 index 8a95dfb..0000000 --- a/build.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Orbot" default="help"> - -  - <loadproperties srcFile="local.properties" /> - -  - <property file="ant.properties" /> - -  - <loadproperties srcFile="project.properties" /> - -  - <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" - unless="sdk.dir" - /> - - - - - -  -  - <import file="${sdk.dir}/tools/ant/build.xml" /> - -</project> diff --git a/project.properties b/project.properties deleted file mode 100644 index 1960895..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-4 -apk-configurations=

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 92029abb6ae7206153144c2f6852648166a317f3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:24:05 2012 -0500 updated changelog --- CHANGELOG | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2c6a339..94ccca6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,14 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.7 +- updated openssl to 1.0.0f to address recent SSLv3 threat +- check for root mode uses "which su" command and does not look for Superuser.apk +- changed tor binary res/raw storage mechanism to use the "mp3" file ext trick + +1.0.6.1 +- small fixes to wizard UI +- fixed "exit" problem, after running wizard + 1.0.6 - updated tablet layout graphic sizing - stopped Orweb from being transparent proxied (not needed)

1 0

[orbot/master] moved layout for high-res screens
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 369b043408c5f5fdf283defeb5d6e34950262b0a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:38:56 2012 -0500 moved layout for high-res screens --- res/layout-sw720dp/layout_main.xml | 55 ------------------------------------ res/layout-xlarge/layout_main.xml | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/res/layout-sw720dp/layout_main.xml b/res/layout-sw720dp/layout_main.xml deleted file mode 100644 index ac19112..0000000 --- a/res/layout-sw720dp/layout_main.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/bgtitanium" android:orientation="vertical"> - - <RelativeLayout android:id="@+id/layoutHeaderMain" - android:layout_width="fill_parent" - android:layout_height="30dp" - android:layout_gravity="center_horizontal" - android:background="#A0909090"> - <ImageView android:id="@+id/radioModeImage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" - android:gravity="right" - android:layout_toRightOf="@+id/radioModeLabel" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:src="@drawable/tor25" - /> - <TextView android:id="@+id/radioModeText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="powered by The Tor Project " - android:layout_marginTop="8px" - android:layout_marginRight="0px" - android:gravity="right" - android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> - </RelativeLayout> - - <ImageView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_margin="15dip" - android:layout_height="400dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/toroff" android:layout_weight="1"/> - - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" - android:textStyle="bold" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:textColor="#ffffff" - /> - - - -</LinearLayout> - diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml new file mode 100644 index 0000000..ac19112 --- /dev/null +++ b/res/layout-xlarge/layout_main.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/bgtitanium" android:orientation="vertical"> + + <RelativeLayout android:id="@+id/layoutHeaderMain" + android:layout_width="fill_parent" + android:layout_height="30dp" + android:layout_gravity="center_horizontal" + android:background="#A0909090"> + <ImageView android:id="@+id/radioModeImage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="3px" + android:layout_marginRight="3px" + android:gravity="right" + android:layout_toRightOf="@+id/radioModeLabel" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:src="@drawable/tor25" + /> + <TextView android:id="@+id/radioModeText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="powered by The Tor Project " + android:layout_marginTop="8px" + android:layout_marginRight="0px" + android:gravity="right" + android:layout_toLeftOf="@+id/radioModeImage" + android:textColor="#cccccc" /> + </RelativeLayout> + + <ImageView + android:id="@+id/imgStatus" + android:layout_width="fill_parent" + android:layout_margin="15dip" + android:layout_height="400dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/toroff" android:layout_weight="1"/> + + <TextView android:id="@+id/lblStatus" + android:text="@string/press_to_start" + android:layout_gravity="center_horizontal" + android:textStyle="bold" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + + android:textColor="#ffffff" + /> + + + +</LinearLayout> +

1 0

[orbot/master] adding in binaries with .mp3 extensions for dev CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 1bdbf57ffabe08669a8c695902c0aea9aaa1f5dc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:32:20 2012 -0500 adding in binaries with .mp3 extensions for dev CI --- res/raw/geoip.mp3 | Bin 0 -> 966562 bytes res/raw/tor.mp3 | Bin 0 -> 1637412 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.mp3 b/res/raw/geoip.mp3 new file mode 100644 index 0000000..e3f1d8f Binary files /dev/null and b/res/raw/geoip.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..bc02210 Binary files /dev/null and b/res/raw/tor.mp3 differ

1 0

[orbot/master] fixing build.xml for CI server
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 45eb3b2afd5d44e187977c1a0a8dad2d569730c2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:35:41 2012 -0500 fixing build.xml for CI server --- build.xml | 122 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 70 insertions(+), 52 deletions(-) diff --git a/build.xml b/build.xml index 08dd4a6..8a95dfb 100644 --- a/build.xml +++ b/build.xml @@ -1,67 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="Orbot"> +<project name="Orbot" default="help">  - <property file="local.properties" /> + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <loadproperties srcFile="local.properties" /> -  - <property file="build.properties" /> - -  - <property file="default.properties" /> - -  - <path id="android.antlibs"> - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> - <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" /> - <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" /> - </path> - - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> - -  + <loadproperties srcFile="project.properties" /> + +  + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" + unless="sdk.dir" + /> + + + + + +  - <setup /> +  + <import file="${sdk.dir}/tools/ant/build.xml" /> </project>

1 0

[orbot/master] only bind service if variable currently null
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit e206a241ab5a4c95d0bbbc4d93826343e7117c5b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:23:23 2012 -0500 only bind service if variable currently null --- src/org/torproject/android/Orbot.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index b7bb62f..a93586d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -390,8 +390,13 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants autoStartOnBind = true; if (mService == null) + { bindService(); - + } + else + { + //already running! + } } else {

1 0

[orbot/master] updated version strings
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 78fc2d946ddf533af0aebfac5f4d79a2ccdf340a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:22:16 2012 -0500 updated version strings --- res/layout/layout_about.xml | 9 ++++++++- res/values/strings.xml | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/res/layout/layout_about.xml b/res/layout/layout_about.xml index fbc8cae..ca765ff 100644 --- a/res/layout/layout_about.xml +++ b/res/layout/layout_about.xml @@ -106,8 +106,15 @@ android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" + android:paddingLeft="15px" + android:textColor="#ffffff"/> + <TextView android:text="@string/openssl_version" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:textColorLink="#ffffff" android:paddingLeft="15px" - android:textColor="#ffffff" /> + android:textColor="#ffffff" /> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 30db5d5..08bc34b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -133,7 +133,7 @@ <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> @@ -237,10 +237,11 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> -<string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> +<string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> +<string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

1 0