April 2020 - tor-commits - lists.torproject.org

[orbot/master] bind pdnsd to virtual address within VPN
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 79afbe05fb20e3f4fc1f77a89df9e1f683111d5a Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 9 14:37:27 2019 -0400 bind pdnsd to virtual address within VPN --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index cf9b8b71..40ea51af 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -328,7 +328,7 @@ public class OrbotVpnManager implements Handler.Callback { //start PDNSD daemon pointing to actual DNS int pdnsdPort = 8091; - startDNS(filePdnsd.getCanonicalPath(), localhost,mTorDns, "0.0.0.0", pdnsdPort); + startDNS(filePdnsd.getCanonicalPath(), localhost,mTorDns, virtualGateway, pdnsdPort); final boolean localDnsTransparentProxy = true; Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , virtualGateway + ":" + pdnsdPort , localDnsTransparentProxy);

1 0

[orbot/master] update to 16.1.0-RC-2-tor-0.4.0.4-rc
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d084aa6c00251e2fe827ac5ae372ea2e1d35374e Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 9 14:43:13 2019 -0400 update to 16.1.0-RC-2-tor-0.4.0.4-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 017ce68c..f13bfd3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16107000 - versionName '16.1.0-RC-1-tor-0.4.0.4-rc' + versionCode 16108000 + versionName '16.1.0-RC-2-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] update native libs
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 4321ae49849f1795f789b9671ce6fc7cc0b4f919 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 12:58:15 2019 -0400 update native libs --- .../src/main/libs/arm64-v8a/libtun2socks.so | Bin 196640 -> 205072 bytes orbotservice/src/main/libs/arm64-v8a/pdnsd.so | Bin 207224 -> 0 bytes .../src/main/libs/armeabi-v7a/libtun2socks.so | Bin 137836 -> 138052 bytes orbotservice/src/main/libs/armeabi-v7a/pdnsd.so | Bin 169824 -> 0 bytes orbotservice/src/main/libs/armeabi/libtun2socks.so | Bin 146024 -> 0 bytes orbotservice/src/main/libs/armeabi/pdnsd.so | Bin 178012 -> 0 bytes orbotservice/src/main/libs/x86/libtun2socks.so | Bin 195120 -> 199432 bytes orbotservice/src/main/libs/x86/pdnsd.so | Bin 202532 -> 0 bytes orbotservice/src/main/libs/x86_64/libtun2socks.so | Bin 196920 -> 205352 bytes orbotservice/src/main/libs/x86_64/pdnsd.so | Bin 219696 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so b/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so index 8aaedda7..478166e7 100755 Binary files a/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so and b/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd.so b/orbotservice/src/main/libs/arm64-v8a/pdnsd.so deleted file mode 100755 index 1bc4487d..00000000 Binary files a/orbotservice/src/main/libs/arm64-v8a/pdnsd.so and /dev/null differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so b/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so index 74b86bdf..af15b42d 100755 Binary files a/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so and b/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so b/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so deleted file mode 100755 index 573b5e42..00000000 Binary files a/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so and /dev/null differ diff --git a/orbotservice/src/main/libs/armeabi/libtun2socks.so b/orbotservice/src/main/libs/armeabi/libtun2socks.so deleted file mode 100755 index 55ef663a..00000000 Binary files a/orbotservice/src/main/libs/armeabi/libtun2socks.so and /dev/null differ diff --git a/orbotservice/src/main/libs/armeabi/pdnsd.so b/orbotservice/src/main/libs/armeabi/pdnsd.so deleted file mode 100755 index 95a5269d..00000000 Binary files a/orbotservice/src/main/libs/armeabi/pdnsd.so and /dev/null differ diff --git a/orbotservice/src/main/libs/x86/libtun2socks.so b/orbotservice/src/main/libs/x86/libtun2socks.so index af9a3ccc..b1daef6a 100755 Binary files a/orbotservice/src/main/libs/x86/libtun2socks.so and b/orbotservice/src/main/libs/x86/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/x86/pdnsd.so b/orbotservice/src/main/libs/x86/pdnsd.so deleted file mode 100755 index c078cc38..00000000 Binary files a/orbotservice/src/main/libs/x86/pdnsd.so and /dev/null differ diff --git a/orbotservice/src/main/libs/x86_64/libtun2socks.so b/orbotservice/src/main/libs/x86_64/libtun2socks.so index 8861e585..1d55e84c 100755 Binary files a/orbotservice/src/main/libs/x86_64/libtun2socks.so and b/orbotservice/src/main/libs/x86_64/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/x86_64/pdnsd.so b/orbotservice/src/main/libs/x86_64/pdnsd.so deleted file mode 100755 index 68721cc2..00000000 Binary files a/orbotservice/src/main/libs/x86_64/pdnsd.so and /dev/null differ

1 0

[orbot/master] Merge pull request #244 from bitmold/vpn_app_ui_glitch
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c7e9b01f1cf126b8303e404437f48bc6fe0dde2c Merge: 95fe689f 7b832f19 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Jul 31 12:58:00 2019 -0400 Merge pull request #244 from bitmold/vpn_app_ui_glitch Fixed VPN App UI for apps that were disabled or uninstalled .../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++++++------ .../torproject/android/ui/AppManagerActivity.java | 15 +++-------- .../android/service/vpn/TorifiedApp.java | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-)

1 0

[orbot/master] After following the BUILD file, could not build the apk because of a issue mentioned in #217: Execution failed for task :orbotservice:mergeDebugJniLibFolders. This change fixes that.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit fc0b035a4173683a726b9e1f1fbbc639c46a0bb0 Author: Eric Offermann <eoffermann(a)ridgelineintl.com> Date: Tue Jul 30 23:36:27 2019 -0400 After following the BUILD file, could not build the apk because of a issue mentioned in #217: Execution failed for task :orbotservice:mergeDebugJniLibFolders. This change fixes that. --- orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index d39361f1..e3045712 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -6,7 +6,7 @@ android { sourceSets { main { - jni.srcDirs = [] + jniLibs.srcDirs = ['./src/main/libs'] } }

1 0

[orbot/master] Fixed VPN App UI for apps that were disabled or uninstalled
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 7b832f19d0b5891a824e81186b2f3b10389ac147 Author: bim <dsnake(a)protonmail.com> Date: Fri Jul 12 15:07:26 2019 -0400 Fixed VPN App UI for apps that were disabled or uninstalled --- .../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++++++------ .../torproject/android/ui/AppManagerActivity.java | 15 +++-------- .../android/service/vpn/TorifiedApp.java | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 0dad0520..5e763ec7 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -49,6 +49,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; @@ -1321,19 +1322,17 @@ public class OrbotMainActivity extends AppCompatActivity String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, ""); if (TextUtils.isEmpty(tordAppString)) { - TextView tv = new TextView(this); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - params.setMargins(12, 3, 3, 3); - tv.setLayoutParams(params); - tv.setText(R.string.full_device_vpn); - llBoxShortcuts.addView(tv); + addFullDeviceVpnView(llBoxShortcuts); } else { StringTokenizer st = new StringTokenizer(tordAppString, "|"); while (st.hasMoreTokens() && pkgIds.size() < 4) pkgIds.add(st.nextToken()); - + int appsAdded = 0; for (final String pkgId : pkgIds) { try { + ApplicationInfo aInfo = getPackageManager().getApplicationInfo(pkgId, 0); + // skip disabled packages + if (!aInfo.enabled) continue; ImageView iv = new ImageView(this); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); params.setMargins(3, 3, 3, 3); @@ -1348,11 +1347,17 @@ public class OrbotMainActivity extends AppCompatActivity }); llBoxShortcuts.addView(iv); - + appsAdded++; } catch (Exception e) { //package not installed? } } + if (appsAdded == 0) { + /* if a user uninstalled or disabled all apps that were set on the device + then we want to have the no apps added view appear even though + the tordAppString variable is not empty */ + addFullDeviceVpnView(llBoxShortcuts); + } } } else @@ -1383,4 +1388,13 @@ public class OrbotMainActivity extends AppCompatActivity } + private void addFullDeviceVpnView(LinearLayout llBoxShortcuts) { + TextView tv = new TextView(this); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + params.setMargins(12, 3, 3, 3); + tv.setLayoutParams(params); + tv.setText(R.string.full_device_vpn); + llBoxShortcuts.addView(tv); + } + } diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index afa09500..a8c7a180 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -16,6 +16,7 @@ import org.torproject.android.R; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; +import android.Manifest; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; @@ -204,7 +205,8 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList while (itAppInfo.hasNext()) { aInfo = itAppInfo.next(); - + // don't include apps user has disabled, often these ship with the device + if (!aInfo.enabled) continue; app = new TorifiedApp(); try { @@ -214,10 +216,9 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList { for (String permInfo:pInfo.requestedPermissions) { - if (permInfo.equals("android.permission.INTERNET")) + if (permInfo.equals(Manifest.permission.INTERNET)) { app.setUsesInternet(true); - } } @@ -229,14 +230,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList e.printStackTrace(); } - /** - if ((aInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1) - { - //System app - app.setUsesInternet(true); - }**/ - - try { app.setName(pMgr.getApplicationLabel(aInfo).toString()); diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index 397dd259..db25fd00 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -1,5 +1,6 @@ package org.torproject.android.service.vpn; +import android.Manifest; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; @@ -193,7 +194,7 @@ public class TorifiedApp implements Comparable { { for (String permInfo:pInfo.requestedPermissions) { - if (permInfo.equals("android.permission.INTERNET")) + if (permInfo.equals(Manifest.permission.INTERNET)) { app.setUsesInternet(true);

1 0

[orbot/master] don't build plain armeabi anymore
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c0afffebcedb1550c7719dccd29af056056deca9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 12:58:52 2019 -0400 don't build plain armeabi anymore --- orbotservice/src/main/jni/Application.mk | 2 +- orbotservice/src/main/libs/arm64-v8a/pdnsd | Bin 0 -> 207448 bytes orbotservice/src/main/libs/armeabi-v7a/pdnsd | Bin 0 -> 153644 bytes orbotservice/src/main/libs/x86/pdnsd | Bin 0 -> 198644 bytes orbotservice/src/main/libs/x86_64/pdnsd | Bin 0 -> 219928 bytes 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index 58e4e08f..334c62fe 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,3 +1,3 @@ -APP_ABI := armeabi armeabi-v7a x86 arm64-v8a x86_64 +APP_ABI := armeabi-v7a x86 arm64-v8a x86_64 APP_PLATFORM := android-16 APP_STL := c++_static diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd b/orbotservice/src/main/libs/arm64-v8a/pdnsd new file mode 100755 index 00000000..9c23b87b Binary files /dev/null and b/orbotservice/src/main/libs/arm64-v8a/pdnsd differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd b/orbotservice/src/main/libs/armeabi-v7a/pdnsd new file mode 100755 index 00000000..af435fe1 Binary files /dev/null and b/orbotservice/src/main/libs/armeabi-v7a/pdnsd differ diff --git a/orbotservice/src/main/libs/x86/pdnsd b/orbotservice/src/main/libs/x86/pdnsd new file mode 100755 index 00000000..4799d46b Binary files /dev/null and b/orbotservice/src/main/libs/x86/pdnsd differ diff --git a/orbotservice/src/main/libs/x86_64/pdnsd b/orbotservice/src/main/libs/x86_64/pdnsd new file mode 100755 index 00000000..9dc1b045 Binary files /dev/null and b/orbotservice/src/main/libs/x86_64/pdnsd differ

1 0

[orbot/master] pdnsd must be named with a .so extension to be included
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 929cb6b67cf2416dc1f093554f47f45b54fe7e42 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:00:01 2019 -0400 pdnsd must be named with a .so extension to be included --- orbotservice/src/main/libs/arm64-v8a/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/armeabi-v7a/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/x86/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/x86_64/{pdnsd => pdnsd.so} | Bin 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd b/orbotservice/src/main/libs/arm64-v8a/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/arm64-v8a/pdnsd rename to orbotservice/src/main/libs/arm64-v8a/pdnsd.so diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd b/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/armeabi-v7a/pdnsd rename to orbotservice/src/main/libs/armeabi-v7a/pdnsd.so diff --git a/orbotservice/src/main/libs/x86/pdnsd b/orbotservice/src/main/libs/x86/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/x86/pdnsd rename to orbotservice/src/main/libs/x86/pdnsd.so diff --git a/orbotservice/src/main/libs/x86_64/pdnsd b/orbotservice/src/main/libs/x86_64/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/x86_64/pdnsd rename to orbotservice/src/main/libs/x86_64/pdnsd.so

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit be6feea87941aec8bce9c0a848904a7eab3869f2 Merge: d2005234 c7e9b01f Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:01:08 2019 -0400 Merge branch 'master' of github.com:n8fr8/orbot .../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++++++------ .../torproject/android/ui/AppManagerActivity.java | 15 +++-------- .../android/service/vpn/TorifiedApp.java | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-)

1 0

[orbot/master] Merge branch 'ejo4041-mergeDebugJniLibFolders_issue'
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 72ff7dd2fce67204306b896bb05822e819e4a260 Merge: be6feea8 07e34239 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:07:36 2019 -0400 Merge branch 'ejo4041-mergeDebugJniLibFolders_issue' orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0