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

[orbot/master] remove unused bridge list loop
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 42b651330308b9bf402f8ad4589a9b6b8a615f95 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 20:56:37 2020 -0500 remove unused bridge list loop --- .../main/java/org/torproject/android/service/OrbotService.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 1b930f46..320194b8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1407,15 +1407,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("Bridge "); extraLines.append(bridgeLine); extraLines.append("\n"); - /** - for (String bridgeConfigLine : bridgeListLines) { - if (!TextUtils.isEmpty(bridgeConfigLine)) { - extraLines.append("Bridge "); - extraLines.append(bridgeConfigLine.trim()); - extraLines.append("\n"); - } - - }**/ + } else { String type = "obfs4";

1 0

[orbot/master] added maxSdkVersion18 for WRITE_EXTERNAL_STORAGE prem
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4a39df4e1c3b1a3446d14b0a7dee145d8397e0b4 Author: bim <dsnake(a)protonmail.com> Date: Thu Nov 12 15:47:52 2020 -0500 added maxSdkVersion18 for WRITE_EXTERNAL_STORAGE prem --- app/src/main/AndroidManifest.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14482981..a6afb24c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission - android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + android:name="android.permission.WRITE_EXTERNAL_STORAGE" + android:maxSdkVersion="18" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <application @@ -151,7 +152,7 @@ <action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" /> <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.REBOOT"/> + <action android:name="android.intent.action.REBOOT" /> </intent-filter> </receiver>

1 0

[orbot/master] Made IPtProxy a module, only ship app with one AAR file
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit a5a146c8f4db2baf87dd663c9340f9a0edd32ea5 Author: bim <dsnake(a)protonmail.com> Date: Thu Nov 12 15:43:13 2020 -0500 Made IPtProxy a module, only ship app with one AAR file --- {app/libs => IPtProxy}/IPtProxy.aar | Bin IPtProxy/build.gradle | 2 ++ app/build.gradle | 18 ------------------ orbotservice/build.gradle | 11 +---------- orbotservice/libs/IPtProxy.aar | Bin 29425327 -> 0 bytes settings.gradle | 1 + 6 files changed, 4 insertions(+), 28 deletions(-) diff --git a/app/libs/IPtProxy.aar b/IPtProxy/IPtProxy.aar similarity index 100% rename from app/libs/IPtProxy.aar rename to IPtProxy/IPtProxy.aar diff --git a/IPtProxy/build.gradle b/IPtProxy/build.gradle new file mode 100644 index 00000000..afc0293e --- /dev/null +++ b/IPtProxy/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('IPtProxy.aar')) \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8c8810ff..f3e4883a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,16 +81,6 @@ android { versionName getVersionName() archivesBaseName = "Orbot-$versionName" } - /** - appmax { - dimension "free" - minSdkVersion 16 - applicationId 'org.torproject.android.max' - targetSdkVersion 28 - versionCode 161410000 - versionName getVersionName() - archivesBaseName = "orbotMAX-$versionName" - }**/ } splits { @@ -113,14 +103,6 @@ android { // Specifies that we do not want to also generate a universal APK that includes all ABIs. universalApk true } - - - } - - repositories { - flatDir { - dir 'libs' - } } } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index a081735e..447ee60d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -37,14 +37,6 @@ android { packagingOptions { exclude 'assets/arm/obfs4proxy' //this is redundant } - - repositories { - flatDir { - dir 'libs' - } - } - - } dependencies { @@ -69,6 +61,5 @@ dependencies { implementation 'info.guardianproject:jtorctl:0.4' /*********** IPtProxy: https://github.com/tladesignz/IPtProxy **********/ - implementation(name: 'IPtProxy', ext: 'aar') - + implementation project(path: ':IPtProxy') } diff --git a/orbotservice/libs/IPtProxy.aar b/orbotservice/libs/IPtProxy.aar deleted file mode 100644 index ed76d5fb..00000000 Binary files a/orbotservice/libs/IPtProxy.aar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 46cf1758..d9af051e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':IPtProxy' include ':intentintegrator' include ':appcore' include ':orbotservice',':app',':app-mini'

1 0

[orbot/master] Merge pull request #412 from bitmold/IPtProxy_aar_module
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 05e9dd8f662f0bbb540e5faa5158664898ff6f63 Merge: 4a39df4e a5a146c8 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Nov 16 11:45:10 2020 -0500 Merge pull request #412 from bitmold/IPtProxy_aar_module Include Only One IPtProxy AAR {app/libs => IPtProxy}/IPtProxy.aar | Bin IPtProxy/build.gradle | 2 ++ app/build.gradle | 18 ------------------ orbotservice/build.gradle | 11 +---------- orbotservice/libs/IPtProxy.aar | Bin 29425327 -> 0 bytes settings.gradle | 1 + 6 files changed, 4 insertions(+), 28 deletions(-)

1 0

[orbot/master] use IPtProxy instead of the AndroidPT dependency
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4e7ecdef0c85c56d62eb0adf70bfd5deccce0f49 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:48:13 2020 -0500 use IPtProxy instead of the AndroidPT dependency --- .../torproject/android/service/OrbotService.java | 120 ++++++++++----------- 1 file changed, 56 insertions(+), 64 deletions(-) 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 b9175543..27b58c20 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -79,8 +79,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -import info.pluggabletransports.dispatch.util.TransportListener; -import info.pluggabletransports.dispatch.util.TransportManager; +import IPtProxy.IPtProxy; public class OrbotService extends VpnService implements TorServiceConstants, OrbotConstants { @@ -100,7 +99,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb public static File appBinHome; public static File appCacheHome; public static File fileTor; - public static File fileObfsclient; public static File fileTorRc; boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; TorEventHandler mEventHandler; @@ -316,6 +314,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); + String bridgeList = Prefs.getBridgesList(); + boolean useIPtProxy = bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + if (useIPtProxy) + IPtProxy.stopObfs4Proxy(); + killAllDaemons(); //stop the foreground priority and make sure to remove the persistant notification @@ -474,22 +477,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private boolean pluggableTransportInstall() { - fileObfsclient = new TransportManager() { - @Override - public void startTransportSync(TransportListener transportListener) { - - } - }.installTransport(this, OBFSCLIENT_ASSET_KEY); - - if (fileObfsclient != null && fileObfsclient.exists()) { - - fileObfsclient.setReadable(true); - fileObfsclient.setExecutable(true); - fileObfsclient.setWritable(false); - fileObfsclient.setWritable(true, true); - - return fileObfsclient.canExecute(); - } + File fileCacheDir = new File(getCacheDir(),"pt"); + if (!fileCacheDir.exists()) + fileCacheDir.mkdir(); + IPtProxy.setStateLocation(fileCacheDir.getAbsolutePath()); + String fileTestState = IPtProxy.getStateLocation(); + debug ("IPtProxy state: " + fileTestState); return false; } @@ -1381,62 +1374,55 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } } else { - if (fileObfsclient != null - && fileObfsclient.exists() - && fileObfsclient.canExecute()) { - loadBridgeDefaults(); + loadBridgeDefaults(); - extraLines.append("UseBridges 1").append('\n'); - // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); + extraLines.append("UseBridges 1").append('\n'); + // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); - String bridgeList = Prefs.getBridgesList(); - boolean obfs3Bridges = bridgeList.contains("obfs3"); - boolean obfs4Bridges = bridgeList.contains("obfs4"); - boolean meekBridges = bridgeList.contains("meek"); + String bridgeList = Prefs.getBridgesList(); + boolean obfs3Bridges = bridgeList.contains("obfs3"); + boolean obfs4Bridges = bridgeList.contains("obfs4"); + boolean meekBridges = bridgeList.contains("meek"); - //check if any PT bridges are needed - if (obfs3Bridges) - extraLines.append("ClientTransportPlugin obfs3 exec ") - .append(fileObfsclient.getAbsolutePath()).append('\n'); + //check if any PT bridges are needed + if (obfs3Bridges) + extraLines.append("ClientTransportPlugin obfs3 socks5 127.0.0.1:" + IPtProxy.Obfs3SocksPort).append('\n'); - if (obfs4Bridges) - extraLines.append("ClientTransportPlugin obfs4 exec ") - .append(fileObfsclient.getAbsolutePath()).append('\n'); + if (obfs4Bridges) + extraLines.append("ClientTransportPlugin obfs4 socks5 127.0.0.1:" + IPtProxy.Obfs4SocksPort).append('\n'); - if (meekBridges) - extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n'); - - if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here - { - String[] bridgeListLines = parseBridgesFromSettings(bridgeList); - int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); - String bridgeLine = bridgeListLines[bridgeIdx]; - extraLines.append("Bridge "); - extraLines.append(bridgeLine); - extraLines.append("\n"); - /** - for (String bridgeConfigLine : bridgeListLines) { - if (!TextUtils.isEmpty(bridgeConfigLine)) { - extraLines.append("Bridge "); - extraLines.append(bridgeConfigLine.trim()); - extraLines.append("\n"); - } - - }**/ - } else { + if (meekBridges) + extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); + + if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here + { + String[] bridgeListLines = parseBridgesFromSettings(bridgeList); + int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); + String bridgeLine = bridgeListLines[bridgeIdx]; + extraLines.append("Bridge "); + extraLines.append(bridgeLine); + extraLines.append("\n"); + /** + for (String bridgeConfigLine : bridgeListLines) { + if (!TextUtils.isEmpty(bridgeConfigLine)) { + extraLines.append("Bridge "); + extraLines.append(bridgeConfigLine.trim()); + extraLines.append("\n"); + } + + }**/ + } else { - String type = "obfs4"; + String type = "obfs4"; - if (meekBridges) - type = "meek_lite"; + if (meekBridges) + type = "meek_lite"; - getBridges(type, extraLines); + getBridges(type, extraLines); - } - } else { - throw new IOException("Bridge binary does not exist: " + fileObfsclient.getCanonicalPath()); } + } @@ -1762,6 +1748,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { + + String bridgeList = Prefs.getBridgesList(); + boolean useIPtProxy = bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + if (useIPtProxy) + IPtProxy.startObfs4Proxy("DEBUG", false, false); + startTor(); replyWithStatus(mIntent);

1 0

[orbot/master] deleted superflous comments
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 9a7ef0d80ebf337f5a0f22f5ccaee147c36fb773 Author: bim <dsnake(a)protonmail.com> Date: Thu Nov 12 14:36:49 2020 -0500 deleted superflous comments --- .../main/java/org/torproject/android/service/OrbotService.java | 8 -------- 1 file changed, 8 deletions(-) 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 320194b8..97c985ac 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -186,15 +186,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return false; } - /* (non-Javadoc) - * @see android.app.Service#onLowMemory() - */ @Override public void onLowMemory() { super.onLowMemory(); - logNotice("Low Memory Warning!"); - } private void clearNotifications() { @@ -267,9 +262,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb mNotificationShowing = true; } - /* (non-Javadoc) - * @see android.app.Service#onStart(android.content.Intent, int) - */ public int onStartCommand(Intent intent, int flags, int startId) { showToolbarNotification("", NOTIFY_ID, R.drawable.ic_stat_tor);

1 0

[orbot/master] removed unused constants/warnings
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 5ef1da708fd46277ec131e2214634cf680bf2c62 Author: bim <dsnake(a)protonmail.com> Date: Thu Nov 12 14:02:33 2020 -0500 removed unused constants/warnings --- app/src/main/java/org/torproject/android/MainConstants.java | 2 -- .../main/java/org/torproject/android/OrbotMainActivity.java | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/torproject/android/MainConstants.java b/app/src/main/java/org/torproject/android/MainConstants.java index d3188308..e08f4e4b 100644 --- a/app/src/main/java/org/torproject/android/MainConstants.java +++ b/app/src/main/java/org/torproject/android/MainConstants.java @@ -12,6 +12,4 @@ public interface MainConstants { String EMAIL_TOR_BRIDGES = "bridges(a)torproject.org"; - int RESULT_CLOSE_ALL = 0; - } diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 7102ea94..302154de 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -89,7 +89,6 @@ import pl.bclogic.pulsator4droid.library.PulsatorLayout; import static androidx.core.content.FileProvider.getUriForFile; import static org.torproject.android.MainConstants.COUNTRY_CODES; -import static org.torproject.android.MainConstants.RESULT_CLOSE_ALL; 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; @@ -108,7 +107,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private final static int REQUEST_VPN = 8888; private final static int REQUEST_SETTINGS = 0x9874; private final static int REQUEST_VPN_APPS_SELECT = 8889; - private final static int LOG_DRAWER_GRAVITY = GravityCompat.END; // message types for mStatusUpdateHandler private final static int STATUS_UPDATE = 1; private static final int MESSAGE_TRAFFIC_COUNT = 2; @@ -143,7 +141,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan * so local ones are used here so other apps cannot interfere with Orbot's * operation. */ - private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() { + private final BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -296,7 +294,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan mTxtOrbotLog = findViewById(R.id.orbotLog); lblStatus = findViewById(R.id.lblStatus); - lblStatus.setOnClickListener(v -> mDrawer.openDrawer(LOG_DRAWER_GRAVITY)); + lblStatus.setOnClickListener(v -> mDrawer.openDrawer(GravityCompat.END)); lblPorts = findViewById(R.id.lblPorts); @@ -481,9 +479,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan **/ private void doExit() { stopTor(); - - // Kill all the wizard activities - setResult(RESULT_CLOSE_ALL); finish(); } @@ -501,7 +496,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan @Override public void onBackPressed() { // check to see if the log is open, if so close it - if (mDrawer.isDrawerOpen(LOG_DRAWER_GRAVITY)) { + if (mDrawer.isDrawerOpen(GravityCompat.END)) { mDrawer.closeDrawers(); } else { super.onBackPressed();

1 0

[orbot/master] Merge pull request #411 from guardianproject/dev_iptproxy
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 317923b7d20e3a55a25930db20f20bc24e108826 Merge: 075c6ddf 42b65133 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Nov 11 21:41:53 2020 -0500 Merge pull request #411 from guardianproject/dev_iptproxy Switch to using IPtProxy for obfs4 and meek app/build.gradle | 5 + app/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes orbotservice/build.gradle | 15 ++- orbotservice/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes .../torproject/android/service/OrbotService.java | 114 +++++++++------------ 5 files changed, 69 insertions(+), 65 deletions(-)

1 0

[orbot/master] update version code to 1633100100
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 3afa761240b91f69fc8b23ab76f371f9381bc769 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 21:50:49 2020 -0500 update version code to 1633100100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8c8810ff..405f1b2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1632300100 + versionCode 1633100100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 9a21cd653a97d76ab8d8871679e3504fd55bd58e Merge: e81e50cd 05e9dd8f Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 11:45:18 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot {app/libs => IPtProxy}/IPtProxy.aar | Bin IPtProxy/build.gradle | 2 ++ app/build.gradle | 18 ------------------ orbotservice/build.gradle | 11 +---------- orbotservice/libs/IPtProxy.aar | Bin 29425327 -> 0 bytes settings.gradle | 1 + 6 files changed, 4 insertions(+), 28 deletions(-)

1 0