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

[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

[orbot/master] improve logic for start/stop/reconnect of tor to handle orphaned processes
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit d6ebcd7ef7771fa0ef42e3b7271e131eec246c69 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:11:39 2020 -0500 improve logic for start/stop/reconnect of tor to handle orphaned processes - if someone rapidly stops/starts tor, there can be a case where a tor process is launched and not shutdown. This can currently cause the UI to hang and be unable to start tor or connecting to an exsiting control port. --- .../torproject/android/service/OrbotService.java | 73 ++++++++++++++-------- 1 file changed, 48 insertions(+), 25 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 97c985ac..04f4f053 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -116,7 +116,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private NotificationManager mNotificationManager = null; private NotificationCompat.Builder mNotifyBuilder; private boolean mNotificationShowing = false; - private final ExecutorService mExecutor = Executors.newFixedThreadPool(3); + private final ExecutorService mExecutor = Executors.newCachedThreadPool(); private File mHSBasePath; private ArrayList<Bridge> alBridges = null; private final String[] hsProjection = new String[]{ @@ -173,7 +173,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private boolean findExistingTorDaemon() { try { - mLastProcessId = initControlConnection(3, true); + mLastProcessId = initControlConnection(1, true); if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage(getString(R.string.found_existing_tor_process)); @@ -182,6 +182,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return true; } } catch (Exception e) { + debug("Error finding existing tor daemon: " + e); } return false; } @@ -309,7 +310,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (useIPtProxy()) IPtProxy.stopObfs4Proxy(); - killAllDaemons(); + stopTorDaemon(true); //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); @@ -331,20 +332,34 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); } - private void killAllDaemons() throws Exception { + /** + * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor + * @throws Exception + */ + private void stopTorDaemon(boolean waitForConnection) throws Exception { - if (conn != null) { - logNotice("Using control port to shutdown Tor"); + int tryCount = 0; - try { - logNotice("sending HALT signal to Tor process"); - conn.shutdownTor("SHUTDOWN"); + while (tryCount++ < 3) { + if (conn != null) { + logNotice("Using control port to shutdown Tor"); - } catch (IOException e) { - Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e); + try { + logNotice("sending HALT signal to Tor process"); + conn.shutdownTor("SHUTDOWN"); + + } catch (IOException e) { + Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e); + } + + conn = null; + break; } - conn = null; + if (!waitForConnection) + break; + + try { Thread.sleep(3000);}catch (Exception e){} } } @@ -515,8 +530,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 0").append('\n'); + extraLines.append("AvoidDiskWrites 0").append('\n'); String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); @@ -683,12 +698,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb */ private void startTor() { - String torProcId = null; - - try { - if (conn != null) torProcId = conn.getInfo("process/pid"); - } catch (Exception e) { - } try { @@ -697,7 +706,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON && (torProcId != null)) { + } else if (mCurrentStatus == STATUS_ON && (mLastProcessId != -1)) { showConnectedToTorNetworkNotification(); sendCallbackLogMessage("Ignoring start request, already started."); // setTorNetworkEnabled (true); @@ -705,15 +714,29 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return; } + sendCallbackStatus(STATUS_STARTING); + + try { + if (conn != null) { + String torProcId = conn.getInfo("process/pid"); + if (!TextUtils.isEmpty(torProcId)) + mLastProcessId = Integer.parseInt(torProcId); + } + else { + if (fileControlPort!=null && fileControlPort.exists()) + findExistingTorDaemon(); + + } + } catch (Exception e) { + } // make sure there are no stray daemons running - killAllDaemons(); + stopTorDaemon(false); SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED, null); logNotice("checking binary version: " + version); - sendCallbackStatus(STATUS_STARTING); showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); //sendCallbackLogMessage(getString(R.string.status_starting_up)); //logNotice(getString(R.string.status_starting_up)); @@ -878,7 +901,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb int controlPort = -1; int attempt = 0; - logNotice("Waiting for control port..."); + logNotice(getString(R.string.waiting_for_control_port)); while (conn == null && attempt++ < maxTries && (mCurrentStatus != STATUS_OFF)) { try { @@ -886,7 +909,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb controlPort = getControlPort(); if (controlPort != -1) { - logNotice("Connecting to control port: " + controlPort); + logNotice(getString(R.string.connecting_to_control_port) + controlPort); break;

1 0

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

23 Dec '20

commit e81e50cd38d6d79fe9fdd6fb5372a7c12b20a40d Merge: 3afa7612 4a39df4e Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 11:42:54 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/AndroidManifest.xml | 5 +++-- app/src/main/java/org/torproject/android/MainConstants.java | 2 -- .../main/java/org/torproject/android/OrbotMainActivity.java | 11 +++-------- .../java/org/torproject/android/service/OrbotService.java | 8 -------- 4 files changed, 6 insertions(+), 20 deletions(-)

1 0

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

23 Dec '20

commit a2158981b5cf611096f8c3c5b1a2349dd4d82a82 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:18:55 2020 -0500 update version to 1633100200 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 94025d34..8eaa7b63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1633100100 + versionCode 1633100200 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] externalize log strings
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 68aa65b4bccbeefdab0b013d1e063dd200910296 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:11:29 2020 -0500 externalize log strings --- orbotservice/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index b77869d1..c1d5e1dc 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -20,4 +20,6 @@ <string name="updating_settings_in_tor_service">updating settings in Tor service</string> <string name="menu_new_identity">New Identity</string> + <string name="waiting_for_control_port">Waiting for control port...</string> + <string name="connecting_to_control_port">\"Connecting to control port: \"</string> </resources>

1 0

[orbot/master] remove quotes from string
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit e88c84aac1a2b9dc37f6d5ccf14c048a9ce81c52 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:00:48 2020 -0500 remove quotes from string --- orbotservice/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index c1d5e1dc..4d1a65b9 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -21,5 +21,5 @@ <string name="menu_new_identity">New Identity</string> <string name="waiting_for_control_port">Waiting for control port...</string> - <string name="connecting_to_control_port">\"Connecting to control port: \"</string> + <string name="connecting_to_control_port">Connecting to control port:</string> </resources>

1 0

[orbot/master] update changelog for 16.3.3-RC-1-tor-0.4.3.6
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit da34729553b399cae681235563c16dd3765d2009 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:03:37 2020 -0500 update changelog for 16.3.3-RC-1-tor-0.4.3.6 --- CHANGELOG | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7187f2cc..0e0e7fad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,26 @@ +/** 16.3.3-RC-1-tor-0.4.3.6 / 20 November 2020 **/ +daa2e7b4 (HEAD -> master) update version code to 1633300100 +e88c84aa (origin/master, origin/HEAD) remove quotes from string +a2158981 (tag: 16.3.3-BETA-2-tor-0.4.3.6) update version to 1633100200 +d6ebcd7e improve logic for start/stop/reconnect of tor to handle orphaned processes - if someone rapidly stops/starts tor, there can be a case where a tor process is launched and not shutdown. This can currently cause the UI to hang and be unable to start tor or connecting to an exsiting control port. +68aa65b4 externalize log strings +9a21cd65 Merge branch 'master' of github.com:guardianproject/orbot +05e9dd8f Merge pull request #412 from bitmold/IPtProxy_aar_module +e81e50cd Merge branch 'master' of github.com:guardianproject/orbot +a5a146c8 Made IPtProxy a module, only ship app with one AAR file +4a39df4e added maxSdkVersion18 for WRITE_EXTERNAL_STORAGE prem +9a7ef0d8 deleted superflous comments +5ef1da70 removed unused constants/warnings +3afa7612 (tag: 16.3.3-BETA-1-tor-0.4.3.6) update version code to 1633100100 +317923b7 Merge pull request #411 from guardianproject/dev_iptproxy +42b65133 (origin/dev_iptproxy, dev_iptproxy) remove unused bridge list loop +8d7a79a5 add use IPtProxy function +4e7ecdef use IPtProxy instead of the AndroidPT dependency +be40bf56 modifying dependencies to support use of AAR for IPtProxy (temporarily) +b3006347 the main app needs access to the aar for building as well +0e33a652 add IPtProxy as aar for now +075c6ddf update gradle and tools +50ee0d6f small changes to ensure handling of auto start on boot /** 16.3.2-RC-1-tor-0.4.3.6 / 2 November 2020 / c69a217aa8e1f09a34634da50e7af55c4fc73a21 **/

1 0

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

23 Dec '20

commit daa2e7b4133c127c605b9d1fa884166743f33c7f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:02:25 2020 -0500 update version code to 1633300100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8eaa7b63..fdc9566e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1633100200 + versionCode 1633300100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Removed very outdated text/graphics from "docs" folder.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit f9d5fcf522475b1ca33b27ffb30e0a9b83ff90d9 Author: bim <dsnake(a)protonmail.com> Date: Sun Nov 29 16:00:40 2020 -0500 Removed very outdated text/graphics from "docs" folder. Moved svg icon from root of repo into docs folder --- docs/GSoC.txt | 45 ----------------- docs/WALKTHROUGH | 85 -------------------------------- ic_launcher.svg => docs/ic_launcher.svg | 0 docs/onionroots.xcf | Bin 1748142 -> 0 bytes docs/orbotnewicons.xcf | Bin 1118257 -> 0 bytes 5 files changed, 130 deletions(-) diff --git a/docs/GSoC.txt b/docs/GSoC.txt deleted file mode 100644 index d1d851e1..00000000 --- a/docs/GSoC.txt +++ /dev/null @@ -1,45 +0,0 @@ -GSoC Plan -========= - -A tl;dr version ---------------- -I will be improving the Orbot UI/UX, and adding several features such as data statistics and also -implementing the TorCheck API. I plan on extending the ORLib library and also creating an ORLib enabled -app as a sort of primer for other third party apps to follow - -The full version ----------------- - -Orbot UI/UX -=========== -At the moment, the Orbot UI/UX is clustered and not very intuitive. I plan on improving the existing -elements of the UI and also add a variety of new features such as - -* A new Set – up Wizard ( which checks for iptables ) -* Changes to the preferences ( should be made to follow the Android guidelines) - -Orbot Core app work -=================== -At the moment, Orbot displays a successful connection without actually checking the connection. This is a -pressing issue, because the user is not notified if the set-up has failed, unless he/she manually checks -the torcheck web service. This should be made automatic by making using of the TorCheck API. Also, Orbot -should be configured to show more information about the data being transmitted such as - - -* Amount of data transferred -* Quality of the connection -* Number of circuits connected - -ORLib -===== -Currently, ORLib is very minimal at the moment, both in term of features and support/documentation. ORLib -is very critical to the use of Orbot as it provides transparent proxying on non-rooted devices ( A major -chunk of android phones are un-rooted). I intend to - - -* Improve the existing library by adding additional features - * Check for existing of Orbot - * Check status of connection to Tor - * Provide option to start Orbot via intent -* Request hidden service by port, and get return hidden service .onion address -* Create an ORLib enabled “Twitter, Status.net or other micro blogging Client” – A sort of primer for - third-party apps -* Improve the documentation diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH deleted file mode 100644 index 55a356b5..00000000 --- a/docs/WALKTHROUGH +++ /dev/null @@ -1,85 +0,0 @@ - -. -└── org - └── torproject - └── android - ├── AppManager.java - //this is what helps us track the app-by-app torification - //and gets the app name, icon, etc for display - we have some problems here - //in normalizing the icon on the list label - //some of this code came originally from DroidWall project (yay open source) - - ├── boot - │ └── OnbootBroadcastReceiver.java - //i think this is a dup now and should be removed - - ├── HiddenServiceManager.java - //empty! but at some point i thought it would be good to aggregate HS functions here - - ├── OnBootReceiver.java - //this is the class registered in AndroidManifest.xml to handle Onboot events - //to start Orbot/Tor when the device boots if the user has elected to do so - what kind of permissions does this require? - // <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - - ├── OrbotMainActivity.java - //our wonderful main activity! - - ├── ProcessSettingsAsyncTask.java - //this was just added in 1.0.5.x, but it was meant to help stop the UI blocking while processing settings and prefs - //it uses the AsyncTask feature of Android, which seems to work pretty well - //for this type of non-time critical function you just want to happen in the background at some point soon-ish - - ├── SettingsPreferences.java - // Settings activity that loads the res/xml/preferences.xml resource up - // has some custom event handlng, onActivityResult callback result code's as well - // basically meant to tell Orbot activity if critical settings have been modified and whether - // those new settings should be applied (like iptables/transproxy changes) - - ├── TorConstants.java - // globals! well, constants! but yeah, just a place to put values we use a lot - - ├── TorifiedApp.java - // object to store a single app's metadata for display in UI and for transproxy process - - ├── Utils.java - // random methods that can be useful, a.k.a. another place to put stuff - - ├── WizardActivity.java - // our original attempt at wizard activity that didn't get far - - └── WizardHelper.java - // the helper class that manages the dialog based wizard - - ├── service //okay the Service subpackage! - - │ ├── Api.java - //this is more code taken from DroidWall, that needs to be cleaned up and paired down to just what we need it for - //this is related to 1.0.5.x changes with how we bundle and install our C binaries (tor, privoxy and iptables) - - │ ├── ITorService.aidl - // the android remote interface definition file; - // this is the remote interface which the Orbot activity gets a reference to - // and that in the TorService is instantiated as the "binder" - - │ ├── ITorServiceCallback.aidl - // this is the callback interface that the Orbot activity instantiates, and passes - // to the ITorService; reverse of ITorService in a sense - - │ ├── TorBinaryInstaller.java - // this handles installation of binaries; uses Api.java; // tied into Wizard as well - - │ ├── TorServiceConstants.java - // reusable constants for just the Service package - - │ ├── TorService.java - // the main might powerful service class; Orbot and TorService are the front and backends of this whole app - // should run as a remote service, but the manifest doesn't seem to indicate that at the moment - - │ ├── TorServiceUtils.java - //utility methods for the service; specificaly check for root and tools for finding processID of background binaries - - │ └── TorTransProxy.java - // all the code for iptables transproxying management - - - diff --git a/ic_launcher.svg b/docs/ic_launcher.svg similarity index 100% rename from ic_launcher.svg rename to docs/ic_launcher.svg diff --git a/docs/onionroots.xcf b/docs/onionroots.xcf deleted file mode 100644 index eac39c78..00000000 Binary files a/docs/onionroots.xcf and /dev/null differ diff --git a/docs/orbotnewicons.xcf b/docs/orbotnewicons.xcf deleted file mode 100644 index a6955dc1..00000000 Binary files a/docs/orbotnewicons.xcf and /dev/null differ

1 0

[orbot/master] Merge remote-tracking branch 'upstream/master'
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4a5aad9239cd3aacdc52f4df3bac2a736f797073 Merge: edc6cee9 e88c84aa Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Nov 25 12:55:18 2020 +0100 Merge remote-tracking branch 'upstream/master' CHANGELOG | 61 ++++ IPtProxy/IPtProxy.aar | Bin 0 -> 29425327 bytes IPtProxy/build.gradle | 2 + app-mini/build.gradle | 2 +- app-mini/src/debug/AndroidManifest.xml | 132 --------- app/build.gradle | 15 +- app/src/main/AndroidManifest.xml | 15 +- .../java/org/torproject/android/MainConstants.java | 2 - .../org/torproject/android/OrbotMainActivity.java | 43 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- orbotservice/build.gradle | 12 +- orbotservice/src/main/AndroidManifest.xml | 2 + .../torproject/android/service/OrbotService.java | 308 +++++++++------------ .../android/service/TorEventHandler.java | 2 +- orbotservice/src/main/res/values/strings.xml | 2 + settings.gradle | 1 + 17 files changed, 248 insertions(+), 357 deletions(-)

1 0