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

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

28 Apr '20

commit d2005234afa56a47ffe0586794b3dd920cd0f0f5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:00:25 2019 -0400 update gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dd82e239..ad5ff6ed 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.2' } }

1 0

[orbot/master] make sure we don't have any orphaned pdnsd processes
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit be5b8d885e345ddc1d0fd335d8892847476150a4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 16:35:26 2019 -0400 make sure we don't have any orphaned pdnsd processes --- orbotservice/build.gradle | 2 +- .../java/org/torproject/android/service/vpn/OrbotVpnManager.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index e3045712..7e933c7f 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - // implementation project(':jsocksAndroid') + implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.6' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.6' 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 40ea51af..c843c183 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 @@ -95,6 +95,13 @@ public class OrbotVpnManager implements Handler.Callback { filePdnsd = CustomNativeLoader.loadNativeBinary(service.getApplicationContext(),PDNSD_BIN,new File(service.getFilesDir(),PDNSD_BIN)); + // if that fails, try again using native utils + try { + killProcess(filePdnsd, "-1"); // this is -HUP + } catch (Exception e) { + e.printStackTrace(); + } + Tun2Socks.init();

1 0

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

28 Apr '20

commit d5e570a5ed2edf107d117a5eac094e300bb3f991 Merge: e146f703 767a8596 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Aug 6 09:36:48 2019 -0400 Merge pull request #247 from bitmold/low_dpi_launcher_icon Launcher icon was out of date on low resolution devices. app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 2394 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[orbot/master] send ports on start request, even if tor is already running
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c6bfc4911bc23aabe2ecc6c4d3878fd4d766b942 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Aug 2 09:26:08 2019 -0400 send ports on start request, even if tor is already running --- .../src/main/java/org/torproject/android/service/TorService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 c83c252e..793257d7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -381,8 +381,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (action != null) { if (action.equals(ACTION_START)) { - replyWithStatus(mIntent); startTor(); + replyWithStatus(mIntent); + } else if (action.equals(ACTION_STATUS)) { replyWithStatus(mIntent); @@ -814,6 +815,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon LocalBroadcastManager.getInstance(this).sendBroadcast(reply); + if (mPortSOCKS != -1 && mPortHTTP != -1) + sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + } /**

1 0

[orbot/master] make sure to kill existing pdnsd, and set the new ports properly
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit e146f703254bae36c2f9535595d71d97ef963bce Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Aug 2 10:26:33 2019 -0400 make sure to kill existing pdnsd, and set the new ports properly --- .../android/service/vpn/OrbotVpnManager.java | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) 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 c843c183..65db4659 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 @@ -144,15 +144,19 @@ public class OrbotVpnManager implements Handler.Callback { { Log.d(TAG,"starting OrbotVPNService service!"); - mTorSocks = intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1); - mTorDns = intent.getIntExtra(TorService.EXTRA_DNS_PORT,-1); + int newTorSocks = intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1); + int newTorDns = intent.getIntExtra(TorService.EXTRA_DNS_PORT,-1); - if (!mIsLollipop) - { - startSocksBypass(); - } + if ((mTorSocks != newTorSocks || mTorDns != newTorDns)) { + mTorSocks = newTorSocks; + mTorDns = newTorDns; + + if (!mIsLollipop) { + startSocksBypass(); + } - setupTun2Socks(builder); + setupTun2Socks(builder); + } } } @@ -424,6 +428,14 @@ public class OrbotVpnManager implements Handler.Callback { private boolean stopDns () { + + // if that fails, try again using native utils + try { + killProcess(filePdnsd, "-1"); // this is -HUP + } catch (Exception e) { + e.printStackTrace(); + } + File filePid = new File(mService.getFilesDir(),"pdnsd.pid"); String pid = null; @@ -443,6 +455,7 @@ public class OrbotVpnManager implements Handler.Callback { } } + return false; }

1 0

[orbot/master] keep apps around as static variable, enable user to refresh
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d396351695b4e9f0d18fbe2e15149d7b657ba5c3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 17:08:27 2019 -0400 keep apps around as static variable, enable user to refresh --- .../torproject/android/ui/AppManagerActivity.java | 53 ++++++++++++++++++---- app/src/main/res/menu/app_main.xml | 33 ++++++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 78 insertions(+), 9 deletions(-) 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 a8c7a180..f5970a25 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -3,6 +3,8 @@ package org.torproject.android.ui; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -11,10 +13,15 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import org.torproject.android.OrbotMainActivity; import org.torproject.android.service.OrbotConstants; import org.torproject.android.R; +import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; +import org.torproject.android.settings.SettingsPreferences; +import org.torproject.android.ui.hiddenservices.ClientCookiesActivity; +import org.torproject.android.ui.hiddenservices.HiddenServicesActivity; import android.Manifest; import android.content.Intent; @@ -27,6 +34,8 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -39,6 +48,8 @@ import android.widget.ListAdapter; import android.widget.ProgressBar; import android.widget.TextView; +import com.google.zxing.integration.android.IntentIntegrator; + import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED; public class AppManagerActivity extends AppCompatActivity implements OnClickListener, OrbotConstants { @@ -60,14 +71,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList progressBar = findViewById(R.id.progressBar); } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - finish(); - return true; - } - return super.onOptionsItemSelected(item); - } @Override protected void onResume() { @@ -76,6 +79,36 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList reloadApps(); } + + /* + * Create the UI Options Menu (non-Javadoc) + * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) + */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.app_main, menu); + return true; + } + + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + + if (item.getItemId() == R.id.menu_refresh_apps) + { + mApps = null; + reloadApps(); + } + else if (item.getItemId() == android.R.id.home) { + finish(); + return true; + } + + return super.onOptionsItemSelected(item); + } + private void reloadApps () { new AsyncTask<Void, Void, Void>() { protected void onPreExecute() { @@ -96,7 +129,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList } SharedPreferences mPrefs = null; - ArrayList<TorifiedApp> mApps = null; + static ArrayList<TorifiedApp> mApps = null; private void loadApps (SharedPreferences prefs) { if (mApps == null) @@ -181,6 +214,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList public ArrayList<TorifiedApp> getApps(SharedPreferences prefs) { String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); + String[] tordApps; StringTokenizer st = new StringTokenizer(tordAppString,"|"); @@ -209,6 +243,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList if (!aInfo.enabled) continue; app = new TorifiedApp(); + try { PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS); diff --git a/app/src/main/res/menu/app_main.xml b/app/src/main/res/menu/app_main.xml new file mode 100644 index 00000000..7f0e34d0 --- /dev/null +++ b/app/src/main/res/menu/app_main.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:yourapp="http://schemas.android.com/apk/res-auto" + > + + + <item android:id="@+id/menu_refresh_apps" + android:title="@string/refresh_apps" + android:icon="@drawable/ic_refresh_white_24dp" + yourapp:showAsAction="always" + /> + + + +</menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c86f0f0c..4400c048 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -254,4 +254,5 @@ <string name="user_services">User services</string> <string name="app_services">App services</string> <string name="default_socks_http">SOCKS: - HTTP: -</string> + <string name="refresh_apps">Refresh Apps</string> </resources>

1 0

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

28 Apr '20

commit 7d11984b9a8440bb3dd360e4d8c3118c462f9189 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Aug 2 15:59:29 2019 -0400 update to 16.1.0-RC-3-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 f13bfd3a..c1ddabff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16108000 - versionName '16.1.0-RC-2-tor-0.4.0.4-rc' + versionCode 16109000 + versionName '16.1.0-RC-3-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] Launcher icon was out of date on low resolution devices.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 767a8596307659ac46e0abb69fb4b52eff389633 Author: bim <dsnake(a)protonmail.com> Date: Mon Aug 5 20:02:05 2019 -0400 Launcher icon was out of date on low resolution devices. --- app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 2394 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png index dd665db2..aed52cbc 100644 Binary files a/app/src/main/res/drawable-ldpi/ic_launcher.png and b/app/src/main/res/drawable-ldpi/ic_launcher.png differ

1 0

[orbot/master] update to 16.1.1-BETA-1-tor-0.4.0.4-rc
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit cd80e8506f11acb41e5abe0cd37aabbb3fd67038 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Aug 6 16:56:28 2019 -0400 update to 16.1.1-BETA-1-tor-0.4.0.4-rc --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c1ddabff..8a656922 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16109000 - versionName '16.1.0-RC-3-tor-0.4.0.4-rc' + versionCode 16110000 + versionName '16.1.1-BETA-1-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } } @@ -55,7 +55,7 @@ android { reset() // Specifies a list of ABIs that Gradle should create APKs for. - include "x86", "armeabi", "armeabi-v7a", "x86_64", "arm64-v8a" + include "x86", "armeabi-v7a", "x86_64", "arm64-v8a" // Specifies that we do not want to also generate a universal APK that includes all ABIs. universalApk true

1 0

[orbot/master] instead of DisableNetwork, let's try NEWNYM when the network returns
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d02fb5826d0a2911b97bb80765d45072f97a6085 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Aug 6 16:51:46 2019 -0400 instead of DisableNetwork, let's try NEWNYM when the network returns - we've had issues of losing connectivity setting DisableNetwork, so we are trying a new approach - now using DormantClientTimeout settings, to have client go to sleep when it is not used - when we receive a network connectivity notification, we call NEWNYM to refresh circuits --- .../org/torproject/android/service/TorService.java | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 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 793257d7..65f0d179 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -418,6 +418,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onDestroy() { + try { unregisterReceiver(mNetworkStateReceiver); unregisterReceiver(mActionBroadcastReceiver); @@ -723,7 +724,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("AutomapHostsOnResolve 1").append('\n'); extraLines.append("DisableNetwork 0").append('\n'); - + extraLines.append("DormantClientTimeout 10 minutes").append('\n'); + extraLines.append("DormantOnFirstStartup 1").append('\n'); + if (Prefs.useDebugLogging()) { extraLines.append("Log debug syslog").append('\n'); @@ -840,7 +843,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else if (mCurrentStatus == STATUS_ON && (torProcId != null)) { sendCallbackLogMessage("Ignoring start request, already started."); - setTorNetworkEnabled (true); + // setTorNetworkEnabled (true); return; } @@ -1302,24 +1305,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return false; } - private String lastNetworkValue = "0"; public void setTorNetworkEnabled (final boolean isEnabled) throws IOException { - final String newValue =isEnabled ? "0" : "1"; - //it is possible to not have a connection yet, and someone might try to newnym - if (conn != null && (!lastNetworkValue.equals(newValue))) + if (conn != null) { new Thread () { public void run () { - try { - + try { + + final String newValue =isEnabled ? "0" : "1"; conn.setConf("DisableNetwork", newValue); - lastNetworkValue = newValue; } catch (Exception ioe){ debug("error requesting newnym: " + ioe.getLocalizedMessage()); @@ -1478,6 +1478,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon * Another way to do this would be to use the Observer pattern by defining the * BroadcastReciever in the Android manifest. */ + private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -1494,14 +1495,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon boolean newConnectivityState = false; int newNetType = -1; - - boolean isChanged = false; - + if (netInfo!=null) newNetType = netInfo.getType(); - isChanged = ((mNetworkType != newNetType)&&(mConnectivity != newConnectivityState)); - if(netInfo != null && netInfo.isConnected()) { // WE ARE CONNECTED: DO SOMETHING newConnectivityState = true; @@ -1513,14 +1510,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNetworkType = newNetType; mConnectivity = newConnectivityState; - + + if (mConnectivity) + newIdentity(); + + + /** if (doNetworKSleep && mCurrentStatus != STATUS_OFF) { - try { setTorNetworkEnabled (mConnectivity); - } catch (IOException e) { - e.printStackTrace(); - } if (!mConnectivity) { @@ -1532,9 +1530,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); + } - } + }**/ }

1 0