March 2016 - tor-commits - lists.torproject.org

[orbot/master] Move OrbotVPNService to a Manager and consolidate services
by n8fr8＠torproject.org 10 Mar '16

10 Mar '16

commit 9097b79a7e3e76185f09d5c9d510eefa52447d2b Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 9 14:43:01 2016 -0500 Move OrbotVPNService to a Manager and consolidate services This allows for the VPN service to be set in the foreground with the TorService and reduce the chance to be killed due to lack of memory --- AndroidManifest.xml | 9 +- external/Makefile | 2 + res/values/pdnsd.xml | 4 +- src/org/torproject/android/service/TorService.java | 41 +- .../torproject/android/vpn/OrbotVpnManager.java | 455 +++++++++++++++++++++ .../torproject/android/vpn/OrbotVpnService.java | 449 -------------------- 6 files changed, 495 insertions(+), 465 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ccf0692..ce30100 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,12 +6,15 @@ android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/> +  + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> @@ -88,7 +91,7 @@ <service android:name=".service.TorService" android:enabled="true" - android:permission="org.torproject.android.MANAGE_TOR" + android:permission="android.permission.BIND_VPN_SERVICE" android:stopWithTask="false" > </service> @@ -118,13 +121,13 @@ </intent-filter> </receiver> - +  </application> </manifest> diff --git a/external/Makefile b/external/Makefile index 92e4c0c..211df76 100644 --- a/external/Makefile +++ b/external/Makefile @@ -83,6 +83,8 @@ ifeq ($(APP_ABI),armeabi) CFLAGS += $(TARGET_thumb_release_CFLAGS) endif + + .PHONY = clean showsetup \ assets assets-clean \ openssl-static openssl-static-clean \ diff --git a/res/values/pdnsd.xml b/res/values/pdnsd.xml index 42834d2..522f765 100644 --- a/res/values/pdnsd.xml +++ b/res/values/pdnsd.xml @@ -2,7 +2,7 @@ <resources> <string name="pdnsd_conf" formatted="false"> global { - perm_cache=1024; + perm_cache=0; cache_dir="/data/data/org.torproject.android/app_bin"; server_port = 8091; server_ip = 0.0.0.0; @@ -12,7 +12,7 @@ global { timeout=10; daemon=on; pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid"; - + } server { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 95192c6..24a90db 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -23,6 +23,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.net.VpnService; import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -46,7 +47,7 @@ import org.torproject.android.Prefs; import org.torproject.android.R; import org.torproject.android.settings.AppManager; import org.torproject.android.settings.TorifiedApp; -import org.torproject.android.vpn.OrbotVpnService; +import org.torproject.android.vpn.OrbotVpnManager; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -82,7 +83,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -public class TorService extends Service implements TorServiceConstants, OrbotConstants, EventHandler +public class TorService extends VpnService implements TorServiceConstants, OrbotConstants, EventHandler { private String mCurrentStatus = STATUS_OFF; @@ -121,7 +122,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private long lastWritten = -1; private NotificationManager mNotificationManager = null; - private Builder mNotifyBuilder; + private Notification.Builder mNotifyBuilder; private Notification mNotification; private boolean mNotificationShowing = false; @@ -130,6 +131,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private ExecutorService mExecutor = Executors.newFixedThreadPool(1); private NumberFormat mNumberFormat = null; + + private OrbotVpnManager mVpnManager; public void debug(String msg) { @@ -364,6 +367,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon unregisterReceiver(mNetworkStateReceiver); super.onDestroy(); } + + @Override + public void onRevoke () + { + if (mVpnManager != null) + mVpnManager.onRevoke(); + + super.onRevoke(); + } private void stopTor() { Log.i("TorService", "stopTor"); @@ -744,7 +756,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.bridgesEnabled()) if (Prefs.useVpn() && !mIsLollipop) { - customEnv.add("TOR_PT_PROXY=socks5://" + OrbotVpnService.sSocksProxyLocalhost + ":" + OrbotVpnService.sSocksProxyServerPort); + customEnv.add("TOR_PT_PROXY=socks5://" + OrbotVpnManager.sSocksProxyLocalhost + ":" + OrbotVpnManager.sSocksProxyServerPort); } String baseDirectory = OrbotApp.fileTor.getParent(); @@ -1190,12 +1202,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon updateConfiguration("DNSPort",TOR_VPN_DNS_LISTEN_ADDRESS + ":" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); - Intent intent = new Intent(TorService.this, OrbotVpnService.class); - intent.setAction("start"); + if (mVpnManager == null) + mVpnManager = new OrbotVpnManager (this); + Intent intent = new Intent(); + intent.setAction("start"); intent.putExtra("torSocks", mPortSOCKS); - startService(intent); + mVpnManager.handleIntent(new Builder(),intent); } @@ -1205,9 +1219,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Prefs.putUseVpn(false); processTransparentProxying(); - Intent intent = new Intent(TorService.this, OrbotVpnService.class); - intent.setAction("stop"); - startService(intent); + if (mVpnManager != null) + { + Intent intent = new Intent(); + intent.setAction("stop"); + mVpnManager.handleIntent(new Builder(), intent); + mVpnManager = null; + } + } @Override @@ -1851,7 +1870,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (!mIsLollipop) { String proxyType = "socks5"; - extraLines.append(proxyType + "Proxy" + ' ' + OrbotVpnService.sSocksProxyLocalhost + ':' + OrbotVpnService.sSocksProxyServerPort).append('\n'); + extraLines.append(proxyType + "Proxy" + ' ' + OrbotVpnManager.sSocksProxyLocalhost + ':' + OrbotVpnManager.sSocksProxyServerPort).append('\n'); }; } diff --git a/src/org/torproject/android/vpn/OrbotVpnManager.java b/src/org/torproject/android/vpn/OrbotVpnManager.java new file mode 100644 index 0000000..bfb564c --- /dev/null +++ b/src/org/torproject/android/vpn/OrbotVpnManager.java @@ -0,0 +1,455 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.torproject.android.vpn; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Locale; +import java.util.concurrent.TimeoutException; + +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; +import org.torproject.android.OrbotApp; +import org.torproject.android.R; +import org.torproject.android.service.TorService; +import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.service.TorServiceUtils; +import org.torproject.android.settings.AppManager; +import org.torproject.android.settings.TorifiedApp; + +import android.annotation.TargetApi; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.PackageManager.NameNotFoundException; +import android.net.VpnService; +import android.net.VpnService.Builder; +import android.os.Build; +import android.os.Handler; +import android.os.Message; +import android.os.ParcelFileDescriptor; +import android.util.Log; +import android.widget.Toast; + +import com.runjva.sourceforge.jsocks.protocol.ProxyServer; +import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone; + +(a)TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) + +public class OrbotVpnManager implements Handler.Callback { + private static final String TAG = "OrbotVpnService"; + + private PendingIntent mConfigureIntent; + + private Thread mThreadVPN; + + private String mSessionName = "OrbotVPN"; + private ParcelFileDescriptor mInterface; + + private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; + + public static int sSocksProxyServerPort = -1; + public static String sSocksProxyLocalhost = null; + private ProxyServer mSocksProxyServer; + + + private final static int VPN_MTU = 1500; + + private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; + + //this is the actual DNS server we talk to over UDP or TCP (now using Tor's DNS port) + private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1"; + private final static int DEFAULT_ACTUAL_DNS_PORT = TorServiceConstants.TOR_DNS_PORT_DEFAULT; + + private boolean isRestart = false; + + private TorService mService; + + + static{ + System.loadLibrary("tun2socks"); + } + + public OrbotVpnManager (TorService service) + { + mService = service; + } + + //public int onStartCommand(Intent intent, int flags, int startId) { + public int handleIntent(Builder builder, Intent intent) { + + if (intent != null) + { + String action = intent.getAction(); + + if (action.equals("start")) + { + + // Stop the previous session by interrupting the thread. + if (mThreadVPN == null || (!mThreadVPN.isAlive())) + { + Log.d(TAG,"starting OrbotVPNService service!"); + + mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); + + if (!mIsLollipop) + { + + startSocksBypass(); + } + + setupTun2Socks(builder); + } + } + else if (action.equals("stop")) + { + Log.d(TAG,"stop OrbotVPNService service!"); + + stopVPN(); + //if (mHandler != null) + //mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000); + } + else if (action.equals("refresh")) + { + Log.d(TAG,"refresh OrbotVPNService service!"); + + if (!mIsLollipop) + startSocksBypass(); + + if (!isRestart) + setupTun2Socks(builder); + } + } + + + return Service.START_STICKY; + } + + private void startSocksBypass() + { + + new Thread () + { + + public void run () + { + + //generate the proxy port that the + if (sSocksProxyServerPort == -1) + { + try { + + sSocksProxyLocalhost = "127.0.0.1";// InetAddress.getLocalHost().getHostAddress(); + sSocksProxyServerPort = (int)((Math.random()*1000)+10000); + + } catch (Exception e) { + Log.e(TAG,"Unable to access localhost",e); + throw new RuntimeException("Unable to access localhost: " + e); + + } + + } + + + if (mSocksProxyServer != null) + { + stopSocksBypass (); + } + + try + { + mSocksProxyServer = new ProxyServer(new ServerAuthenticatorNone(null, null)); + ProxyServer.setVpnService(mService); + mSocksProxyServer.start(sSocksProxyServerPort, 5, InetAddress.getLocalHost()); + + } + catch (Exception e) + { + Log.e(TAG,"error getting host",e); + } + } + }.start(); + + } + + private synchronized void stopSocksBypass () + { + + if (mSocksProxyServer != null){ + mSocksProxyServer.stop(); + mSocksProxyServer = null; + } + + + } + + /** + @Override + public void onCreate() { + super.onCreate(); + + // Set the locale to English (or probably any other language that^M + // uses Hindu-Arabic (aka Latin) numerals).^M + // We have found that VpnService.Builder does something locale-dependent^M + // internally that causes errors when the locale uses its own numerals^M + // (i.e., Farsi and Arabic).^M + Locale.setDefault(new Locale("en")); + + } + + + @Override + public void onDestroy() { + stopVPN(); + }*/ + + private void stopVPN () + { + if (mIsLollipop) + stopSocksBypass (); + + if (mInterface != null){ + try + { + Log.d(TAG,"closing interface, destroying VPN interface"); + + mInterface.close(); + mInterface = null; + + } + catch (Exception e) + { + Log.d(TAG,"error stopping tun2socks",e); + } + catch (Error e) + { + Log.d(TAG,"error stopping tun2socks",e); + } + } + + Tun2Socks.Stop(); + + try { + TorServiceUtils.killProcess(OrbotApp.filePdnsd); + } catch (Exception e) { + e.printStackTrace(); + } + + mThreadVPN = null; + + + } + + @Override + public boolean handleMessage(Message message) { + if (message != null) { + Toast.makeText(mService, message.what, Toast.LENGTH_SHORT).show(); + } + return true; + } + + + private synchronized void setupTun2Socks(final Builder builder) { + + + if (mInterface != null) //stop tun2socks now to give it time to clean up + { + isRestart = true; + Tun2Socks.Stop(); + } + + mThreadVPN = new Thread () + { + + public void run () + { + try + { + + if (isRestart) + { + Log.d(TAG,"is a restart... let's wait for a few seconds"); + Thread.sleep(3000); + } + + //start PDNSD daemon pointing to actual DNS + startDNS(DEFAULT_ACTUAL_DNS_HOST,DEFAULT_ACTUAL_DNS_PORT); + + final String vpnName = "OrbotVPN"; + final String localhost = "127.0.0.1"; + + final String virtualGateway = "10.10.10.1"; + final String virtualIP = "10.10.10.2"; + final String virtualNetMask = "255.255.255.0"; + final String dummyDNS = "8.8.8.8"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start + final String defaultRoute = "0.0.0.0"; + + final String localSocks = localhost + ':' + + String.valueOf(mTorSocks); + + final String localDNS = virtualGateway + ':' + "8091";//String.valueOf(TorServiceConstants.TOR_DNS_PORT_DEFAULT); + final boolean localDnsTransparentProxy = true; + + builder.setMtu(VPN_MTU); + builder.addAddress(virtualGateway,32); + + builder.setSession(vpnName); + + builder.addDnsServer(dummyDNS); + builder.addRoute(dummyDNS,32); + + //route all traffic through VPN (we might offer country specific exclude lists in the future) + builder.addRoute(defaultRoute,0); + + //handle ipv6 + //builder.addAddress("fdfe:dcba:9876::1", 126); + //builder.addRoute("::", 0); + + if (mIsLollipop) + doLollipopAppRouting(builder); + + // Create a new interface using the builder and save the parameters. + ParcelFileDescriptor newInterface = builder.setSession(mSessionName) + .setConfigureIntent(mConfigureIntent) + .establish(); + + if (mInterface != null) + { + Log.d(TAG,"Stopping existing VPN interface"); + mInterface.close(); + mInterface = null; + } + + mInterface = newInterface; + + Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , localDnsTransparentProxy); + + isRestart = false; + + } + catch (Exception e) + { + Log.d(TAG,"tun2Socks has stopped",e); + } + } + + }; + + mThreadVPN.start(); + + } + + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + private void doLollipopAppRouting (Builder builder) throws NameNotFoundException + { + + ArrayList<TorifiedApp> apps = AppManager.getApps(mService, TorServiceUtils.getSharedPrefs(mService.getApplicationContext())); + + boolean perAppEnabled = false; + + for (TorifiedApp app : apps) + { + if (app.isTorified() && (!app.getPackageName().equals(mService.getPackageName()))) + { + builder.addAllowedApplication(app.getPackageName()); + perAppEnabled = true; + } + + } + + if (!perAppEnabled) + builder.addDisallowedApplication(mService.getPackageName()); + + } + + + public void onRevoke() { + + Log.w(TAG,"VPNService REVOKED!"); + + if (!isRestart) + { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(mService.getApplicationContext()); + prefs.edit().putBoolean("pref_vpn", false).commit(); + stopVPN(); + } + + isRestart = false; + + //super.onRevoke(); + + } + + + private void startDNS (String dns, int port) throws IOException, TimeoutException + { + makePdnsdConf(mService, dns, port,OrbotApp.filePdnsd.getParentFile() ); + + ArrayList<String> customEnv = new ArrayList<String>(); + String baseDirectory = OrbotApp.filePdnsd.getParent(); + Shell shell = Shell.startShell(customEnv, baseDirectory); + + String cmdString = OrbotApp.filePdnsd.getCanonicalPath() + + " -c " + baseDirectory + "/pdnsd.conf"; + + SimpleCommand shellCommand = new SimpleCommand(cmdString); + + shell.add(shellCommand).waitForFinish(); + + Log.i(TAG,"PDNSD: " + shellCommand.getExitCode() + ": " + shellCommand.getOutput()); + + } + + public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException { + String conf = String.format(context.getString(R.string.pdnsd_conf), dns, port); + + File f = new File(fileDir,"pdnsd.conf"); + + if (f.exists()) { + f.delete(); + } + + FileOutputStream fos = new FileOutputStream(f, false); + PrintStream ps = new PrintStream(fos); + ps.print(conf); + ps.close(); + + //f.withWriter { out -> out.print conf }; + + + File cache = new File(fileDir,"pdnsd.cache"); + + if (!cache.exists()) { + try { + cache.createNewFile(); + } catch (Exception e) { + + } + } +} + + +} diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java deleted file mode 100644 index 2efab1c..0000000 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ /dev/null @@ -1,449 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.torproject.android.vpn; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Locale; -import java.util.concurrent.TimeoutException; - -import org.sufficientlysecure.rootcommands.Shell; -import org.sufficientlysecure.rootcommands.command.SimpleCommand; -import org.torproject.android.OrbotApp; -import org.torproject.android.R; -import org.torproject.android.service.TorServiceConstants; -import org.torproject.android.service.TorServiceUtils; -import org.torproject.android.settings.AppManager; -import org.torproject.android.settings.TorifiedApp; - -import android.annotation.TargetApi; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.PackageManager.NameNotFoundException; -import android.net.VpnService; -import android.os.Build; -import android.os.Handler; -import android.os.Message; -import android.os.ParcelFileDescriptor; -import android.util.Log; -import android.widget.Toast; - -import com.runjva.sourceforge.jsocks.protocol.ProxyServer; -import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone; - -(a)TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - -public class OrbotVpnService extends VpnService implements Handler.Callback { - private static final String TAG = "OrbotVpnService"; - - private PendingIntent mConfigureIntent; - - private Handler mHandler; - private Thread mThreadVPN; - - private String mSessionName = "OrbotVPN"; - private ParcelFileDescriptor mInterface; - - private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; - - public static int sSocksProxyServerPort = -1; - public static String sSocksProxyLocalhost = null; - private ProxyServer mSocksProxyServer; - - - private final static int VPN_MTU = 1500; - - private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; - - //this is the actual DNS server we talk to over UDP or TCP (now using Tor's DNS port) - private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1"; - private final static int DEFAULT_ACTUAL_DNS_PORT = TorServiceConstants.TOR_DNS_PORT_DEFAULT; - - private boolean isRestart = false; - - - static{ - System.loadLibrary("tun2socks"); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - - if (intent != null) - { - String action = intent.getAction(); - - if (action.equals("start")) - { - - // Stop the previous session by interrupting the thread. - if (mThreadVPN == null || (!mThreadVPN.isAlive())) - { - Log.d(TAG,"starting OrbotVPNService service!"); - - mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); - - // The handler is only used to show messages. - if (mHandler == null) { - mHandler = new Handler(this); - } - - if (!mIsLollipop) - { - - startSocksBypass(); - } - - setupTun2Socks(); - } - } - else if (action.equals("stop")) - { - Log.d(TAG,"stop OrbotVPNService service!"); - - stopVPN(); - if (mHandler != null) - mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000); - } - else if (action.equals("refresh")) - { - Log.d(TAG,"refresh OrbotVPNService service!"); - - if (!mIsLollipop) - startSocksBypass(); - - if (!isRestart) - setupTun2Socks(); - } - } - - - return START_STICKY; - } - - private void startSocksBypass() - { - - new Thread () - { - - public void run () - { - - //generate the proxy port that the - if (sSocksProxyServerPort == -1) - { - try { - - sSocksProxyLocalhost = "127.0.0.1";// InetAddress.getLocalHost().getHostAddress(); - sSocksProxyServerPort = (int)((Math.random()*1000)+10000); - - } catch (Exception e) { - Log.e(TAG,"Unable to access localhost",e); - throw new RuntimeException("Unable to access localhost: " + e); - - } - - } - - - if (mSocksProxyServer != null) - { - stopSocksBypass (); - } - - try - { - mSocksProxyServer = new ProxyServer(new ServerAuthenticatorNone(null, null)); - ProxyServer.setVpnService(OrbotVpnService.this); - mSocksProxyServer.start(sSocksProxyServerPort, 5, InetAddress.getLocalHost()); - - } - catch (Exception e) - { - Log.e(TAG,"error getting host",e); - } - } - }.start(); - - } - - private synchronized void stopSocksBypass () - { - - if (mSocksProxyServer != null){ - mSocksProxyServer.stop(); - mSocksProxyServer = null; - } - - - } - - @Override - public void onCreate() { - super.onCreate(); - - // Set the locale to English (or probably any other language that^M - // uses Hindu-Arabic (aka Latin) numerals).^M - // We have found that VpnService.Builder does something locale-dependent^M - // internally that causes errors when the locale uses its own numerals^M - // (i.e., Farsi and Arabic).^M - Locale.setDefault(new Locale("en")); - - } - - - @Override - public void onDestroy() { - stopVPN(); - } - - private void stopVPN () - { - if (mIsLollipop) - stopSocksBypass (); - - if (mInterface != null){ - try - { - Log.d(TAG,"closing interface, destroying VPN interface"); - - mInterface.close(); - mInterface = null; - - } - catch (Exception e) - { - Log.d(TAG,"error stopping tun2socks",e); - } - catch (Error e) - { - Log.d(TAG,"error stopping tun2socks",e); - } - } - - Tun2Socks.Stop(); - - try { - TorServiceUtils.killProcess(OrbotApp.filePdnsd); - } catch (Exception e) { - e.printStackTrace(); - } - - mThreadVPN = null; - - - } - - @Override - public boolean handleMessage(Message message) { - if (message != null) { - Toast.makeText(this, message.what, Toast.LENGTH_SHORT).show(); - } - return true; - } - - - private synchronized void setupTun2Socks() { - - - if (mInterface != null) //stop tun2socks now to give it time to clean up - { - isRestart = true; - Tun2Socks.Stop(); - } - - mThreadVPN = new Thread () - { - - public void run () - { - try - { - - if (isRestart) - { - Log.d(TAG,"is a restart... let's wait for a few seconds"); - Thread.sleep(3000); - } - - //start PDNSD daemon pointing to OpenDNS - startDNS(DEFAULT_ACTUAL_DNS_HOST,DEFAULT_ACTUAL_DNS_PORT); - - final String vpnName = "OrbotVPN"; - final String localhost = "127.0.0.1"; - - final String virtualGateway = "10.10.10.1"; - final String virtualIP = "10.10.10.2"; - final String virtualNetMask = "255.255.255.0"; - final String dummyDNS = "8.8.8.8"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start - final String defaultRoute = "0.0.0.0"; - - final String localSocks = localhost + ':' - + String.valueOf(mTorSocks); - - final String localDNS = virtualGateway + ':' + "8091";//String.valueOf(TorServiceConstants.TOR_DNS_PORT_DEFAULT); - final boolean localDnsTransparentProxy = true; - - Builder builder = new Builder(); - - builder.setMtu(VPN_MTU); - builder.addAddress(virtualGateway,32); - - builder.setSession(vpnName); - - builder.addDnsServer(dummyDNS); - builder.addRoute(dummyDNS,32); - - //route all traffic through VPN (we might offer country specific exclude lists in the future) - builder.addRoute(defaultRoute,0); - - //handle ipv6 - //builder.addAddress("fdfe:dcba:9876::1", 126); - //builder.addRoute("::", 0); - - if (mIsLollipop) - doLollipopAppRouting(builder); - - // Create a new interface using the builder and save the parameters. - ParcelFileDescriptor newInterface = builder.setSession(mSessionName) - .setConfigureIntent(mConfigureIntent) - .establish(); - - if (mInterface != null) - { - Log.d(TAG,"Stopping existing VPN interface"); - mInterface.close(); - mInterface = null; - } - - mInterface = newInterface; - - Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , localDnsTransparentProxy); - - isRestart = false; - - } - catch (Exception e) - { - Log.d(TAG,"tun2Socks has stopped",e); - } - } - - }; - - mThreadVPN.start(); - } - - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - private void doLollipopAppRouting (Builder builder) throws NameNotFoundException - { - - ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); - - boolean perAppEnabled = false; - - for (TorifiedApp app : apps) - { - if (app.isTorified() && (!app.getPackageName().equals(getPackageName()))) - { - builder.addAllowedApplication(app.getPackageName()); - perAppEnabled = true; - } - - } - - if (!perAppEnabled) - builder.addDisallowedApplication(getPackageName()); - - } - - @Override - public void onRevoke() { - - Log.w(TAG,"VPNService REVOKED!"); - - if (!isRestart) - { - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - prefs.edit().putBoolean("pref_vpn", false).commit(); - stopVPN(); - } - - isRestart = false; - - super.onRevoke(); - } - - private void startDNS (String dns, int port) throws IOException, TimeoutException - { - makePdnsdConf(this, dns, port,OrbotApp.filePdnsd.getParentFile() ); - - ArrayList<String> customEnv = new ArrayList<String>(); - String baseDirectory = OrbotApp.filePdnsd.getParent(); - Shell shell = Shell.startShell(customEnv, baseDirectory); - - String cmdString = OrbotApp.filePdnsd.getCanonicalPath() + - " -c " + baseDirectory + "/pdnsd.conf"; - - SimpleCommand shellCommand = new SimpleCommand(cmdString); - - shell.add(shellCommand).waitForFinish(); - - Log.i(TAG,"PDNSD: " + shellCommand.getExitCode() + ": " + shellCommand.getOutput()); - - } - - public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException { - String conf = String.format(context.getString(R.string.pdnsd_conf), dns, port); - - File f = new File(fileDir,"pdnsd.conf"); - - if (f.exists()) { - f.delete(); - } - - FileOutputStream fos = new FileOutputStream(f, false); - PrintStream ps = new PrintStream(fos); - ps.print(conf); - ps.close(); - - //f.withWriter { out -> out.print conf }; - - - File cache = new File(fileDir,"pdnsd.cache"); - - if (!cache.exists()) { - try { - cache.createNewFile(); - } catch (Exception e) { - - } - } -} - - -}

1 0

[orbot/master] 15.1.3-beta
by n8fr8＠torproject.org 10 Mar '16

10 Mar '16

commit 6452075d46d7a6dd65d026dfeffcb190ff993198 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 9 14:51:25 2016 -0500 15.1.3-beta --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ce30100..9a80a30 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.2" - android:versionCode="15120000" + android:versionName="15.1.3-beta" + android:versionCode="15130000" android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>

1 0

[webwml/master] Attempt to fix the redirect crazyness
by sebastian＠torproject.org 10 Mar '16

10 Mar '16

commit 3621889b4ba451076d97912aadd289aa73b64614 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 20:50:46 2016 +0100 Attempt to fix the redirect crazyness --- .htaccess | 1 - projects/en/projects.wml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 0c13a77..73a8e95 100644 --- a/.htaccess +++ b/.htaccess @@ -29,7 +29,6 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] # Projects RewriteRule ^projects/$ /projects/projects [R=301,L] -RewriteRule ^projects/tormessenger(.*)$ https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger [R=301,L] # GetInvolved RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L] diff --git a/projects/en/projects.wml b/projects/en/projects.wml index 256f96f..b5c844b 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -43,10 +43,10 @@ interested in detailed statistics about Tor.</p> </div></div> <div class="projectbox"> -<a href="<page projects/tormessenger>"><img class="icon" +<a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger"><img class="icon" src="$(IMGROOT)/icon-TorMessenger.png" height="80px" alt="" width="75"></a> <div class="projectdesc"><div class="name"><a -href="<page projects/tormessenger>">Tor Messenger</a></div> +href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a></div> <p>Tor Messenger is a cross-platform chat program that aims to be secure by default and sends all of its traffic over Tor.</p> </div></div>

1 0

[webwml/master] try doing the tormessenger redirect at the htaccess level
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 676fa50c02ff61de78a9a08598cd2a3627cd4356 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 9 14:38:23 2016 -0500 try doing the tormessenger redirect at the htaccess level --- .htaccess | 1 + projects/en/tormessenger.wml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.htaccess b/.htaccess index 73a8e95..0c13a77 100644 --- a/.htaccess +++ b/.htaccess @@ -29,6 +29,7 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] # Projects RewriteRule ^projects/$ /projects/projects [R=301,L] +RewriteRule ^projects/tormessenger(.*)$ https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger [R=301,L] # GetInvolved RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L] diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml deleted file mode 100644 index b705140..0000000 --- a/projects/en/tormessenger.wml +++ /dev/null @@ -1,4 +0,0 @@ -#include "head.wmi" TITLE="Redirecting" REDIRECT="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger" - -#include <foot.wmi> -

1 0

[webwml/staging] Adding 'IP hijacking' project idea
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 66eb29a2b8bf349c69dbd33a59db2d99e89e8eea Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 8 08:35:41 2016 -0800 Adding 'IP hijacking' project idea Idea from Aaron, Donncha and Yawnbox. Aaron is the only person that spoke up volunteering to mentor but might be worth nudging the others if we get students. --- getinvolved/en/volunteer.wml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 6748023..88b6e0d 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1453,6 +1453,46 @@ implementation. </li> </ol> </li> + + <a id="ipHijacking"></a> + <li> + <b>IP hijacking detection for the Tor Network</b> + <br> + Likely Mentors: <i>Aaron Gibson (aagbsn)</i> + <br><br> + <p> + <a href="https://en.wikipedia.org/wiki/IP_hijacking">IP hijacking</a> + occurs when a bad actor creates false routing information to redirect + Internet traffic to or through themselves. This activity is straightforward + to detect, because the Internet routing tables are public information, but + currently there are no public services that monitor the Tor network. The + Tor Network is a dynamic set of relays, so monitoring must be Tor-aware in + order to keep the set of monitored relays accurate. Additionally, consensus + archives and historical Internet routing table snapshots are publicly + available, and this analysis can be performed retroactively. + </p> + + <p> + The implications of IP hijacking are that Tor traffic can be redirected + through a network that an attacker controls, even if the attacker does not + normally have this capability - i.e. they are not in the network path. For + example, an adversary could hijack the prefix of a Tor Guard relay, in + order to learn who its clients are, or hijack a Tor Exit relay to tamper + with requests or name resolution. + </p> + + <p> + This project comprises building a service that compares network prefixes of + relays in the consensus with present and historic routing table snapshots + from looking glass services such as <a + href="http://routeviews.org">Routeviews</a>, or aggregators such as <a + href="https://bgpstream.caida.org">Caida BGPStream</a> and then issues + email alerts to the contact-info in the relay descriptor and a mailing + list. Network operators are responsive to route injections, and these + alerts can be used to notify network operators to take immediate action, as + well as collect information about the occurrence of these type of attacks. + </p> + </li> <!-- <a id=""></a> <li>

1 0

[webwml/staging] Update Contact page
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit ac07dca0fe67c5f8a88ec1da7ee2e25fe33a1205 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Mar 9 08:08:18 2016 -0500 Update Contact page - Remove references to RT until we have the support desk back - Remove the phone number for press queries since it is no longer active - Stop advertising the #nottor channel --- about/en/contact.wml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 7f0bfe7..60d859c 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -22,6 +22,7 @@ <li><a href="#security">Security Issues</a></li> </ul> +  <a id="email"></a> <h3><a class="anchor" href="#email">Email</a></h3> - Please email <ew>help(a)rt.torproject.org</em> for general questions. +  <ul> <li><i>tor-talk(a)lists.torproject.org</i> is for all discussion @@ -79,8 +81,6 @@ <li><i>#tor-project</i> - Organization discussions unrelated to software development. A great place to discuss Tor community events, outreach, translation, or website improvements.</li> - <li><i>#nottor</i> - This is where Tor people hang out to talk about - stuff that is not related to Tor.</li> </ul> <a id="twitter"></a> @@ -100,8 +100,6 @@ <em>help(a)rt.torproject.org</em>. Technical support phone calls are not returned.</p> - <p>For press inquiries only, please call +1-617-902-0208.</p> - <a id="mail"></a> <h3><a class="anchor" href="#mail">Mailing Address</a></h3> <p>Should you need to reach us via old reliable mail, our mailing

1 0

[webwml/staging] Drop another reference to OPW
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 8c266971af356c1fc0226a9ff10cd85a1215029e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 9 08:19:43 2016 -0800 Drop another reference to OPW We're not taking part in it and even if we were, iirc it goes by another name now. --- getinvolved/en/volunteer.wml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 88b6e0d..93c1239 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -826,14 +826,12 @@ meetings around the world.</li> <p> You may find some of these projects to be good ideas for <a href="<page - about/gsoc>">Google Summer of Code</a> and the <a - href="https://live.gnome.org/OutreachProgramForWomen">Outreach Program for - Women</a>. We have labelled each idea with which of our <a href="<page - about/corepeople>">core developers</a> would be good mentors. If one or - more of these ideas looks promising to you, please <a href="<page - about/contact>">contact us</a> to discuss your plans rather than sending - blind applications. You may also want to propose your own project idea - — which often results in the best applications. + about/gsoc>">Google Summer of Code</a>. We have labelled each idea with + which of our <a href="<page about/corepeople>">core developers</a> would be + good mentors. If one or more of these ideas looks promising to you, please + <a href="<page about/contact>">contact us</a> to discuss your plans rather + than sending blind applications. You may also want to propose your own + project idea — which often results in the best applications. </p> <ol>

1 0

[webwml/staging] Add new Tor Browser versions: 5.5.3, 6.0a3
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 7de1f92ffee74b1692edbcf217a1136d18ee04c5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 8 19:34:42 2016 +0100 Add new Tor Browser versions: 5.5.3, 6.0a3 --- include/versions.wmi | 46 +++++++++++++++--------------- projects/torbrowser/RecommendedTBBVersions | 12 +++++++- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index bc0041e..88ddb98 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,29 +4,29 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.5.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a2</define-tag> - -<define-tag version-torbrowserbundle whitespace=delete>5.5.2</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2016-02-12</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a2</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-02-5</define-tag> - -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-02-12</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-02-12</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-02-5</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-02-5</define-tag> - -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.2</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-02-12</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.2</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-02-12</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a2</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-02-5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5.3</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a3</define-tag> + +<define-tag version-torbrowserbundle whitespace=delete>5.5.3</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a3</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-08</define-tag> + +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-08</define-tag> + +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.3</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.3</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a3</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-08</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 17aaaff..aff56d1 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,20 @@ "5.5.2-Linux", "5.5.2-MacOS", "5.5.2-Windows", +"5.5.3", +"5.5.3-Linux", +"5.5.3-MacOS", +"5.5.3-Windows", "6.0a2", "6.0a2-Linux", "6.0a2-MacOS", "6.0a2-Windows", +"6.0a3", +"6.0a3-Linux", +"6.0a3-MacOS", +"6.0a3-Windows", "6.0a2-hardened", -"6.0a2-hardened-Linux" +"6.0a2-hardened-Linux", +"6.0a3-hardened", +"6.0a3-hardened-Linux" ]

1 0

[webwml/staging] put a footer on the tormessenger redirect
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 9f831c028cfd811624b8d8c67ed6e0dd60d655ba Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 9 14:19:46 2016 -0500 put a footer on the tormessenger redirect --- projects/en/tormessenger.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml index 1bc472b..b705140 100644 --- a/projects/en/tormessenger.wml +++ b/projects/en/tormessenger.wml @@ -1 +1,4 @@ #include "head.wmi" TITLE="Redirecting" REDIRECT="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger" + +#include <foot.wmi> +

1 0

[webwml/staging] Add placeholder for Tor Messenger page
by arma＠torproject.org 10 Mar '16

10 Mar '16

commit 0a5b94273f750562224a42f6ef599f78d2bfd610 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jan 19 15:02:51 2016 -0500 Add placeholder for Tor Messenger page --- projects/en/tormessenger.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml new file mode 100644 index 0000000..e69de29

1 0