December 2017 - tor-commits - lists.torproject.org

[orbot/master] Expose *ConnectionPadding
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 6e4b7008035b2bf1a9035b730aad178bfd424f85 Author: Tad <tad(a)spotco.us> Date: Thu Nov 2 03:23:56 2017 -0400 Expose *ConnectionPadding --- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/preferences.xml | 16 ++++++++++++++++ .../org/torproject/android/service/OrbotConstants.java | 3 +++ .../java/org/torproject/android/service/TorService.java | 9 +++++++++ 4 files changed, 32 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7dbc47c0..0a6c8db1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -384,4 +384,8 @@ <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string> <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string> <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string> + <string name="pref_connection_padding">Connection padding</string> + <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string> + <string name="pref_reduced_connection_padding">Reduced connection padding</string> + <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string> </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 869bb0d5..3efc1c44 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -166,6 +166,22 @@ android:summary="@string/pref_isolate_dest_summary" android:enabled="true"></CheckBoxPreference> </PreferenceCategory> +<PreferenceCategory android:title="ConnectionPadding"> +<CheckBoxPreference +android:key="pref_connection_padding" +android:defaultValue="false" +android:title="@string/pref_connection_padding" +android:summary="@string/pref_connection_padding_summary" +android:enabled="true"></CheckBoxPreference> +<CheckBoxPreference +android:key="pref_reduced_connection_padding" +android:defaultValue="true" +android:title="@string/pref_reduced_connection_padding" +android:summary="@string/pref_reduced_connection_padding_summary" +android:enabled="true"></CheckBoxPreference> +</PreferenceCategory> + + <PreferenceCategory android:title="@string/pref_proxy_title"> <EditTextPreference android:key="pref_proxy_type" android:title="@string/pref_proxy_type_title" diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index 175ebf81..06b1da83 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -36,4 +36,7 @@ public interface OrbotConstants { public final static String PREF_ISOLATE_DEST = "pref_isolate_dest"; + public final static String PREF_CONNECTION_PADDING = "pref_connection_padding"; + public final static String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding"; + } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 012625b8..6c20a23e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -672,6 +672,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("TestSocks 0").append('\n'); extraLines.append("WarnUnsafeSocks 1").append('\n'); + if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) + { + extraLines.append("ConnectionPadding 1").append('\n'); + } + if(prefs.getBoolean(OrbotConstants.PREF_REDUCED_CONNECTION_PADDING, true)) + { + extraLines.append("ReducedConnectionPadding 1").append('\n'); + } + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");

1 0

[orbot/master] add autopoint to dependencies
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit fce5bdede8c77912488dcf255b65e1e5627c2fa1 Author: n8fr8 <nathan(a)freitas.net> Date: Sat Nov 11 08:56:15 2017 -0500 add autopoint to dependencies --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 05b6e532..7bec2fca 100644 --- a/BUILD +++ b/BUILD @@ -19,7 +19,7 @@ Please install the following prerequisites (instructions for each follows): AutoMake and AutoConf tool sudo apt-get install autotools-dev sudo apt-get install automake - sudo apt-get install autogen autoconf libtool gettext-base + sudo apt-get install autogen autoconf libtool gettext-base autopoint You will need to run the 'android' command in the SDK to install the necessary Android platform supports (ICS 4.x or android-15)

1 0

[orbot/master] Update BUILD instructions
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit c1dfc29e024109ef110ef5b0e514b7d9c99c42e0 Author: goapunk <noobie(a)goapunks.net> Date: Fri Nov 10 18:43:19 2017 +0100 Update BUILD instructions Signed-off-by: goapunk <noobie(a)goapunks.net> --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 073fc06b..05b6e532 100644 --- a/BUILD +++ b/BUILD @@ -19,7 +19,7 @@ Please install the following prerequisites (instructions for each follows): AutoMake and AutoConf tool sudo apt-get install autotools-dev sudo apt-get install automake - sudo apt-gen install autogen autoconf libtool + sudo apt-get install autogen autoconf libtool gettext-base You will need to run the 'android' command in the SDK to install the necessary Android platform supports (ICS 4.x or android-15)

1 0

[orbot/master] remove some transproxy left overs
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit cbffc1d6cad9074095a9609646657e2948ceb566 Author: Unpublished <unpublished(a)gmx.net> Date: Tue Oct 31 22:22:52 2017 +0100 remove some transproxy left overs - fix typo to actually show transproxy warning only once (fixes issue #88) --- app/src/main/res/xml/preferences.xml | 14 ++++---------- .../java/org/torproject/android/service/TorService.java | 1 - .../java/org/torproject/android/service/util/Prefs.java | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index d08c3cc4..869bb0d5 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -224,14 +224,15 @@ android:summary="@string/pref_torrc_summary" android:dialogTitle="@string/pref_torrc_dialog" android:defaultValue="" /> - - + + <CheckBoxPreference android:key="pref_enable_logging" android:defaultValue="false" android:title="Debug Log" android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_" -android:enabled="true"></CheckBoxPreference> +android:enabled="true" +/> @@ -242,12 +243,5 @@ android:summary="@string/pref_disable_network_summary" android:enabled="true" android:title="@string/pref_disable_network_title"/> - -<Preference -android:key="pref_transproxy_flush" -android:summary="@string/pref_transproxy_flush_summary" -android:enabled="true" -android:title="@string/pref_transproxy_flush_title"/> - </PreferenceCategory> </PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 10fa376f..012625b8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -94,7 +94,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT; private static final int NOTIFY_ID = 1; - private static final int TRANSPROXY_NOTIFY_ID = 2; private static final int ERROR_NOTIFY_ID = 3; private static final int HS_NOTIFY_ID = 4; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 9ceec989..5bfaf7c4 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -77,7 +77,7 @@ public class Prefs { } public static void disableTransparentProxying() { - prefs.getBoolean(PREF_TRANSPARENT, false); + putBoolean(PREF_TRANSPARENT, false); } public static boolean transparentProxyAll() {

1 0

[orbot/master] Merge pull request #99 from goapunk/update-BUILD-instructions
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 898f64a80586cd3d1a1fa3d7d6c58eccd344cf80 Merge: 72c7e044 e14d6476 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Nov 17 12:41:15 2017 -0500 Merge pull request #99 from goapunk/update-BUILD-instructions update BUILD BUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #98 from goapunk/add-lzma-zstd-as-dependency
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 8cf412ad62644b1608723f3b0857f9b22c1e4f87 Merge: 71e34643 c1dfc29e Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Nov 11 08:52:22 2017 -0500 Merge pull request #98 from goapunk/add-lzma-zstd-as-dependency Add lzma and zstd .gitmodules | 8 ++++++++ BUILD | 2 +- external/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++---- external/xz | 1 + external/zstd | 1 + 5 files changed, 66 insertions(+), 5 deletions(-)

1 0

[orbot/master] Add lzma and zstd
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 9ca36e1bffd618cfe7362499ba95c6fa6fda8fd3 Author: goapunk <noobie(a)goapunks.net> Date: Wed Nov 8 15:52:38 2017 +0100 Add lzma and zstd Signed-off-by: goapunk <noobie(a)goapunks.net> --- .gitmodules | 8 ++++++++ external/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++---- external/xz | 1 + external/zstd | 1 + 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6cd626ac..d8f0459a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,11 @@ path = external/jsocks url = https://github.com/guardianproject/jsocks.git ignore = dirty +[submodule "external/zstd"] + path = external/zstd + url = https://github.com/facebook/zstd.git + ignore = dirty +[submodule "external/xz"] + path = external/xz + url = https://git.tukaani.org/xz.git + ignore = dirty diff --git a/external/Makefile b/external/Makefile index 3d05250b..0c7b52b1 100644 --- a/external/Makefile +++ b/external/Makefile @@ -101,6 +101,8 @@ endif assets assets-clean \ openssl-static openssl-static-clean \ libevent libevent-clean \ + lzma lzma-clean \ + zstd zstd-clean \ tor tor-clean \ polipo polipo-clean @@ -191,7 +193,57 @@ libevent-clean: -rm -f libevent-build-stamp -cd libevent && \ git clean -fdx +#------------------------------------------------------------------------------# +# lzma + +xz/Makefile: + cd xz && ./autogen.sh + cp config.sub xz + cp config.guess xz + cd xz && \ + CC="$(CC)" CXX="$(CXX)" PKG_CONFIG_PATH="$(EXTERNAL_ROOT)/lib/pkgconfig" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS) -std=c99" LDFLAGS="$(LDFLAGS)" \ + ./configure --host=$(HOST) --disable-shared --enable-static --disable-doc --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --prefix=$(EXTERNAL_ROOT) + +lzma: lzma-build-stamp + $(MAKE) -C xz install + +lzma-build-stamp: xz/Makefile + touch lzma-build-stamp + +lzma-clean: + -rm -rf include/lzma + -rm -f include/lzma.h + -rm -f lib/liblzma.a + -rm -f lib/liblzma.la + -rm -f lzma-build-stamp + -cd xz && \ + git clean -fdx +#------------------------------------------------------------------------------# +# zstd +zstd: zstd-build-stamp + $(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.a-mt + $(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.pc + test -d lib || mkdir lib + test -d lib/pkgconfig || mkdir lib/pkgconfig + test -d include || mkdir include + cp zstd/lib/libzstd.a lib + cp zstd/lib/libzstd.pc lib/pkgconfig + cp zstd/lib/zstd.h include + cp zstd/lib/common/zstd_errors.h include + cp zstd/lib/deprecated/zbuff.h include + cp zstd/lib/dictBuilder/zdict.h include + +zstd-build-stamp: + touch zstd-build-stamp + +zstd-clean: + -rm -f include/zstd.h include/zstd_errors.h include/zbuff.h include/zdict.h + -rm -f lib/libzstd.a + -rm -f lib/pkgconfig/libzstd.pc + -rm -f zstd-build-stamp + -cd zstd && \ + git clean -fdx #------------------------------------------------------------------------------# # tor @@ -216,14 +268,13 @@ tor/Makefile: tor/configure --disable-asciidoc \ --enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \ --enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \ - --disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check \ - --disable-lzma --disable-zstd + --disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check --disable-systemd tor-build-stamp: tor/Makefile $(MAKE) -C tor all-am touch tor-build-stamp -tor: libevent openssl tor-build-stamp +tor: lzma zstd libevent openssl tor-build-stamp test -d bin || mkdir bin cp tor/src/or/tor bin @@ -298,7 +349,7 @@ assets-clean: # cleanup, cleanup, put the toys away ##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean -clean: openssl-clean libevent-clean tor-clean polipo-clean pluto-clean +clean: openssl-clean libevent-clean lzma-clean zstd-clean tor-clean polipo-clean pluto-clean #------------------------------------------------------------------------------# # debugging stuff diff --git a/external/xz b/external/xz new file mode 160000 index 00000000..3d566cd5 --- /dev/null +++ b/external/xz @@ -0,0 +1 @@ +Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c diff --git a/external/zstd b/external/zstd new file mode 160000 index 00000000..f4340f46 --- /dev/null +++ b/external/zstd @@ -0,0 +1 @@ +Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad

1 0

[orbot/master] use the new tor-android gradle dependency
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 6f364de26c4fb22d79ef4212d80f1306795c36d7 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Dec 3 15:10:25 2017 +0530 use the new tor-android gradle dependency https://github.com/n8fr8/tor-android --- build.gradle | 3 +++ orbotservice/build.gradle | 1 + 2 files changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 85852420..42b17638 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.0' @@ -11,5 +12,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + google() } } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 82a6aa78..fa89fa22 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -28,6 +28,7 @@ android { dependencies { compile project(':jsocksAndroid') + compile 'org.torproject:tor-android-binary:0.3.1.9' compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.jrummyapps:android-shell:1.0.1' compile fileTree(dir: 'libs', include: ['*.jar','*.so'])

1 0

[orbot/master] update build to use tor version constant from tor-android-binary
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 544ea7bd75b701678cca9dc6c33fe552f6e0330b Author: n8fr8 <nathan(a)freitas.net> Date: Sun Dec 3 17:30:07 2017 +0530 update build to use tor version constant from tor-android-binary --- BUILD | 37 +-- .../org/torproject/android/OrbotMainActivity.java | 5 +- .../android/ui/OrbotDiagnosticsActivity.java | 328 --------------------- orbotservice/build.gradle | 4 +- .../org/torproject/android/service/TorService.java | 2 + .../android/service/TorServiceConstants.java | 2 +- 6 files changed, 15 insertions(+), 363 deletions(-) diff --git a/BUILD b/BUILD index f9204608..92a5f3bf 100644 --- a/BUILD +++ b/BUILD @@ -2,50 +2,27 @@ This document explains how to properly build an Android package of Orbot from source. +DECEMBER 2017: We have removed the build process for tor and polipo from Orbot, +and instead now use the new tor-android gradle dependency: https://github.com/n8fr8/tor-android + Orbot includes, in the external directory, git repo submodules of: - - Tor - - OpenSSL (statically built and patched for Android) - - LibEvent - JTorControl: The Tor Control Library for Java -The Orbot repo also includes the Polipo source code of a recent stable release. - Please install the following prerequisites (instructions for each follows): ant: http://ant.apache.org/ Android Native Dev Kit or NDK (for C/C++ code): http://developer.android.com/sdk/ndk/index.html Android Software Dev Kit or SDK (for Java code): http://developer.android.com/sdk/index.html - AutoMake and AutoConf tool - sudo apt-get install autotools-dev - sudo apt-get install automake - sudo apt-get install autogen autoconf libtool - sudo apt-get install autopoint gettext-base pkg-config - -You will need to run the 'android' command in the SDK to install the necessary -Android platform supports (ICS 4.x or android-15) Be sure that you have all of the git submodules up-to-date: git submodule update --init --recursive -To begin building, from the Orbot root directory, you first need to build all -external C/native dependencies: - - export ANDROID_NDK_HOME={PATH TO YOUR NDK INSTALL} - make -C external - -At this point, you'll have Tor and Polipo binaries that can be run on an -Android handset. You can verify the ARM binary was properly built using the -following command: - - file external/bin/tor external/bin/polipo +You then need to run "ndk-build" from: -You should see something like: - external/bin/tor: ELF 32-bit LSB executable, ARM, version 1 (SYSV), - dynamically linked (uses shared libs), not stripped - external/bin/polipo: ELF 32-bit LSB executable, ARM, version 1 (SYSV), - dynamically linked (uses shared libs), not stripped + cd orbotservice/src/main + ndk-build This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. @@ -56,7 +33,7 @@ Now build the Android app (gradle / android studio instructions here) -This will produce an unsigned Tor package APK. +This will produce an unsigned Orbot package APK. To produce a usable package, you'll need to sign the .apk. The basics on signing can be found on the Android developer site: diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 60a3a2c5..17a81806 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -90,6 +90,7 @@ import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; import static android.support.v4.content.FileProvider.getUriForFile; +import static org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; public class OrbotMainActivity extends AppCompatActivity implements OrbotConstants, OnLongClickListener, OnTouchListener { @@ -432,7 +433,7 @@ public class OrbotMainActivity extends AppCompatActivity }); - ((TextView)findViewById(R.id.torInfo)).setText("Tor v" + TorServiceConstants.BINARY_TOR_VERSION); + ((TextView)findViewById(R.id.torInfo)).setText("Tor v" + BINARY_TOR_VERSION); } @@ -534,7 +535,7 @@ public class OrbotMainActivity extends AppCompatActivity String version = ""; try { - version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorServiceConstants.BINARY_TOR_VERSION + ")"; + version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + BINARY_TOR_VERSION + ")"; } catch (NameNotFoundException e) { version = "Version Not Found"; } diff --git a/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java b/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java deleted file mode 100644 index 63c54378..00000000 --- a/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java +++ /dev/null @@ -1,328 +0,0 @@ -package org.torproject.android.ui; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -import org.torproject.android.R; -import org.torproject.android.service.util.TorResourceInstaller; -import org.torproject.android.service.TorServiceConstants; - -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"; - private StringBuffer log = new StringBuffer(); - Process mProcess; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.layout_diag); - - mTextView = (TextView)findViewById(R.id.diaglog); - - } - - 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() { - super.onPause(); - - stopTor(); - } - - @Override - protected void onDestroy() { - - super.onDestroy(); - - } - - private void stopTor () - { - File appBinHome = this.getDir("bin", Context.MODE_PRIVATE); - - File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); - - if (mProcess != null) - mProcess.destroy(); - - - } - - - - @Override - 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(); - } - - 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); - - InputStream is = getResources().openRawResource(R.raw.torrc); - 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); - - mProcess = Runtime.getRuntime().exec(cmd); - - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getInputStream())); - StreamGobbler sg = new StreamGobbler(); - sg.reader = bufferedReader; - sg.process = mProcess; - new Thread(sg).start(); - - if (mProcess.getErrorStream() != null) - { - bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getErrorStream())); - sg = new StreamGobbler(); - sg.reader = bufferedReader; - sg.process = mProcess; - 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()); - - Runtime.getRuntime().exec("chmod " + TorServiceConstants.CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath()).waitFor(); - - File fileTest = new File(fileBin.getAbsolutePath()); - log(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute()); - - } - - return fileBin.canExecute(); - } - - private void showFileTree () - { - - File fileDir = this.getDir("bin", Context.MODE_PRIVATE); - - 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"); - } - - - } - - private void printDir (String path, File fileDir) - { - File[] files = fileDir.listFiles(); - - if (files != null && files.length > 0) - { - for (File file : files) - { - - 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"); - } - - } - } - } - - 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'); - log.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 () - { - int maxLength = 5000; - - String logShare = null; - - if (log.length() > maxLength) - logShare = log.substring(0, maxLength); - else - logShare = log.toString(); - - Intent sendIntent = new Intent(); - sendIntent.setAction(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_TEXT, logShare); - sendIntent.setType("text/plain"); - startActivity(sendIntent); - } - - -} diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index fa89fa22..b76a3841 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -28,8 +28,8 @@ android { dependencies { compile project(':jsocksAndroid') - compile 'org.torproject:tor-android-binary:0.3.1.9' - compile 'com.android.support:appcompat-v7:25.0.0' + compile 'org.torproject:tor-android-binary:0.3.1.9a' + compile 'com.android.support:appcompat-v7:25.4.0' compile 'com.jrummyapps:android-shell:1.0.1' compile fileTree(dir: 'libs', include: ['*.jar','*.so']) testCompile 'junit:junit:4.12' diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index b7e48f95..53a40339 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -80,6 +80,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; +import static org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; + public class TorService extends Service implements TorServiceConstants, OrbotConstants { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index b91f2b2d..4b62a6a8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -135,7 +135,7 @@ public interface TorServiceConstants { String CMD_UPDATE_TRANS_PROXY = "update"; String CMD_SET_EXIT = "setexit"; - String BINARY_TOR_VERSION = "0.3.1.8-openssl1.0.2k"; + // String BINARY_TOR_VERSION = "0.3.1.8-openssl1.0.2k"; String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] ZMerge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 07 Dec '17

07 Dec '17

commit 977167be3a30376ae6512b0c7d40688f0d85e6b6 Merge: b07d4feb 898f64a8 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Dec 3 15:37:43 2017 +0530 ZMerge branch 'master' of github.com:n8fr8/orbot BUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0