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

[orbot/master] Merge branch 'hidden_services' of https://github.com/arrase/orbot into arrase-hidden_services
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 26b91993784aad1f5811e9da20c7a385fbf8d987 Merge: d937b9b 5000754 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 22:19:02 2017 -0500 Merge branch 'hidden_services' of https://github.com/arrase/orbot into arrase-hidden_services app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 239 ++++++----- .../org/torproject/android/OrbotMainActivity.java | 448 +++++++++++++-------- .../android/settings/SettingsPreferences.java | 20 +- .../ui/hiddenservices/ClientCookiesActivity.java | 199 +++++++++ .../ui/hiddenservices/HiddenServicesActivity.java | 214 ++++++++++ .../ui/hiddenservices/adapters/BackupAdapter.java | 50 +++ .../adapters/ClientCookiesAdapter.java | 64 +++ .../hiddenservices/adapters/OnionListAdapter.java | 68 ++++ .../ui/hiddenservices/backup/BackupUtils.java | 336 ++++++++++++++++ .../android/ui/hiddenservices/backup/ZipIt.java | 101 +++++ .../ui/hiddenservices/database/HSDatabase.java | 47 +++ .../ui/hiddenservices/dialogs/AddCookieDialog.java | 84 ++++ .../dialogs/CookieActionsDialog.java | 95 +++++ .../hiddenservices/dialogs/CookieDeleteDialog.java | 50 +++ .../ui/hiddenservices/dialogs/HSActionsDialog.java | 130 ++++++ .../ui/hiddenservices/dialogs/HSCookieDialog.java | 81 ++++ .../ui/hiddenservices/dialogs/HSDataDialog.java | 102 +++++ .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 65 +++ .../dialogs/SelectCookieBackupDialog.java | 84 ++++ .../dialogs/SelectHSBackupDialog.java | 84 ++++ .../permissions/PermissionManager.java | 103 +++++ .../providers/CookieContentProvider.java | 134 ++++++ .../providers/HSContentProvider.java | 144 +++++++ .../ui/hiddenservices/storage/ExternalStorage.java | 34 ++ .../res/layout/layout_activity_client_cookies.xml | 35 ++ .../res/layout/layout_add_client_cookie_dialog.xml | 64 +++ .../res/layout/layout_client_cookie_list_item.xml | 24 ++ .../res/layout/layout_content_client_cookies.xml | 21 + app/src/main/res/layout/layout_cookie_actions.xml | 24 ++ app/src/main/res/layout/layout_hs_actions.xml | 36 ++ app/src/main/res/layout/layout_hs_backups_list.xml | 12 + .../res/layout/layout_hs_backups_list_item.xml | 25 ++ app/src/main/res/layout/layout_hs_cookie.xml | 31 ++ app/src/main/res/layout/layout_hs_data_dialog.xml | 87 ++++ app/src/main/res/layout/layout_hs_list_item.xml | 59 +++ app/src/main/res/layout/layout_hs_list_view.xml | 33 ++ .../main/res/layout/layout_hs_list_view_main.xml | 20 + app/src/main/res/menu/cookie_menu.xml | 11 + app/src/main/res/menu/hs_menu.xml | 14 + app/src/main/res/menu/orbot_main.xml | 18 +- app/src/main/res/values-es/arrays.xml | 16 + app/src/main/res/values-es/strings.xml | 32 ++ app/src/main/res/values-v21/styles.xml | 1 + app/src/main/res/values-w820dp/dimens.xml | 6 + app/src/main/res/values/arrays.xml | 5 +- app/src/main/res/values/dimens.xml | 22 +- app/src/main/res/values/strings.xml | 142 ++++--- app/src/main/res/values/styles.xml | 6 + app/src/main/res/xml/hidden_services_paths.xml | 4 + app/src/main/res/xml/preferences.xml | 11 - .../org/torproject/android/service/TorService.java | 256 +++++++----- .../android/service/TorServiceConstants.java | 2 + 53 files changed, 3517 insertions(+), 478 deletions(-)

1 0

[orbot/master] cache circuits by circId
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 19539620a9fee3ffac6a71ed614330f2fe74572c Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jan 14 06:40:25 2017 -0500 cache circuits by circId --- .../main/java/org/torproject/android/service/TorEventHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index f6aa315..8231803 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -190,7 +190,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { { node.id = nodeParts[0].substring(1); node.name = nodeParts[1]; - } + } node.status = status; @@ -215,12 +215,12 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (node.ipAddress == null) mService.exec(new ExternalIPFetcher(node)); - hmBuiltNodes.put(node.id, node); + hmBuiltNodes.put(circID, node); } if (status.equals("CLOSED")) { - hmBuiltNodes.remove(node.id); + hmBuiltNodes.remove(circID); } }

1 0

[orbot/master] we want to only look up iptables once per run
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit c9fc49a2de314800a1d271b3555e357af95c1c37 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jan 14 06:40:10 2017 -0500 we want to only look up iptables once per run --- .../org/torproject/android/service/transproxy/TorTransProxy.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/transproxy/TorTransProxy.java b/orbotservice/src/main/java/org/torproject/android/service/transproxy/TorTransProxy.java index 6c3121a..8d37bd9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/transproxy/TorTransProxy.java +++ b/orbotservice/src/main/java/org/torproject/android/service/transproxy/TorTransProxy.java @@ -103,21 +103,20 @@ public class TorTransProxy implements TorServiceConstants { private String findSystemIPTables () { - if (mSysIptables == null) - { + if (mSysIptables == null) { //if the user wants us to use the built-in iptables, then we have to find it File fileIpt = new File("/system/xbin/iptables"); if (fileIpt.exists()) mSysIptables = fileIpt.getAbsolutePath(); - else - { + else { fileIpt = new File("/system/bin/iptables"); if (fileIpt.exists()) mSysIptables = fileIpt.getAbsolutePath(); } + } return mSysIptables; }

1 0

[orbot/master] Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit cb2c5fe6619b4e93f5348d86208babd6e38e0031 Merge: 1953962 f1a8fbd Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jan 14 06:45:43 2017 -0500 Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63 Conflicts: app/src/main/java/org/torproject/android/OrbotMainActivity.java .../org/torproject/android/OrbotMainActivity.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --cc app/src/main/java/org/torproject/android/OrbotMainActivity.java index 1a468d4,ef9d6a0..4945002 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@@ -1287,9 -1193,17 +1287,18 @@@ public class OrbotMainActivity extends if (autoStartFromIntent) { autoStartFromIntent = false; - Intent resultIntent = lastStatusIntent; - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); + Intent resultIntent = lastStatusIntent; + - if (resultIntent == null) - resultIntent = new Intent(TorServiceConstants.ACTION_START); ++ if (resultIntent == null) ++ resultIntent = new Intent(TorServiceConstants.ACTION_START); ++ ++ resultIntent.putExtra( ++ TorServiceConstants.EXTRA_STATUS, ++ torStatus == null?TorServiceConstants.STATUS_OFF:torStatus ++ ); + - resultIntent.putExtra( - TorServiceConstants.EXTRA_STATUS, - torStatus == null?TorServiceConstants.STATUS_OFF:torStatus - ); ++ setResult(RESULT_OK, resultIntent); + - setResult(RESULT_OK, resultIntent); finish(); Log.d(TAG, "autoStartFromIntent finish"); }

1 0

[orbot/master] update maxfile for tor 0.2.9.9
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit efde11ffc4f580a6dd51e0082164c1550eebff9f Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 28 23:21:42 2017 -0500 update maxfile for tor 0.2.9.9 --- external/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index 84da1c1..5090e94 100644 --- a/external/Makefile +++ b/external/Makefile @@ -228,9 +228,9 @@ tor/configure: ./autogen.sh tor/Makefile: tor/configure - cp 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch tor - cd tor && \ - git apply 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch +# cp 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch tor +# cd tor && \ +# git apply 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch # cp fix_android_0.2.6.4rc_build.patch tor # cd tor && \ # git apply fix_android_0.2.6.4rc_build.patch @@ -244,7 +244,7 @@ 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-linker-hardening --disable-gcc-hardening --disable-tool-name-check tor-build-stamp: tor/Makefile $(MAKE) -C tor all-am

1 0

[orbot/master] update to release-0.2.9
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 7bac2122903be7664d1b1b3a0f28c2f406c4025c Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 28 23:01:30 2017 -0500 update to release-0.2.9 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 44c5fc6..56788a2 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 44c5fc6878d91d6069ed8c58ba6ad3b1f9b2963b +Subproject commit 56788a2489127072d513cf4baf35a8ff475f3c7b

1 0

[orbot/master] update to OpenSSL_1_0_2k
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 44ab128c29a4ffb2fd7e717242cef5f6726c1578 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 28 23:01:11 2017 -0500 update to OpenSSL_1_0_2k --- external/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/openssl b/external/openssl index e216bf9..081314d 160000 --- a/external/openssl +++ b/external/openssl @@ -1 +1 @@ -Subproject commit e216bf9d7ca761718f34e8b3094fcb32c7a143e4 +Subproject commit 081314d07705aa58912845c213a48414d8f616a9

1 0

[orbot/master] if there is no status intent yet, then create one, and don't NPE
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 45105572d945998013cca9d4173e796064f658c8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Nov 16 07:50:40 2016 -0500 if there is no status intent yet, then create one, and don't NPE --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index c43928e..7706c0f 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -103,7 +103,7 @@ public class OrbotMainActivity extends AppCompatActivity private ActionBarDrawerToggle mDrawerToggle; /* Some tracking bits */ - private String torStatus = null; //latest status reported from the tor service + private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received private SharedPreferences mPrefs = null; @@ -1193,7 +1193,11 @@ public class OrbotMainActivity extends AppCompatActivity if (autoStartFromIntent) { autoStartFromIntent = false; - Intent resultIntent = lastStatusIntent; + Intent resultIntent = lastStatusIntent; + + if (resultIntent == null) + resultIntent = new Intent(TorServiceConstants.ACTION_START); + resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); setResult(RESULT_OK, resultIntent); finish();

1 0

[orbot/master] make sure tor network is re-enabled when user tries to restart
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit ff61d66bcfbb65baa7673857d420670c4f220c8c Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Nov 16 07:52:21 2016 -0500 make sure tor network is re-enabled when user tries to restart --- .../org/torproject/android/service/TorService.java | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) 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 d55e1cf..53dd07a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -581,14 +581,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mNotificationManager == null) { - - IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); - registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - } - + + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + + new Thread(new Runnable () { public void run () @@ -773,7 +772,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else if (mCurrentStatus == STATUS_ON) { sendCallbackLogMessage("Ignoring start request, already started."); - + setTorNetworkEnabled (true); + return; } @@ -1521,7 +1521,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNetworkType = newNetType; mConnectivity = newConnectivityState; - if (doNetworKSleep) + if (doNetworKSleep && mCurrentStatus != STATUS_OFF) { setTorNetworkEnabled (mConnectivity); @@ -1539,18 +1539,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { - if (mCurrentStatus != STATUS_OFF) + if (mConnectivity) { - if (mConnectivity) + if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh()) { - if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh()) - { - disableTransparentProxy(); - enableTransparentProxy(); + disableTransparentProxy(); + enableTransparentProxy(); - } } }

1 0

[orbot/master] put short status display back on main screen
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit d09c2b59b4337eb799365423a8321a1222ccfb1d Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Nov 16 07:52:06 2016 -0500 put short status display back on main screen --- app/src/main/res/layout/layout_main.xml | 15 ++++++++++++++- app/src/main/res/layout/layout_orbot_control.xml | 12 +----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index ab566ec..5edfc32 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -78,7 +78,20 @@ </LinearLayout> - + <TextView + android:id="@+id/lblStatus" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:fontFamily="sans-serif-light" + android:text="" + android:lines="1" + android:maxLines="1" + android:layout_margin="12dp" + android:layout_alignParentBottom="true" + android:gravity="center" + android:ellipsize="end" + /> </RelativeLayout> diff --git a/app/src/main/res/layout/layout_orbot_control.xml b/app/src/main/res/layout/layout_orbot_control.xml index 870eda4..f7d15d8 100644 --- a/app/src/main/res/layout/layout_orbot_control.xml +++ b/app/src/main/res/layout/layout_orbot_control.xml @@ -107,17 +107,7 @@ /> </RelativeLayout> - <TextView - android:id="@+id/lblStatus" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="14sp" - android:fontFamily="sans-serif-light" - android:text="" - android:lines="2" - android:maxLines="2" - android:layout_margin="12dp" - /> + </LinearLayout>

1 0