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

[orbot/master] Merge pull request #277 from eighthave/bugfix-cleanup-and-funding
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 135a94dc5ef1679df5b6176ee104e186ca9c056b Merge: dbf13dcc 2a5eec5d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Oct 29 09:41:51 2019 -0400 Merge pull request #277 from eighthave/bugfix-cleanup-and-funding Bugfix, cleanup, and funding FUNDING.yml | 4 +++ .../torproject/android/mini/MiniMainActivity.java | 16 ++++----- .../android/mini/ui/AppConfigActivity.java | 4 +-- .../android/mini/ui/AppManagerActivity.java | 4 +-- .../android/mini/vpn/VPNEnableActivity.java | 6 ++-- .../org/torproject/android/OrbotMainActivity.java | 15 +++----- .../torproject/android/ui/AppManagerActivity.java | 4 +-- .../torproject/android/ui/VPNEnableActivity.java | 5 +-- .../android/service/StartTorReceiver.java | 11 +++--- .../org/torproject/android/service/TorService.java | 40 ++++------------------ .../android/service/TorServiceConstants.java | 5 --- .../org/torproject/android/service/util/Prefs.java | 7 +++- .../android/service/util/TorServiceUtils.java | 4 --- .../android/service/vpn/TorVpnService.java | 27 +++++++++++++-- 14 files changed, 71 insertions(+), 81 deletions(-)

1 0

[orbot/master] strip trailing whitespace from TorService
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 1d084d7871db599ed9622cc75e9e1a29edb0acd1 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Oct 25 13:37:10 2019 +0200 strip trailing whitespace from TorService I use Android Studio with the defaults, and it seems to be stripping the trailing whitespace off, which makes it annoying to see what has changed. So this just commits the removal of trailing whitespace. If you want to do it for the whole project, you can use this: find * -name \*.java -print0 |xargs -0 sed -i 's,\s*$,,' --- .../torproject/android/control/EventHandler.java | 2 +- .../android/control/TorControlConnection.java | 58 ++-- .../torproject/android/service/OrbotConstants.java | 4 +- .../org/torproject/android/service/TorService.java | 322 ++++++++++----------- 4 files changed, 192 insertions(+), 194 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/control/EventHandler.java b/orbotservice/src/main/java/org/torproject/android/control/EventHandler.java index 5a4e2b5b..de06bf0f 100644 --- a/orbotservice/src/main/java/org/torproject/android/control/EventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/control/EventHandler.java @@ -19,7 +19,7 @@ public interface EventHandler { * <li>"FAILED" : circuit closed (was not built)</li> * <li>"CLOSED" : circuit closed (was built)</li> * </ul> - * + * * circID is the alphanumeric identifier of the affected circuit, * and path is a comma-separated list of alphanumeric ServerIDs. */ diff --git a/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java b/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java index 52f9be49..bed62128 100644 --- a/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java +++ b/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java @@ -34,11 +34,11 @@ public class TorControlConnection implements TorControlCommands { private volatile EventHandler handler; private volatile PrintWriter debugOutput; private volatile IOException parseThreadException; - + static class Waiter { - + List<ReplyLine> response; // Locking: this - + synchronized List<ReplyLine> getResponse() throws InterruptedException { while (response == null) { wait(); @@ -62,7 +62,7 @@ public class TorControlConnection implements TorControlCommands { this.status = status; this.msg = msg; this.rest = rest; } } - + /** Create a new TorControlConnection to communicate with Tor over * a given socket. After calling this constructor, it is typical to * call launchThread and authenticate. */ @@ -134,7 +134,7 @@ public class TorControlConnection implements TorControlCommands { if (reply.isEmpty()) { // nothing received so far, can exit cleanly return reply; - } + } // received half of a reply before the connection broke down throw new TorControlSyntaxError("Connection to Tor " + " broke down while receiving reply!"); @@ -242,17 +242,17 @@ public class TorControlConnection implements TorControlCommands { } - /** Sets w as the PrintWriter for debugging output, - * which writes out all messages passed between Tor and the controller. + /** Sets w as the PrintWriter for debugging output, + * which writes out all messages passed between Tor and the controller. * Outgoing messages are preceded by "\>\>" and incoming messages are preceded * by "\<\<" */ public void setDebugging(PrintWriter w) { debugOutput = w; } - - /** Sets s as the PrintStream for debugging output, - * which writes out all messages passed between Tor and the controller. + + /** Sets s as the PrintStream for debugging output, + * which writes out all messages passed between Tor and the controller. * Outgoing messages are preceded by "\>\>" and incoming messages are preceded * by "\<\<" */ @@ -316,7 +316,7 @@ public class TorControlConnection implements TorControlCommands { w = waiters.removeFirst(); w.setResponse(lst); } - } + } } } @@ -356,7 +356,7 @@ public class TorControlConnection implements TorControlCommands { * the others. For example, if two ORBindAddress values are configured, and a * command arrives containing a single ORBindAddress value, the new * command's value replaces the two old values. - * + * * To remove all settings for a given option entirely (and go back to its * default value), include a String in kvList containing the key and no value. */ @@ -375,7 +375,7 @@ public class TorControlConnection implements TorControlCommands { b.append("\r\n"); sendAndWaitForResponse(b.toString(), null); } - + /** Try to reset the values listed in the collection 'keys' to their * default values. **/ @@ -400,7 +400,7 @@ public class TorControlConnection implements TorControlCommands { /** Requests the values of the configuration variables listed in keys. * Results are returned as a list of ConfigEntry objects. - * + * * If an option appears multiple times in the configuration, all of its * key-value pairs are returned in order. * @@ -432,10 +432,10 @@ public class TorControlConnection implements TorControlCommands { } /** Request that the server inform the client about interesting events. - * Each element of events is one of the following Strings: + * Each element of events is one of the following Strings: * ["CIRC" | "STREAM" | "ORCONN" | "BW" | "DEBUG" | * "INFO" | "NOTICE" | "WARN" | "ERR" | "NEWDESC" | "ADDRMAP"] . - * + * * Any events not listed in the events are turned off; thus, calling * setEvents with an empty events argument turns off all event reporting. */ @@ -450,13 +450,13 @@ public class TorControlConnection implements TorControlCommands { /** Authenticates the controller to the Tor server. * - * By default, the current Tor implementation trusts all local users, and + * By default, the current Tor implementation trusts all local users, and * the controller can authenticate itself by calling authenticate(new byte[0]). * * If the 'CookieAuthentication' option is true, Tor writes a "magic cookie" * file named "control_auth_cookie" into its data directory. To authenticate, * the controller must send the contents of this file in auth. - * + * * If the 'HashedControlPassword' option is set, auth must contain the salted * hash of a secret password. The salted hash is computed according to the * S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier. @@ -521,7 +521,7 @@ public class TorControlConnection implements TorControlCommands { * should ensure that it returns an element of address space that is unlikely * to be in actual use. If there is already an address mapped to the * destination address, the server may reuse that mapping. - * + * * If the original address is already mapped to a different address, the old * mapping is removed. If the original address and the destination address * are the same, the server removes any mapping in place for the original @@ -622,9 +622,9 @@ public class TorControlConnection implements TorControlCommands { } return m; } - - - + + + /** Return the value of the information field 'key' */ public String getInfo(String key) throws IOException { List<String> lst = new ArrayList<String>(); @@ -646,19 +646,19 @@ public class TorControlConnection implements TorControlCommands { "EXTENDCIRCUIT "+circID+" "+path+"\r\n", null); return (lst.get(0)).msg; } - + /** Informs the Tor server that the stream specified by streamID should be - * associated with the circuit specified by circID. - * + * associated with the circuit specified by circID. + * * Each stream may be associated with * at most one circuit, and multiple streams may share the same circuit. * Streams can only be attached to completed circuits (that is, circuits that * have sent a circuit status "BUILT" event or are listed as built in a * getInfo circuit-status request). - * + * * If circID is 0, responsibility for attaching the given stream is * returned to Tor. - * + * * By default, Tor automatically attaches streams to * circuits itself, unless the configuration variable * "__LeaveStreamsUnattached" is set to "1". Attempting to attach streams @@ -671,7 +671,7 @@ public class TorControlConnection implements TorControlCommands { } /** Tells Tor about the server descriptor in desc. - * + * * The descriptor, when parsed, must contain a number of well-specified * fields, including fields for its nickname and identity. */ @@ -684,7 +684,7 @@ public class TorControlConnection implements TorControlCommands { /** Tells Tor to change the exit address of the stream identified by streamID * to address. No remapping is performed on the new provided address. - * + * * To be sure that the modified address will be used, this event must be sent * after a new stream event is received, and before attaching this stream to * a circuit. diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index 8416f15e..6d8ff1ea 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -14,9 +14,9 @@ public interface OrbotConstants { String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports"; String PREF_DISABLE_NETWORK = "pref_disable_network"; - + String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences"; - + String PREF_SOCKS = "pref_socks"; String PREF_HTTP = "pref_http"; 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 d23effd0..ca683893 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -86,9 +86,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public final static String BINARY_TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; private String mCurrentStatus = STATUS_OFF; - + private final static int CONTROL_SOCKET_TIMEOUT = 60000; - + private TorControlConnection conn = null; private int mLastProcessId = -1; @@ -176,11 +176,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.useDebugLogging()) { Log.d(OrbotConstants.TAG,msg); - sendCallbackLogMessage(msg); + sendCallbackLogMessage(msg); } } - + public void logException(String msg, Exception e) { if (Prefs.useDebugLogging()) @@ -188,13 +188,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Log.e(OrbotConstants.TAG,msg,e); ByteArrayOutputStream baos = new ByteArrayOutputStream(); e.printStackTrace(new PrintStream(baos)); - + sendCallbackLogMessage(msg + '\n'+ new String(baos.toByteArray())); - + } else sendCallbackLogMessage(msg); - } @@ -221,16 +220,16 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onLowMemory() { super.onLowMemory(); - + logNotice( "Low Memory Warning!"); - + } private void clearNotifications () { if (mNotificationManager != null) mNotificationManager.cancelAll(); - + if (mEventHandler != null) mEventHandler.getNodes().clear(); @@ -263,18 +262,18 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @SuppressLint("NewApi") protected void showToolbarNotification (String notifyMsg, int notifyType, int icon) - { - + { + //Reusable code. PackageManager pm = getPackageManager(); Intent intent = pm.getLaunchIntentForPackage(getPackageName()); PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - + if (mNotifyBuilder == null) { - + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - + if (mNotifyBuilder == null) { mNotifyBuilder = new NotificationCompat.Builder(this) @@ -304,7 +303,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNotifyBuilder.setContentText(notifyMsg); mNotifyBuilder.setSmallIcon(icon); - + if (notifyType != NOTIFY_ID) { mNotifyBuilder.setTicker(notifyMsg); @@ -331,10 +330,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { mNotificationManager.notify(NOTIFY_ID, mNotification); } - + mNotificationShowing = true; } - + /* (non-Javadoc) * @see android.app.Service#onStart(android.content.Intent, int) @@ -350,16 +349,16 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return Service.START_STICKY; } - + private class IncomingIntentRouter implements Runnable { Intent mIntent; - + public IncomingIntentRouter (Intent intent) { mIntent = intent; } - + public void run() { String action = mIntent.getAction(); @@ -371,23 +370,23 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else if (action.equals(ACTION_STATUS)) { - replyWithStatus(mIntent); + replyWithStatus(mIntent); } else if (action.equals(CMD_SIGNAL_HUP)) { requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); } else if (action.equals(CMD_SET_EXIT)) { - + setExitNode(mIntent.getStringExtra("exit")); - + } else { Log.w(OrbotConstants.TAG, "unhandled TorService Intent: " + action); } } } } - + @Override public void onTaskRemoved(Intent rootIntent){ Log.d(OrbotConstants.TAG,"task removed"); @@ -482,7 +481,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon killProcess(fileTor, "-1"); // this is -HUP } catch (Exception e) { e.printStackTrace(); - } + } } protected void logNotice (String msg) @@ -491,11 +490,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { if (Prefs.useDebugLogging()) Log.d(OrbotConstants.TAG, msg); - + sendCallbackLogMessage(msg); } } - + @Override public void onCreate() { super.onCreate(); @@ -567,7 +566,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Log.e(OrbotConstants.TAG, "Error installing Orbot binaries",e); logNotice("There was an error installing Orbot binaries"); } - + Log.i("TorService", "onCreate end"); } @@ -642,7 +641,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (socksPortPref.indexOf(':')!=-1) socksPortPref = socksPortPref.split(":")[1]; - + socksPortPref = checkPortOrAuto(socksPortPref); String httpPortPref = prefs.getString(OrbotConstants.PREF_HTTP, (TorServiceConstants.HTTP_PROXY_PORT_DEFAULT)); @@ -669,7 +668,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { ipv6Pref += " IPv6Traffic NoIPv4Traffic "; } - + extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append(ipv6Pref).append('\n'); extraLines.append("SafeSocks 0").append('\n'); extraLines.append("TestSocks 0").append('\n'); @@ -704,7 +703,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); - + extraLines.append("TransPort ").append(checkPortOrAuto(transPort)).append('\n'); extraLines.append("DNSPort ").append(checkPortOrAuto(dnsPort)).append('\n'); @@ -727,17 +726,17 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (extraLines == null) return null; - + extraLines.append('\n'); extraLines.append(prefs.getString("pref_custom_torrc", "")).append('\n'); logNotice("updating torrc custom configuration..."); debug("torrc.custom=" + extraLines.toString()); - + File fileTorRcCustom = new File(fileTorRc.getAbsolutePath() + ".custom"); boolean success = updateTorConfigCustom(fileTorRcCustom, extraLines.toString()); - + if (success && fileTorRcCustom.exists()) { logNotice ("success."); @@ -797,7 +796,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon reply.putExtra(EXTRA_HTTP_PROXY, "http://127.0.0.1:" + mPortHTTP); reply.putExtra(EXTRA_HTTP_PROXY_HOST, "127.0.0.1"); reply.putExtra(EXTRA_HTTP_PROXY_PORT, mPortHTTP); - + if (packageName != null) { reply.setPackage(packageName); @@ -836,7 +835,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return; } - + // make sure there are no stray daemons running killAllDaemons(); @@ -848,9 +847,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon 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)); - + ArrayList<String> customEnv = new ArrayList<String>(); - + if (Prefs.bridgesEnabled()) if (Prefs.useVpn() && !mIsLollipop) { @@ -947,7 +946,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon + " DataDirectory " + appCacheHome.getCanonicalPath() + " --defaults-torrc " + fileTorRc.getCanonicalPath() + " -f " + fileTorrcCustom.getCanonicalPath(); - + int exitCode = -1; try { @@ -993,7 +992,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return result; } - protected void exec (Runnable runn) { mExecutor.execute(runn); @@ -1020,48 +1018,48 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon int attempt = 0; logNotice( "Waiting for control port..."); - + while (conn == null && attempt++ < maxTries && (mCurrentStatus != STATUS_OFF)) { try { - + controlPort = getControlPort(); - + if (controlPort != -1) { logNotice( "Connecting to control port: " + controlPort); Socket torConnSocket = new Socket(IP_LOCALHOST, controlPort); torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); - + conn = new TorControlConnection(torConnSocket); conn.launchThread(true);//is daemon - + break; } - + } catch (Exception ce) { conn = null; // logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); - + } - - + + try { // logNotice("waiting..."); Thread.sleep(2000); } catch (Exception e){} } - + if (conn != null) { logNotice( "SUCCESS connected to Tor control port."); - + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - + if (fileCookie.exists()) { byte[] cookie = new byte[(int)fileCookie.length()]; @@ -1069,13 +1067,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon fis.read(cookie); fis.close(); conn.authenticate(cookie); - + logNotice( "SUCCESS - authenticated to control port."); - + sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); String torProcId = conn.getInfo("process/pid"); - + String confSocks = conn.getInfo("net/listeners/socks"); StringTokenizer st = new StringTokenizer(confSocks," "); @@ -1112,25 +1110,25 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon addEventHandler(); return Integer.parseInt(torProcId); - + } else { logNotice ("Tor authentication cookie does not exist yet"); conn = null; - + } } - + throw new Exception("Tor control port could not be found"); } - + private int getControlPort () { int result = -1; - + try { if (fileControlPort.exists()) @@ -1138,35 +1136,35 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug("Reading control port config file: " + fileControlPort.getCanonicalPath()); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort)); String line = bufferedReader.readLine(); - + if (line != null) { String[] lineParts = line.split(":"); result = Integer.parseInt(lineParts[1]); } - + bufferedReader.close(); //store last valid control port SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); prefs.edit().putInt("controlport", result).commit(); - + } else { debug("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); - + } - - + + } catch (FileNotFoundException e) - { + { debug("unable to get control port; file not found"); } catch (Exception e) - { + { debug("unable to read control port config file"); } @@ -1187,7 +1185,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice( "SUCCESS added control port event handler"); } - + /** * Returns the port number that the HTTP proxy is running on */ @@ -1195,7 +1193,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return mPortHTTP; } - + /** * Returns the port number that the HTTP proxy is running on */ @@ -1217,7 +1215,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } return null; } - + public String getConfiguration (String name) { try @@ -1225,54 +1223,54 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (conn != null) { StringBuffer result = new StringBuffer(); - + List<ConfigEntry> listCe = conn.getConf(name); - + Iterator<ConfigEntry> itCe = listCe.iterator(); ConfigEntry ce = null; - - - + + + while (itCe.hasNext()) { ce = itCe.next(); - + result.append(ce.key); result.append(' '); result.append(ce.value); result.append('\n'); } - + return result.toString(); } } catch (Exception ioe) { - + logException("Unable to get Tor configuration: " + ioe.getMessage(),ioe); } - + return null; } - + private final static String RESET_STRING = "=\"\""; /** * Set configuration **/ public boolean updateConfiguration (String name, String value, boolean saveToDisk) - { - - + { + + if (configBuffer == null) configBuffer = new ArrayList<String>(); - + if (resetBuffer == null) resetBuffer = new ArrayList<String>(); - + if (value == null || value.length() == 0) { resetBuffer.add(name + RESET_STRING); - + } else { @@ -1280,10 +1278,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sbConf.append(name); sbConf.append(' '); sbConf.append(value); - + configBuffer.add(sbConf.toString()); } - + return false; } @@ -1309,10 +1307,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } }.start(); } - + } - - public void newIdentity () + + public void newIdentity () { //it is possible to not have a connection yet, and someone might try to newnym if (conn != null) @@ -1330,59 +1328,59 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon showToolbarNotification(getString(R.string.newnym), getNotifyId(), iconId); conn.signal("NEWNYM"); - + } catch (Exception ioe){ - + debug("error requesting newnym: " + ioe.getLocalizedMessage()); - + } } }.start(); } } - + public boolean saveConfiguration () { try { if (conn != null) { - + if (resetBuffer != null && resetBuffer.size() > 0) - { + { for (String value : configBuffer) { - + // debug("removing torrc conf: " + value); - - + + } - + // conn.resetConf(resetBuffer); resetBuffer = null; } - + if (configBuffer != null && configBuffer.size() > 0) { - + for (String value : configBuffer) { - + debug("Setting torrc conf: " + value); - - + + } - + conn.setConf(configBuffer); - + configBuffer = null; } - + // Flush the configuration to disk. //this is doing bad things right now NF 22/07/10 //conn.saveConf(); - + return true; } } @@ -1390,7 +1388,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe); } - + return false; } @@ -1408,7 +1406,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void sendCallbackLogMessage (String logMessage) { - + Intent intent = new Intent(LOCAL_ACTION_LOG); // You can also include some extra data. intent.putExtra(LOCAL_EXTRA_LOG, logMessage); @@ -1431,7 +1429,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } - + protected void sendCallbackStatus(String currentStatus) { mCurrentStatus = currentStatus; Intent intent = getActionStatusIntent(currentStatus); @@ -1457,7 +1455,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } /* - * Another way to do this would be to use the Observer pattern by defining the + * Another way to do this would be to use the Observer pattern by defining the * BroadcastReciever in the Android manifest. */ @@ -1467,11 +1465,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mCurrentStatus == STATUS_OFF) return; - + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true); - + final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); final NetworkInfo netInfo = cm.getActiveNetworkInfo(); @@ -1484,7 +1482,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if(netInfo != null && netInfo.isConnected()) { // WE ARE CONNECTED: DO SOMETHING newConnectivityState = true; - } + } else { // WE ARE NOT: DO SOMETHING ELSE newConnectivityState = false; @@ -1517,16 +1515,16 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon }**/ - + } }; private StringBuffer processSettingsImpl (StringBuffer extraLines) throws IOException { logNotice(getString(R.string.updating_settings_in_tor_service)); - + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); - + boolean useBridges = Prefs.bridgesEnabled(); boolean becomeRelay = prefs.getBoolean(OrbotConstants.PREF_OR, false); @@ -1536,21 +1534,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String entranceNodes = prefs.getString("pref_entrance_nodes", ""); String exitNodes = prefs.getString("pref_exit_nodes", ""); String excludeNodes = prefs.getString("pref_exclude_nodes", ""); - + if (!useBridges) { - + extraLines.append("UseBridges 0").append('\n'); if (Prefs.useVpn()) //set the proxy here if we aren't using a bridge { - + if (!mIsLollipop) { String proxyType = "socks5"; extraLines.append(proxyType + "Proxy" + ' ' + OrbotVpnManager.sSocksProxyLocalhost + ':' + OrbotVpnManager.sSocksProxyServerPort).append('\n'); }; - + } else { @@ -1561,11 +1559,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String proxyPort = prefs.getString("pref_proxy_port", null); String proxyUser = prefs.getString("pref_proxy_username", null); String proxyPass = prefs.getString("pref_proxy_password", null); - + if ((proxyHost != null && proxyHost.length()>0) && (proxyPort != null && proxyPort.length() > 0)) { extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + proxyPort).append('\n'); - + if (proxyUser != null && proxyPass != null) { if (proxyType.equalsIgnoreCase("socks5")) @@ -1575,13 +1573,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n'); - + } else if (proxyPass != null) extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n'); - - - + + + } } } @@ -1650,27 +1648,27 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon throw new IOException("Bridge binary does not exist: " + fileObfsclient.getCanonicalPath()); } } - - + + //only apply GeoIP if you need it File fileGeoIP = new File(appBinHome, GEOIP_ASSET_KEY); File fileGeoIP6 = new File(appBinHome, GEOIP6_ASSET_KEY); - + if (fileGeoIP.exists()) { extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); } - + if (!TextUtils.isEmpty(entranceNodes)) extraLines.append("EntryNodes" + ' ' + entranceNodes).append('\n'); - + if (!TextUtils.isEmpty(exitNodes)) extraLines.append("ExitNodes" + ' ' + exitNodes).append('\n'); - + if (!TextUtils.isEmpty(excludeNodes)) extraLines.append("ExcludeNodes" + ' ' + excludeNodes).append('\n'); - + extraLines.append("StrictNodes" + ' ' + (enableStrictNodes ? "1" : "0")).append('\n'); try @@ -1679,11 +1677,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { String ReachableAddressesPorts = prefs.getString(OrbotConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443"); - + extraLines.append("ReachableAddresses" + ' ' + ReachableAddressesPorts).append('\n'); } - + } catch (Exception e) { @@ -1700,7 +1698,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String nickname = prefs.getString(OrbotConstants.PREF_OR_NICKNAME, "Orbot"); String dnsFile = writeDNSFile (); - + extraLines.append("ServerDNSResolvConfFile" + ' ' + dnsFile).append('\n'); extraLines.append("ORPort" + ' ' + ORPort).append('\n'); extraLines.append("Nickname" + ' ' + nickname).append('\n'); @@ -1712,7 +1710,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr); - + return null; } @@ -1765,7 +1763,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return extraLines; } - + public static String flattenToAscii(String string) { char[] out = new char[string.length()]; string = Normalizer.normalize(string, Normalizer.Form.NFD); @@ -1786,7 +1784,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon bw.println("nameserver 8.8.8.8"); bw.println("nameserver 8.8.4.4"); bw.close(); - + return file.getCanonicalPath(); } @@ -1794,21 +1792,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onTrimMemory(int level) { super.onTrimMemory(level); - + switch (level) { - + case TRIM_MEMORY_BACKGROUND: debug("trim memory requested: app in the background"); return; - + /** public static final int TRIM_MEMORY_BACKGROUND Added in API level 14 Level for onTrimMemory(int): the process has gone on to the LRU list. This is a good opportunity to clean up resources that can efficiently and quickly be re-built if the user returns to the app. Constant Value: 40 (0x00000028) */ - + case TRIM_MEMORY_COMPLETE: debug("trim memory requested: cleanup all memory"); @@ -1823,14 +1821,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug("trim memory requested: clean up some memory"); return; - + /** public static final int TRIM_MEMORY_MODERATE Added in API level 14 Level for onTrimMemory(int): the process is around the middle of the background LRU list; freeing memory can help the system keep other processes running later in the list for better overall performance. Constant Value: 60 (0x0000003c) */ - + case TRIM_MEMORY_RUNNING_CRITICAL: debug("trim memory requested: memory on device is very low and critical"); @@ -1841,7 +1839,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Level for onTrimMemory(int): the process is not an expendable background process, but the device is running extremely low on memory and is about to not be able to keep any background processes running. Your running process should free up as many non-critical resources as it can to allow that memory to be used elsewhere. The next thing that will happen after this is onLowMemory() called to report that nothing at all can be kept in the background, a situation that can start to notably impact the user. Constant Value: 15 (0x0000000f) */ - + case TRIM_MEMORY_RUNNING_LOW: debug("trim memory requested: memory on device is running low"); @@ -1866,14 +1864,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug("trim memory requested: app is not showing UI anymore"); return; - + /** public static final int TRIM_MEMORY_UI_HIDDEN Level for onTrimMemory(int): the process had been showing a user interface, and is no longer doing so. Large allocations with the UI should be released at this point to allow memory to be better managed. Constant Value: 20 (0x00000014) */ } - + } @Override @@ -1889,15 +1887,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } - + private void setExitNode (String newExits) { SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); - + if (TextUtils.isEmpty(newExits)) { prefs.edit().remove("pref_exit_nodes").apply(); - + if (conn != null) { try @@ -1908,7 +1906,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.resetConf(resetBuffer); conn.setConf("DisableNetwork","1"); conn.setConf("DisableNetwork","0"); - + } catch (Exception ioe) { @@ -1919,20 +1917,20 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon else { prefs.edit().putString("pref_exit_nodes", newExits).apply(); - + if (conn != null) { try { File fileGeoIP = new File(appBinHome, GEOIP_ASSET_KEY); File fileGeoIP6 = new File(appBinHome, GEOIP6_ASSET_KEY); - + conn.setConf("GeoIPFile",fileGeoIP.getCanonicalPath()); conn.setConf("GeoIPv6File",fileGeoIP6.getCanonicalPath()); - + conn.setConf("ExitNodes", newExits); conn.setConf("StrictNodes","1"); - + conn.setConf("DisableNetwork","1"); conn.setConf("DisableNetwork","0");

1 0

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

28 Apr '20

commit e64d34a9fa7ad099b78b54521b290653ad978fa0 Merge: 888f836a 135a94dc Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 09:41:58 2019 -0400 Merge branch 'master' of github.com:guardianproject/orbot FUNDING.yml | 4 +++ .../torproject/android/mini/MiniMainActivity.java | 16 ++++----- .../android/mini/ui/AppConfigActivity.java | 4 +-- .../android/mini/ui/AppManagerActivity.java | 4 +-- .../android/mini/vpn/VPNEnableActivity.java | 6 ++-- .../org/torproject/android/OrbotMainActivity.java | 15 +++----- .../torproject/android/ui/AppManagerActivity.java | 4 +-- .../torproject/android/ui/VPNEnableActivity.java | 5 +-- .../android/service/StartTorReceiver.java | 11 +++--- .../org/torproject/android/service/TorService.java | 40 ++++------------------ .../android/service/TorServiceConstants.java | 5 --- .../org/torproject/android/service/util/Prefs.java | 7 +++- .../android/service/util/TorServiceUtils.java | 4 --- .../android/service/vpn/TorVpnService.java | 27 +++++++++++++-- 14 files changed, 71 insertions(+), 81 deletions(-)

1 0

[orbot/master] run Ctrl-Alt-L code formatter on TorServiceConstants
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d4125a2c5deef61157f8d4a6ade79899c5fdd6b1 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Oct 25 11:40:36 2019 +0200 run Ctrl-Alt-L code formatter on TorServiceConstants --- .../android/service/TorServiceConstants.java | 53 +++++++++++----------- 1 file changed, 26 insertions(+), 27 deletions(-) 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 70193edc..4962ac29 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -8,31 +8,31 @@ import android.content.Intent; public interface TorServiceConstants { - String DIRECTORY_TOR_DATA = "data"; - - String TOR_CONTROL_PORT_FILE = "control.txt"; - - //torrc (tor config file) - String TORRC_ASSET_KEY = "torrc"; - - String TOR_CONTROL_COOKIE = "control_auth_cookie"; - - //geoip data file asset key - String GEOIP_ASSET_KEY = "geoip"; - String GEOIP6_ASSET_KEY = "geoip6"; - - String IP_LOCALHOST = "127.0.0.1"; - int TOR_TRANSPROXY_PORT_DEFAULT = 9040; - - int TOR_DNS_PORT_DEFAULT = 5400; + String DIRECTORY_TOR_DATA = "data"; + + String TOR_CONTROL_PORT_FILE = "control.txt"; + + //torrc (tor config file) + String TORRC_ASSET_KEY = "torrc"; + + String TOR_CONTROL_COOKIE = "control_auth_cookie"; + + //geoip data file asset key + String GEOIP_ASSET_KEY = "geoip"; + String GEOIP6_ASSET_KEY = "geoip6"; + + String IP_LOCALHOST = "127.0.0.1"; + int TOR_TRANSPROXY_PORT_DEFAULT = 9040; + + int TOR_DNS_PORT_DEFAULT = 5400; String HTTP_PROXY_PORT_DEFAULT = "8118"; // like Privoxy! String SOCKS_PROXY_PORT_DEFAULT = "9050"; - //control port + //control port String LOG_NOTICE_HEADER = "NOTICE"; String LOG_NOTICE_BOOTSTRAPPED = "Bootstrapped"; - + /** * A request to Orbot to transparently start Tor services */ @@ -92,17 +92,16 @@ public interface TorServiceConstants { String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; // actions for internal command Intents - String CMD_SIGNAL_HUP = "signal_hup"; - String CMD_NEWNYM = "newnym"; - String CMD_SET_EXIT = "setexit"; + String CMD_SIGNAL_HUP = "signal_hup"; + String CMD_NEWNYM = "newnym"; + String CMD_SET_EXIT = "setexit"; - String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; - - //obfsproxy - String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; + String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; - String HIDDEN_SERVICES_DIR = "hidden_services"; + //obfsproxy + String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; + String HIDDEN_SERVICES_DIR = "hidden_services"; }

1 0

[orbot/master] Merge pull request #278 from eighthave/whitespace-and-unused
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit b5b4c9bc4f2904700f651d81778861d8bb2ad037 Merge: 135a94dc 1d084d78 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Nov 15 11:11:26 2019 -0500 Merge pull request #278 from eighthave/whitespace-and-unused fix whitespace and remove unused stuff in TorService .../torproject/android/control/EventHandler.java | 2 +- .../android/control/TorControlConnection.java | 58 ++-- .../torproject/android/service/OrbotConstants.java | 4 +- .../org/torproject/android/service/TorService.java | 334 ++++++++++----------- .../android/service/TorServiceConstants.java | 53 ++-- 5 files changed, 218 insertions(+), 233 deletions(-)

1 0

[orbot/master] remove unused variables and methods from TorService
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 7b8f908a8f8c83ae8fd3a8ec85a6a45a31438c10 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Oct 25 11:57:15 2019 +0200 remove unused variables and methods from TorService --- .../main/java/org/torproject/android/service/TorService.java | 12 ------------ 1 file changed, 12 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 c493f80b..d23effd0 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -107,7 +107,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private File fileControlPort; private boolean mConnectivity = true; - private int mNetworkType = -1; private NotificationManager mNotificationManager = null; private NotificationCompat.Builder mNotifyBuilder; @@ -133,8 +132,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs"); private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie"); - private Handler mHandler; - public static final class HiddenService implements BaseColumns { public static final String NAME = "name"; public static final String PORT = "port"; @@ -505,8 +502,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { - mHandler = new Handler (); - appBinHome = getFilesDir();//getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); if (!appBinHome.exists()) appBinHome.mkdirs(); @@ -1019,11 +1014,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - protected TorControlConnection getControlConnection () - { - return conn; - } - private int initControlConnection (int maxTries, boolean isReconnect) throws Exception { int controlPort = -1; @@ -1499,8 +1489,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // WE ARE NOT: DO SOMETHING ELSE newConnectivityState = false; } - - mNetworkType = newNetType; if (newConnectivityState != mConnectivity) { mConnectivity = newConnectivityState;

1 0

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

28 Apr '20

commit ca65d08a0333864c1360a4f71b52088d6145f332 Merge: a479cc9a b5b4c9bc Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 15 11:13:37 2019 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../torproject/android/control/EventHandler.java | 2 +- .../android/control/TorControlConnection.java | 58 ++-- .../torproject/android/service/OrbotConstants.java | 4 +- .../org/torproject/android/service/TorService.java | 334 ++++++++++----------- .../android/service/TorServiceConstants.java | 53 ++-- 5 files changed, 218 insertions(+), 233 deletions(-)

1 0

[orbot/master] make sure all tor daemons are fully killed
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d18e1bb6a5c68fa562712e9b89d0088f8e4b4ee7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat Dec 7 06:49:05 2019 -0500 make sure all tor daemons are fully killed --- .../src/main/java/org/torproject/android/service/TorService.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 5e9e9168..ea807be4 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -467,6 +467,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn = null; } + // if that fails, try again using native utils + try { + killProcess(fileTor, "-9"); // this is -HUP + } catch (Exception e) { + e.printStackTrace(); + } + } private void requestTorRereadConfig() {

1 0

[orbot/master] reduce use of "kill" process command for only PDSND and not tor
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit f23e9540eb6bf7e192eef94c5f9ab45217a46b00 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 4 13:23:34 2020 -0500 reduce use of "kill" process command for only PDSND and not tor - it is no longer needed for tor, and was causing the app to exit on some devices - also, now specifically kill pdnsd using the stored PID --- .../torproject/android/service/OrbotService.java | 7 +++--- .../android/service/vpn/OrbotVpnManager.java | 22 ++++++++++++++++-- .../torproject/android/service/vpn/VpnUtils.java | 27 +++++++++++++++++++--- 3 files changed, 48 insertions(+), 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 f806e42a..dbd36dbd 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -85,7 +85,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs; -import static org.torproject.android.service.vpn.VpnUtils.killProcess; public class OrbotService extends Service implements TorServiceConstants, OrbotConstants { @@ -472,6 +471,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC conn = null; } + /** if (mLastProcessId != -1) killProcess(mLastProcessId + "", "-9"); @@ -489,7 +489,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC killProcess(fileTor, "-9"); // this is -HUP } catch (Exception e) { e.printStackTrace(); - } + }**/ } @@ -502,12 +502,13 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC } catch (IOException e) { e.printStackTrace(); } + /** // if that fails, try again using native utils try { killProcess(fileTor, "-1"); // this is -HUP } catch (Exception e) { e.printStackTrace(); - } + }**/ } protected void logNotice (String msg) 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 0367ad04..14ecc20d 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 @@ -33,6 +33,8 @@ import android.util.Log; import android.widget.Toast; import com.runjva.sourceforge.jsocks.protocol.ProxyServer; import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone; + +import org.apache.commons.io.IOUtils; import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.OrbotService; import org.torproject.android.service.R; @@ -49,6 +51,7 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; +import java.util.List; import java.util.concurrent.TimeoutException; import static org.torproject.android.service.TorServiceConstants.ACTION_START; @@ -92,11 +95,12 @@ public class OrbotVpnManager implements Handler.Callback { filePdnsd = CustomNativeLoader.loadNativeBinary(service.getApplicationContext(),PDNSD_BIN,new File(service.getFilesDir(),PDNSD_BIN)); + /** try { killProcess(filePdnsd, "-1"); } catch (Exception e) { e.printStackTrace(); - } + }**/ Tun2Socks.init(); @@ -417,6 +421,8 @@ public class OrbotVpnManager implements Handler.Callback { File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort); + + String[] cmdString = {pdnsPath,"-c",fileConf.toString(),"-g","-v2"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); @@ -441,6 +447,18 @@ public class OrbotVpnManager implements Handler.Callback { private boolean stopDns () { + File filePdnsPid = new File(mService.getFilesDir(),"pdnsd.pid"); + List<String> lines = null; + try { + lines = IOUtils.readLines(new FileReader(filePdnsPid)); + String dnsPid = lines.get(0); + killProcess(dnsPid,""); + } catch (Exception e) { + Log.e("OrbotVPN","error killing dns process",e); + } + + + /** // if that fails, try again using native utils try { killProcess(filePdnsd, "-1"); // this is -HUP @@ -466,7 +484,7 @@ public class OrbotVpnManager implements Handler.Callback { } catch (Exception e) { Log.e(TAG,"error killing DNS Process: " + pid,e); } - } + }**/ return false; diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java index acc15316..4ac71410 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java @@ -3,6 +3,9 @@ package org.torproject.android.service.vpn; import android.app.ActivityManager; import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; + +import org.apache.commons.io.IOUtils; import java.io.BufferedReader; import java.io.File; @@ -22,9 +25,10 @@ public class VpnUtils { Context.MODE_MULTI_PROCESS); } + public static int findProcessId(String command) throws IOException { - String[] cmds = {"ps -ef","ps -A","toolbox ps","busybox ps"}; + String[] cmds = {"ps -ef","ps -A","toolbox ps"}; for (int i = 0; i < cmds.length;i++) { Process procPs = getRuntime().exec(cmds[i]); @@ -96,12 +100,29 @@ public class VpnUtils { public static void killProcess(String pidString, String signal) throws Exception { - String[] cmds = {"","busybox ","toolbox "}; + String[] cmds = {"","toolbox ","busybox "}; for (int i = 0; i < cmds.length;i++) { try { - getRuntime().exec("toolbox kill " + signal + " " + pidString); + Process proc = getRuntime().exec(cmds[i] + "kill " + signal + " " + pidString); + int exitVal = proc.exitValue(); + List<String> lineErrors = IOUtils.readLines(proc.getErrorStream()); + List<String> lineInputs = IOUtils.readLines(proc.getInputStream()); + + if (exitVal != 0) + { + Log.d("Orbot.killProcess","exit=" + exitVal); + for (String line: lineErrors) + Log.d("Orbot.killProcess",line); + + for (String line: lineInputs) + Log.d("Orbot.killProcess",line); + + } + + } catch (IOException ioe) { + Log.e("Orbot.killprcess","error killing process: " + pidString,ioe); } }

1 0

[orbot/master] fix OrbotService rename
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 57e3ee1b3d8bd692f7cc17f32759aab9aefda1b1 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Dec 18 12:50:21 2019 +0100 fix OrbotService rename --- .../main/java/org/torproject/android/service/TorEventHandler.java | 2 +- .../java/org/torproject/android/service/util/ExternalIPFetcher.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 466c4323..def94fcf 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -215,7 +215,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (node.ipAddress == null && (!node.isFetchingInfo) && Prefs.useDebugLogging()) { node.isFetchingInfo = true; - mService.exec(new ExternalIPFetcher(mService, node, TorService.mPortHTTP)); + mService.exec(new ExternalIPFetcher(mService, node, OrbotService.mPortHTTP)); } isFirstNode = false; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java index ae99e7de..e9a9b575 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java @@ -3,7 +3,7 @@ package org.torproject.android.service.util; import org.json.JSONArray; import org.json.JSONObject; import org.torproject.android.service.TorEventHandler; -import org.torproject.android.service.TorService; +import org.torproject.android.service.OrbotService; import java.io.BufferedReader; import java.io.InputStream; @@ -15,12 +15,12 @@ import java.net.URLConnection; public class ExternalIPFetcher implements Runnable { - private TorService mService; + private OrbotService mService; private TorEventHandler.Node mNode; private final static String ONIONOO_BASE_URL = "https://onionoo.torproject.org/details?fields=country_name,as_name,or_addre…"; private int mLocalHttpProxyPort = 8118; - public ExternalIPFetcher (TorService service, TorEventHandler.Node node, int localProxyPort ) + public ExternalIPFetcher (OrbotService service, TorEventHandler.Node node, int localProxyPort ) { mService = service; mNode = node;

1 0