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

[orbot/master] start fixing mbps to Mbps etc for #378
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit b750d1075c1dcdd22221ef9228614687053978a5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 08:57:50 2020 -0400 start fixing mbps to Mbps etc for #378 --- app/src/main/res/values-ay/strings.xml | 4 ++-- app/src/main/res/values-az/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml index 3ea8a7d3..… [View More]

1 0

[orbot/master] ensure textview is not null for #379
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit d6b6d5cb8b3d7c3cc92e708a4b87fc34f4e008f8 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 08:57:20 2020 -0400 ensure textview is not null for #379 --- .../torproject/android/ui/onboarding/BridgeWizardActivity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index … [View More]

1 0

[orbot/master] update jtorctl to 0.4 and add more tor DataDirectory corruption debug capabilties
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 74fce069df64b5cd35003c8bad75cc0f0a2622d2 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 12 14:53:24 2020 -0400 update jtorctl to 0.4 and add more tor DataDirectory corruption debug capabilties --- .../org/torproject/android/OrbotMainActivity.java | 29 ++++++ orbotservice/src/main/AndroidManifest.xml | 2 + .../torproject/android/service/OrbotService.java | 112 +++++++++++++++------ .../android/service/TorEventHandler.java | 22 ++-- .… [View More]../org/torproject/android/service/util/Utils.java | 92 ++++++++++++++++- 5 files changed, 218 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 1d2e1493..af311c34 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -5,6 +5,7 @@ package org.torproject.android; import android.app.AlertDialog; +import android.app.Application; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.ContentValues; @@ -19,7 +20,9 @@ import android.content.pm.PackageManager; import android.database.Cursor; import android.net.Uri; import android.net.VpnService; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.Message; import android.text.TextUtils; @@ -39,6 +42,7 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.Toolbar; @@ -54,6 +58,7 @@ import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; +import org.torproject.android.service.util.Utils; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; import org.torproject.android.service.vpn.VpnUtils; @@ -77,6 +82,7 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Locale; import java.util.StringTokenizer; @@ -89,6 +95,7 @@ import static org.torproject.android.MainConstants.URL_TOR_CHECK; import static org.torproject.android.service.TorServiceConstants.ACTION_START; import static org.torproject.android.service.TorServiceConstants.ACTION_START_VPN; import static org.torproject.android.service.TorServiceConstants.ACTION_STOP_VPN; +import static org.torproject.android.service.TorServiceConstants.DIRECTORY_TOR_DATA; import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED; public class OrbotMainActivity extends AppCompatActivity implements OrbotConstants { @@ -198,6 +205,11 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan VpnUtils.getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT, VpnConstants.TOR_DNS_PORT_DEFAULT).apply(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (Prefs.useDebugLogging()) + exportTorData(); + } + } private void sendIntentToService(final String action) { @@ -1250,4 +1262,21 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan llBoxShortcuts.addView(tv); } + @RequiresApi(api = Build.VERSION_CODES.KITKAT) + private void exportTorData () + { + File fileTorData = null; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) { + fileTorData = new File(getDataDir(),DIRECTORY_TOR_DATA); + } + else { + fileTorData = getDir(DIRECTORY_TOR_DATA, Application.MODE_PRIVATE); + } + + File fileZip = new File(getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS),"orbotdata" + new Date().getTime() + ".zip"); + Utils.zipFileAtPath(fileTorData.getAbsolutePath(), fileZip.getAbsolutePath()); + fileZip.setReadable(true,false); + Log.d (TAG,"debugdata: " + fileZip.getAbsolutePath()); + + } } diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml index 801a9c18..962fe09c 100644 --- a/orbotservice/src/main/AndroidManifest.xml +++ b/orbotservice/src/main/AndroidManifest.xml @@ -1,4 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android.service"> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + </manifest> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 7bf6ade0..a3aa2d98 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -28,6 +28,8 @@ import android.database.Cursor; import android.net.Uri; import android.net.VpnService; import android.os.Build; +import android.os.Environment; +import android.os.Handler; import android.os.IBinder; import android.provider.BaseColumns; import androidx.annotation.RequiresApi; @@ -39,8 +41,10 @@ import android.util.Log; import com.jaredrummler.android.shell.CommandResult; import net.freehaven.tor.control.ConfigEntry; +import net.freehaven.tor.control.RawEventListener; import net.freehaven.tor.control.TorControlConnection; +import org.apache.commons.io.FileUtils; import org.torproject.android.service.util.CustomShell; import org.torproject.android.service.util.CustomTorResourceInstaller; import org.torproject.android.service.util.DummyActivity; @@ -66,9 +70,12 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; import java.net.Socket; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -133,6 +140,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb OrbotVpnManager mVpnManager; + Handler mHandler; + public static final class HiddenService implements BaseColumns { public static final String NAME = "name"; public static final String PORT = "port"; @@ -174,10 +183,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb public void debug(String msg) { + + Log.d(OrbotConstants.TAG,msg); + if (Prefs.useDebugLogging()) { - Log.d(OrbotConstants.TAG,msg); - sendCallbackLogMessage(msg); + sendCallbackLogMessage(msg); } } @@ -535,6 +546,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { + mHandler = new Handler(); + appBinHome = getFilesDir();//getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); if (!appBinHome.exists()) appBinHome.mkdirs(); @@ -549,6 +562,20 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!appCacheHome.exists()) appCacheHome.mkdirs(); + + debug("listing files in DataDirectory: " + appCacheHome.getAbsolutePath()); + Iterator<File> files = FileUtils.iterateFiles(appCacheHome,null,true); + while (files.hasNext()) + { + File fileNext = files.next(); + debug(fileNext.getAbsolutePath() + + " length=" + fileNext.length() + + " rw=" + fileNext.canRead() + "/" + fileNext.canWrite() + + " lastMod=" + new Date(fileNext.lastModified()).toLocaleString() + + ); + } + fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); fileControlPort = new File(getFilesDir(), TOR_CONTROL_PORT_FILE); filePid = new File(getFilesDir(), TOR_PID_FILE); @@ -680,8 +707,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("PidFile").append(' ').append(filePid.getCanonicalPath()).append('\n'); - //extraLines.append("RunAsDaemon 1").append('\n'); - //extraLines.append("AvoidDiskWrites 1").append('\n'); + extraLines.append("RunAsDaemon 1").append('\n'); + extraLines.append("AvoidDiskWrites 1").append('\n'); String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); @@ -756,8 +783,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); extraLines.append("AutomapHostsOnResolve 1").append('\n'); - extraLines.append("DormantClientTimeout 10 minutes").append('\n'); - extraLines.append("DormantOnFirstStartup 0").append('\n'); + // extraLines.append("DormantClientTimeout 10 minutes").append('\n'); + // extraLines.append("DormantOnFirstStartup 0").append('\n'); extraLines.append("DisableNetwork 0").append('\n'); @@ -992,10 +1019,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackLogMessage(getString(R.string.status_starting_up)); - String torCmdString = fileTor.getCanonicalPath() - + " DataDirectory " + appCacheHome.getCanonicalPath() - + " --defaults-torrc " + fileTorRc.getCanonicalPath() - + " -f " + fileTorrcCustom.getCanonicalPath(); + String torCmdString = fileTor.getAbsolutePath() + + " DataDirectory " + appCacheHome.getAbsolutePath() + + " --defaults-torrc " + fileTorRc.getAbsolutePath() + + " -f " + fileTorrcCustom.getAbsolutePath(); int exitCode = -1; @@ -1122,16 +1149,42 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (fileCookie.exists()) { + // We extend NullEventHandler so that we don't need to provide empty + // implementations for all the events we don't care about. + logNotice( "adding control port event handler"); + + if (Prefs.useDebugLogging()) { + conn.setDebugging(System.out); + conn.addRawEventListener(new RawEventListener() { + @Override + public void onEvent(String keyword, String data) { + + + debug(keyword + ": " + data); + } + }); + } + + conn.setEventHandler(mEventHandler); + + logNotice( "SUCCESS added control port event handler"); byte[] cookie = new byte[(int)fileCookie.length()]; DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); fis.read(cookie); fis.close(); conn.authenticate(cookie); - addEventHandler(); - logNotice( "SUCCESS - authenticated to control port."); + // conn.setEvents(Arrays.asList(new String[]{"DEBUG","STATUS_CLIENT","STATUS_GENERAL","BW"})); + + if (Prefs.useDebugLogging()) + conn.setEvents(Arrays.asList(new String[]{ + "CIRC","STREAM", "ORCONN" , "BW" , "INFO" ,"NOTICE" , "WARN" , "DEBUG","ERR" , "NEWDESC" , "ADDRMAP"})); + else + conn.setEvents(Arrays.asList(new String[]{ + "CIRC","STREAM", "ORCONN" , "BW" , "NOTICE" ,"ERR" , "NEWDESC" , "ADDRMAP"})); + // sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); String torProcId = conn.getInfo("process/pid"); @@ -1169,6 +1222,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + setTorNetworkEnabled(true); return Integer.parseInt(torProcId); @@ -1221,20 +1275,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return result; } - public void addEventHandler () throws Exception { - // We extend NullEventHandler so that we don't need to provide empty - // implementations for all the events we don't care about. - // ... - logNotice( "adding control port event handler"); - - - conn.setEvents(Arrays.asList(new String[]{ - "CIRC","STREAM", "ORCONN" , "BW" , "INFO" ,"NOTICE" , "WARN" , "ERR" , "NEWDESC" , "ADDRMAP"})); - - conn.setEventHandler(mEventHandler); - - logNotice( "SUCCESS added control port event handler"); - } /** * Returns the port number that the HTTP proxy is running on @@ -1453,15 +1493,23 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } - private void sendCallbackLogMessage (String logMessage) + private void sendCallbackLogMessage (final String logMessage) { - Intent intent = new Intent(LOCAL_ACTION_LOG); - // You can also include some extra data. - intent.putExtra(LOCAL_EXTRA_LOG, logMessage); - intent.putExtra(EXTRA_STATUS, mCurrentStatus); + mHandler.post(new Runnable () { + + public void run () + { + + Intent intent = new Intent(LOCAL_ACTION_LOG); + // You can also include some extra data. + intent.putExtra(LOCAL_EXTRA_LOG, logMessage); + intent.putExtra(EXTRA_STATUS, mCurrentStatus); + + LocalBroadcastManager.getInstance(OrbotService.this).sendBroadcast(intent); + } - LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + }); } 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 ce7a6633..7cebd794 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -57,7 +57,11 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { @Override public void message(String severity, String msg) { - mService.logNotice(severity + ": " + msg); + + if (severity.equalsIgnoreCase("debug")) + mService.debug(severity + ": " + msg); + else + mService.logNotice(severity + ": " + msg); } @Override @@ -89,7 +93,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { sb.append("): "); sb.append(status); - mService.logNotice(sb.toString()); + mService.debug(sb.toString()); } @Override @@ -104,10 +108,12 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { mService.logNotice(sb.toString()); } + private final static int BW_THRESDHOLD = 10000; + @Override public void bandwidthUsed(long read, long written) { - if (read != lastRead || written != lastWritten) + if (lastWritten > BW_THRESDHOLD || lastRead > BW_THRESDHOLD) { StringBuilder sb = new StringBuilder(); sb.append(formatCount(read)); @@ -125,12 +131,16 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { mTotalTrafficWritten += written; mTotalTrafficRead += read; + + mService.sendCallbackBandwidth(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); + + lastWritten = 0; + lastRead = 0; } - lastWritten = written; - lastRead = read; + lastWritten += written; + lastRead += read; - mService.sendCallbackBandwidth(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); } private String formatCount(long count) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Utils.java b/orbotservice/src/main/java/org/torproject/android/service/util/Utils.java index 0fac4019..e6e203e3 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Utils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Utils.java @@ -4,13 +4,19 @@ package org.torproject.android.service.util; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; public class Utils { @@ -94,7 +100,91 @@ public class Utils { } - + /* + * + * Zips a file at a location and places the resulting zip file at the toLocation + * Example: zipFileAtPath("downloads/myfolder", "downloads/myFolder.zip"); + */ + + public static boolean zipFileAtPath(String sourcePath, String toLocation) { + final int BUFFER = 2048; + + File sourceFile = new File(sourcePath); + try { + BufferedInputStream origin = null; + FileOutputStream dest = new FileOutputStream(toLocation); + ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream( + dest)); + if (sourceFile.isDirectory()) { + zipSubFolder(out, sourceFile, sourceFile.getParent().length()); + } else { + byte data[] = new byte[BUFFER]; + FileInputStream fi = new FileInputStream(sourcePath); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(getLastPathComponent(sourcePath)); + entry.setTime(sourceFile.lastModified()); // to keep modification time after unzipping + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + } + } + out.close(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; + } + + /* + * + * Zips a subfolder + * + */ + + private static void zipSubFolder(ZipOutputStream out, File folder, + int basePathLength) throws IOException { + + final int BUFFER = 2048; + + File[] fileList = folder.listFiles(); + BufferedInputStream origin = null; + for (File file : fileList) { + if (file.isDirectory()) { + zipSubFolder(out, file, basePathLength); + } else { + byte data[] = new byte[BUFFER]; + String unmodifiedFilePath = file.getPath(); + String relativePath = unmodifiedFilePath + .substring(basePathLength); + FileInputStream fi = new FileInputStream(unmodifiedFilePath); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(relativePath); + entry.setTime(file.lastModified()); // to keep modification time after unzipping + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + } + origin.close(); + } + } + } + + /* + * gets the last path component + * + * Example: getLastPathComponent("downloads/example/fileToZip"); + * Result: "fileToZip" + */ + public static String getLastPathComponent(String filePath) { + String[] segments = filePath.split("/"); + if (segments.length == 0) + return ""; + String lastPathComponent = segments[segments.length - 1]; + return lastPathComponent; + } } [View Less]

1 0

[orbot/master] don't create a new handler for restarting main activity
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit c9cb5bb33222a73a9545ab70b60109b245218d2b Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 09:06:17 2020 -0400 don't create a new handler for restarting main activity --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 3 +-- .../org/torproject/android/ui/onboarding/BridgeWizardActivity.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/… [View More]

1 0

[orbot/master] for #381 make sure apps array is not null
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit e183d443bedf598c71f74e2edeb3e99d32d88dc5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 09:12:52 2020 -0400 for #381 make sure apps array is not null --- .../torproject/android/ui/AppManagerActivity.java | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 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 5c071b23..07c36ac7 … [View More]100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -160,31 +160,31 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList convertView.setTag(entry); } - final TorifiedApp app = mApps.get(position); + if (mApps != null) { + final TorifiedApp app = mApps.get(position); - if (entry.icon != null) { + if (entry.icon != null) { - try { - entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName())); - entry.icon.setOnClickListener(AppManagerActivity.this); - entry.icon.setTag(entry.box); - } - catch (Exception e) - { - e.printStackTrace(); + try { + entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName())); + entry.icon.setOnClickListener(AppManagerActivity.this); + entry.icon.setTag(entry.box); + } catch (Exception e) { + e.printStackTrace(); + } } - } - if (entry.text != null) { - entry.text.setText(app.getName()); - entry.text.setOnClickListener(AppManagerActivity.this); - entry.text.setTag(entry.box); - } + if (entry.text != null) { + entry.text.setText(app.getName()); + entry.text.setOnClickListener(AppManagerActivity.this); + entry.text.setTag(entry.box); + } - if (entry.box != null) { - entry.box.setOnClickListener(AppManagerActivity.this); - entry.box.setChecked(app.isTorified()); - entry.box.setTag(app); + if (entry.box != null) { + entry.box.setOnClickListener(AppManagerActivity.this); + entry.box.setChecked(app.isTorified()); + entry.box.setTag(app); + } } return convertView; [View Less]

1 0

[orbot/master] a few more checks to handle null intents
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 2eaa192c72efa47f322a92bbd7a2032b069fbc81 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:02:23 2020 -0400 a few more checks to handle null intents --- .../torproject/android/service/OrbotService.java | 19 +++--- .../android/service/vpn/OrbotVpnManager.java | 67 +++++++++++----------- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/… [View More]java/org/torproject/android/service/OrbotService.java index 61404632..8d98d40e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -375,14 +375,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String action = mIntent.getAction(); - if (action != null) { + if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { startTor(); replyWithStatus(mIntent); if (Prefs.useVpn()) { - if (!mVpnManager.isStarted()) { + if (mVpnManager != null + && (!mVpnManager.isStarted())) { //start VPN here Intent vpnIntent = VpnService.prepare(OrbotService.this); if (vpnIntent == null) //then we can run the VPN @@ -398,7 +399,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } else if (action.equals(ACTION_START_VPN)) { - if (!mVpnManager.isStarted()) { + if (mVpnManager != null && (!mVpnManager.isStarted())) { //start VPN here Intent vpnIntent = VpnService.prepare(OrbotService.this); if (vpnIntent == null) //then we can run the VPN @@ -415,7 +416,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } else if (action.equals(ACTION_STOP_VPN)) { - mVpnManager.handleIntent(new Builder(),mIntent); + if (mVpnManager != null) + mVpnManager.handleIntent(new Builder(),mIntent); } else if (action.equals(ACTION_STATUS)) { replyWithStatus(mIntent); @@ -1978,7 +1980,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb @Override public IBinder onBind(Intent intent) { Log.e( TAG, "onBind" ); - handleIntent(intent); + //do nothing here return super.onBind(intent); // invoking super class will call onRevoke() when appropriate } @@ -1991,13 +1993,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent(ACTION_STOP_VPN)); } - private void handleIntent( Intent intent ) { - if( intent != null && intent.getAction() != null ) { - Log.e( TAG, intent.getAction()); - } - } - - private void setExitNode (String newExits) { SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); 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 5194e5c3..3dd315fd 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 @@ -27,6 +27,7 @@ import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.ParcelFileDescriptor; +import android.text.TextUtils; import android.util.Log; import android.widget.Toast; import com.runjva.sourceforge.jsocks.protocol.ProxyServer; @@ -95,52 +96,50 @@ public class OrbotVpnManager implements Handler.Callback { public int handleIntent(VpnService.Builder builder, Intent intent) { if (intent != null) { String action = intent.getAction(); - - if (action.equals(ACTION_START_VPN)||action.equals(ACTION_START)) { - Log.d(TAG,"starting VPN"); - isStarted = true; + if (!TextUtils.isEmpty(action)) { + if (action.equals(ACTION_START_VPN) || action.equals(ACTION_START)) { + Log.d(TAG, "starting VPN"); - // Stop the previous session by interrupting the thread. - if (mThreadVPN != null && mThreadVPN.isAlive()) - stopVPN(); + isStarted = true; - if (mTorSocks != -1) - { - if (!mIsLollipop) - { - startSocksBypass(); + // Stop the previous session by interrupting the thread. + if (mThreadVPN != null && mThreadVPN.isAlive()) + stopVPN(); + + if (mTorSocks != -1) { + if (!mIsLollipop) { + startSocksBypass(); + } + + setupTun2Socks(builder); } - setupTun2Socks(builder); - } + } else if (action.equals(ACTION_STOP_VPN)) { + isStarted = false; - } - else if (action.equals(ACTION_STOP_VPN)) { - isStarted = false; + Log.d(TAG, "stopping VPN"); - Log.d(TAG,"stopping VPN"); - - stopVPN(); - } - else if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { - Log.d(TAG,"setting VPN ports"); + stopVPN(); + } else if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { + Log.d(TAG, "setting VPN ports"); - int torSocks = intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT,-1); - int torDns = intent.getIntExtra(OrbotService.EXTRA_DNS_PORT,-1); + int torSocks = intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT, -1); + int torDns = intent.getIntExtra(OrbotService.EXTRA_DNS_PORT, -1); - //if running, we need to restart - if ((torSocks != mTorSocks || torDns != mTorDns)) { + //if running, we need to restart + if ((torSocks != mTorSocks || torDns != mTorDns)) { - mTorSocks = torSocks; - mTorDns = torDns; + mTorSocks = torSocks; + mTorDns = torDns; - if (!mIsLollipop) { - stopSocksBypass(); - startSocksBypass(); - } + if (!mIsLollipop) { + stopSocksBypass(); + startSocksBypass(); + } - setupTun2Socks(builder); + setupTun2Socks(builder); + } } } [View Less]

1 0

[orbot/master] Merge pull request #375 from bitmold/prelollipop_vpn_ui
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 9d1f98a0340f415aa7b599374fc0743904d40135 Merge: 04b622d5 c54427f3 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Aug 11 13:23:52 2020 -0400 Merge pull request #375 from bitmold/prelollipop_vpn_ui Removed "Tor-Enabled Apps" UI from devices < Lollipop .../org/torproject/android/OrbotMainActivity.java | 15 +- app/src/main/res/layout/layout_main.xml | 629 ++++++++++----------- 2 files changed, 319 insertions(+), 325 deletions(-)

1 0

[orbot/master] fixes for #285 reset dormant state on start / resume
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 3087f77b09c9319597dde229e57f45581c1aaac9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 19 14:22:14 2020 -0400 fixes for #285 reset dormant state on start / resume more info at: https://gitlab.torproject.org/tpo/core/tor/-/issues/40097w --- .../org/torproject/android/OrbotMainActivity.java | 2 ++ .../torproject/android/service/OrbotService.java | 26 ++++++++++++++++++++-- .../android/service/TorServiceConstants.java | 1 + 3 files changed, … [View More]27 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 af311c34..c7ca1a7f 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -898,6 +898,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan protected void onResume() { super.onResume(); + sendIntentToService(TorServiceConstants.CMD_ACTIVE); + mBtnBridges.setChecked(Prefs.bridgesEnabled()); refreshVpnState(); diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index a3aa2d98..61404632 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -424,7 +424,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); - } else if (action.equals(CMD_SET_EXIT)) { + } + else if (action.equals(CMD_ACTIVE)) { + sendSignalActive(); + } + else if (action.equals(CMD_SET_EXIT)) { setExitNode(mIntent.getStringExtra("exit")); @@ -600,6 +604,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb IntentFilter filter = new IntentFilter(); filter.addAction(CMD_NEWNYM); + filter.addAction(CMD_ACTIVE); mActionBroadcastReceiver = new ActionBroadcastReceiver(); registerReceiver(mActionBroadcastReceiver, filter); @@ -783,8 +788,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); extraLines.append("AutomapHostsOnResolve 1").append('\n'); - // extraLines.append("DormantClientTimeout 10 minutes").append('\n'); + extraLines.append("DormantClientTimeout 10 minutes").append('\n'); // extraLines.append("DormantOnFirstStartup 0").append('\n'); + extraLines.append("DormantCanceledByStartup 1").append('\n'); extraLines.append("DisableNetwork 0").append('\n'); @@ -1399,6 +1405,17 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } + public void sendSignalActive () + { + if (conn != null && mCurrentStatus == STATUS_ON) { + try { + conn.signal("ACTIVE"); + } catch (IOException e) { + debug("error send active: " + e.getLocalizedMessage()); + } + } + } + public void newIdentity () { //it is possible to not have a connection yet, and someone might try to newnym @@ -2139,6 +2156,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb newIdentity(); break; } + case CMD_ACTIVE: + { + sendSignalActive(); + break; + } } } } 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 9220095a..dfd5a5f0 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -105,6 +105,7 @@ public interface TorServiceConstants { String CMD_SIGNAL_HUP = "signal_hup"; String CMD_NEWNYM = "newnym"; String CMD_SET_EXIT = "setexit"; + String CMD_ACTIVE = "ACTIVE"; String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; [View Less]

1 0

[orbot/master] update default bridges and bridge tester
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 4cebceda5be8f90f25ad0665f220554150d69870 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:02:30 2020 -0400 update default bridges and bridge tester --- .../ui/onboarding/BridgeWizardActivity.java | 41 ++++++++++++++++++++-- orbotservice/src/main/res/raw/bridges.txt | 10 +++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/… [View More]org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 8585c29c..be8ab1bf 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -18,13 +18,18 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.torproject.android.R; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.LocaleHelper; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketAddress; +import java.util.ArrayList; +import java.util.StringTokenizer; public class BridgeWizardActivity extends AppCompatActivity { @@ -158,9 +163,39 @@ public class BridgeWizardActivity extends AppCompatActivity { if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) { hostTester.execute("check.torproject.org", "443"); } else if (Prefs.getBridgesList().equals("meek")) { - hostTester.execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); + hostTester.execute("meek.azureedge.net", "443"); } else if (Prefs.getBridgesList().equals("obfs4")) { - hostTester.execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); + + ArrayList alBridges = new ArrayList<String>(); + + try + { + BufferedReader in= + new BufferedReader(new InputStreamReader(getResources().openRawResource(org.torproject.android.service.R.raw.bridges), "UTF-8")); + String str; + + while ((str=in.readLine()) != null) { + + StringTokenizer st = new StringTokenizer (str," "); + String type = st.nextToken(); + + if (type.equals("obfs4")) { + String[] hostport = st.nextToken().split(":"); + hostTester.execute(hostport[0],hostport[1]); + break; + } + + } + + in.close(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + + } else { hostTester = null; mTvStatus.setText(""); @@ -187,7 +222,7 @@ public class BridgeWizardActivity extends AppCompatActivity { String testHost = host[i]; i++; //move to the port int testPort = Integer.parseInt(host[i]); - if (isHostReachable(testHost, testPort, 10000)) { + if (isHostReachable(testHost, testPort, 5000)) { return true; } } diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index 101db60a..c631831b 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -1,5 +1,7 @@ -obfs4 89.163.181.169:443 6A17D1E29E2807A1A4314215553079001031A7FF cert=e8JIYivx1zbYNOqq3a3+nDf/NDHoDQ/th/RVAnlVQePUIHxllG7aOku7pSwZisZ7i6ybVw iat-mode=0 -obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMlVXCKsCnF7gCdApx7sRZLD5zPl8qdccwp0zltYG6kMYqBNm60dP8IxRH/l8OcQ iat-mode=0 -obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0 -obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0 +obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 +obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1 +obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1 +obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1 +obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 +obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com [View Less]

1 0

[orbot/master] for #382 don't set textview value if it is nulled
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 6893c07b0e69e6eb0ee0d76937fb3974b689ba59 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 09:16:04 2020 -0400 for #382 don't set textview value if it is nulled --- .../ui/onboarding/BridgeWizardActivity.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/… [View More]

1 0