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

[orbot/master] clarify vpnprotect code and add basic debug log
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 4c49822861e746b0c47c79afe288cb9a5349e187 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 2 16:20:26 2015 -0500 clarify vpnprotect code and add basic debug log --- .../sourceforge/jsocks/protocol/ProxyServer.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java b/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java index 739feb8..44f7a50 100644 --- a/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java +++ b/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java @@ -12,11 +12,11 @@ import java.net.InetSocketAddress; import java.net.NoRouteToHostException; import java.net.ServerSocket; import java.net.Socket; -import java.net.SocketAddress; import java.nio.channels.SocketChannel; import android.annotation.SuppressLint; import android.net.VpnService; +import android.util.Log; import com.runjva.sourceforge.jsocks.server.ServerAuthenticator; @@ -352,9 +352,8 @@ public class ProxyServer implements Runnable { Socket s; if (proxy == null) { - //s = new Socket(msg.ip, msg.port); - s= SocketChannel.open().socket(); + s = SocketChannel.open().socket(); if ((null != s) && (null != vpnService)) { vpnService.protect(s); } @@ -363,10 +362,11 @@ public class ProxyServer implements Runnable { } else { s = new SocksSocket(proxy, msg.ip, msg.port); + + if (vpnService != null) + vpnService.protect(s); } - if (vpnService != null) - vpnService.protect(s); debug("Connected to " + s.getInetAddress() + ":" + s.getPort()); @@ -667,26 +667,29 @@ public class ProxyServer implements Runnable { public static void debug (String msg) { - + Log.d("Proxy",msg); } public static void debug (String msg, String host, int port) { - + debug (msg); } public static void debug (String msg, Exception e) { - + + debug (msg); } public static void debug (String msg, InetAddress addr, int port) { - + + debug (msg); } public static void debug (String msg, int type, String log) { - + + debug (msg); } }

1 0

[orbot/master] more clean-up of VPN service code
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit fb3e27bdcf0d0e3f361100f4465bf154a8b312ec Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 2 16:21:04 2015 -0500 more clean-up of VPN service code --- src/org/torproject/android/service/TorService.java | 12 ++++---- .../android/service/TorServiceConstants.java | 3 +- .../torproject/android/vpn/OrbotVpnService.java | 29 +++++--------------- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 423f62c..60f151c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -81,7 +81,7 @@ import android.widget.RemoteViews; public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler { - public static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = true; private int mCurrentStatus = STATUS_OFF; @@ -381,7 +381,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst }else if (action.equals(CMD_UPDATE)){ processSettings(); }else if (action.equals(CMD_VPN)){ - startVpnService(); + enableVpnProxy(); + } + else if (action.equals(CMD_VPN_CLEAR)){ + clearVpnProxy(); } } }else{ @@ -1416,8 +1419,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - public void startVpnService () { + public void enableVpnProxy () { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); Editor ePrefs = prefs.edit(); @@ -1435,7 +1437,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void stopVpnService () + public void clearVpnProxy () { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); Editor ePrefs = prefs.edit(); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index d979ac4..4c3adc9 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -82,11 +82,10 @@ public interface TorServiceConstants { public static final String CMD_NEWNYM = "newnym"; public static final String CMD_INIT = "init"; public static final String CMD_VPN = "vpn"; + public static final String CMD_VPN_CLEAR = "vpnclear"; public static final String CMD_UPDATE = "update"; - - public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE-polipofix"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 22a8af1..427799e 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -18,6 +18,7 @@ package org.torproject.android.vpn; import java.io.IOException; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Locale; import org.torproject.android.service.TorServiceConstants; @@ -56,20 +57,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private final static int VPN_MTU = 1500; - private static final int NOTIFY_ID = 10; - private static final int TRANSPROXY_NOTIFY_ID = 20; - private static final int ERROR_NOTIFY_ID = 30; - private static final int HS_NOTIFY_ID = 40; - - private boolean prefPersistNotifications = true; - - private NotificationManager mNotificationManager = null; - private android.support.v4.app.NotificationCompat.Builder mNotifyBuilder; - private Notification mNotification; - private boolean mShowExpandedNotifications = false; - private boolean mNotificationShowing = false; - - @Override public int onStartCommand(Intent intent, int flags, int startId) { @@ -101,6 +88,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { else { //do socks bypass trick + startSocksBypass(); } } @@ -165,23 +153,20 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { String vpnName = "OrbotVPN"; String virtualGateway = "10.0.0.1"; - String virtualRoute = "10.0.0.0"; String virtualIP = "10.0.0.2"; - String virtualNetMask = "255.255.2555.0"; - String localSocks = "localhost:" + TorServiceConstants.PORT_SOCKS_DEFAULT; - String localDNS = "localhost:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; + String virtualNetMask = "255.255.255.0"; + String localSocks = "127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT; + String localDNS = "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; Builder builder = new Builder(); builder.setMtu(VPN_MTU); - builder.addAddress(virtualGateway,8); + builder.addAddress(virtualGateway,28); builder.setSession(vpnName); - builder.addRoute("0.0.0.0",0); - builder.addRoute(virtualRoute,8); + builder.addRoute("0.0.0.0",0); - //builder.addDnsServer("8.8.8.8"); // Create a new interface using the builder and save the parameters. mInterface = builder.setSession(mSessionName)

1 0

[orbot/master] clean VPN proxy settings before startup
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 9467d7db275fe575e5b230f7c3c6b1f026c364b4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 12:36:42 2015 -0500 clean VPN proxy settings before startup --- src/org/torproject/android/service/TorService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 60f151c..a20a227 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -368,7 +368,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (action!=null){ if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals(CMD_START)){ - setTorProfile(STATUS_ON); + clearVpnProxy(); + setTorProfile(STATUS_ON); }else if (action.equals(CMD_STOP)){ setTorProfile(STATUS_OFF); }else if (action.equals(CMD_INIT)){ @@ -1440,8 +1441,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void clearVpnProxy () { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - Editor ePrefs = prefs.edit(); - + Editor ePrefs = prefs.edit(); ePrefs.remove("pref_proxy_type"); ePrefs.remove("pref_proxy_host"); ePrefs.remove("pref_proxy_port");

1 0

[orbot/master] clean up VPNBuilder setup code
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 08c220f88edd1f23d6df6314ce030ee9e6322096 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 11:55:36 2015 -0500 clean up VPNBuilder setup code --- .../torproject/android/vpn/OrbotVpnService.java | 63 ++++++++++---------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 427799e..315ace8 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -144,37 +144,40 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { { if (mInterface == null) { - // 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")); - - String vpnName = "OrbotVPN"; - String virtualGateway = "10.0.0.1"; - String virtualIP = "10.0.0.2"; - String virtualNetMask = "255.255.255.0"; - String localSocks = "127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT; - String localDNS = "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; - - - Builder builder = new Builder(); - - builder.setMtu(VPN_MTU); - builder.addAddress(virtualGateway,28); - builder.setSession(vpnName); - - builder.addRoute("0.0.0.0",0); - - - // Create a new interface using the builder and save the parameters. - mInterface = builder.setSession(mSessionName) - .setConfigureIntent(mConfigureIntent) - .establish(); - - try + try { + + // 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")); + + String localhost = InetAddress.getLocalHost().getHostAddress(); + + String vpnName = "OrbotVPN"; + String virtualGateway = "10.0.0.1"; + String virtualIP = "10.0.0.2"; + String virtualNetMask = "255.255.255.0"; + String localSocks = localhost + ':' + TorServiceConstants.PORT_SOCKS_DEFAULT; + String localDNS = localhost + ':' + TorServiceConstants.TOR_DNS_PORT_DEFAULT; + + + Builder builder = new Builder(); + + builder.setMtu(VPN_MTU); + builder.addAddress(virtualGateway,28); + builder.setSession(vpnName); + builder.addRoute("0.0.0.0",0); + builder.addDnsServer("8.8.8.8"); + + // Create a new interface using the builder and save the parameters. + mInterface = builder.setSession(mSessionName) + .setConfigureIntent(mConfigureIntent) + .establish(); + + Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , true); } catch (Exception e)

1 0

[orbot/master] remove unneeded alt manifests, fix bug in main manifest
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 8dc274852043d08e52468a2eb324b1ad17b977ff Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 11:57:07 2015 -0500 remove unneeded alt manifests, fix bug in main manifest --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9a330d4..88f5885 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -90,7 +90,7 @@ <activity android:name=".ui.LotsaText" android:exported="false"/> <activity android:name=".ui.TipsAndTricks" android:exported="false"/> - <activity android:name=".ui.ChooseLocaleWizardActivitycaleWizardActivity" android:exported="false"/> + <activity android:name=".ui.ChooseLocaleWizardActivity" android:exported="false"/> <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/>

1 0

[orbot/master] add in basic debug output
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 91a72ef5d126dd4458e62c3b6e6d74806afa4bcb Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 11:55:23 2015 -0500 add in basic debug output --- src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java b/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java index 44f7a50..2da1760 100644 --- a/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java +++ b/src/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java @@ -672,24 +672,24 @@ public class ProxyServer implements Runnable { public static void debug (String msg, String host, int port) { - debug (msg); + debug (msg + ": " + host + ":" + port); } public static void debug (String msg, Exception e) { - debug (msg); + Log.e("Proxy",msg,e); } public static void debug (String msg, InetAddress addr, int port) { - debug (msg); + debug (msg + ": " + addr.getHostAddress() + ": " + port); } public static void debug (String msg, int type, String log) { - debug (msg); + debug (msg + " type:" + type + "=" + log); } }

1 0

[orbot/master] update VPN to toggle button
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit ec4350ee40da84a54db0b3e5d6eb62ed8cf45293 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 14:55:42 2015 -0500 update VPN to toggle button --- res/layout/layout_main.xml | 6 +++--- src/org/torproject/android/OrbotMainActivity.java | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index b060ce9..7abd037 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -170,12 +170,12 @@ android:text="Open Browser" /> - <Button + <ToggleButton android:id="@+id/btnVPN" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Start VPN" - + android:textOff="VPN Off" + android:textOn="VPN On" /> </LinearLayout> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e10c89c..2b4e9d3 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -58,6 +58,7 @@ import android.view.animation.AccelerateInterpolator; import android.widget.Button; import android.widget.TextView; import android.widget.Toast; +import android.widget.ToggleButton; public class OrbotMainActivity extends Activity implements TorConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener @@ -73,8 +74,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC private TextView mTxtOrbotLog = null; private Button mBtnBrowser = null; - private Button mBtnVPN = null; - + private ToggleButton mBtnVPN = null; + private DrawerLayout mDrawer; private ActionBarDrawerToggle mDrawerToggle; private Toolbar mToolbar; @@ -246,14 +247,17 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC }); - mBtnVPN = (Button)findViewById(R.id.btnVPN); + mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN); mBtnVPN.setOnClickListener(new View.OnClickListener () { @Override public void onClick(View v) { - startVpnService(); + if (mBtnVPN.isChecked()) + startVpnService(); + else + stopVpnService(); } @@ -807,6 +811,11 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC } } + + public void stopVpnService () + { + startService(TorServiceConstants.CMD_VPN_CLEAR); + } private boolean flushTransProxy () {

1 0

[orbot/master] add back in log output temporarily in sidebar
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 5cb6cb930d5d5d859c9427300f4758e13d984882 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 12:36:24 2015 -0500 add back in log output temporarily in sidebar --- res/layout/layout_main.xml | 55 +++++---------------- src/org/torproject/android/OrbotMainActivity.java | 19 +++++-- 2 files changed, 26 insertions(+), 48 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index ae04937..b060ce9 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -182,48 +182,17 @@ </LinearLayout> </LinearLayout> <LinearLayout - android:layout_width="240dp" + android:layout_width="320dp" android:layout_height="match_parent" android:orientation="vertical" android:id="@+id/left_drawer" - android:layout_gravity="start" - android:background="@color/panel_background" + android:layout_gravity="start" + android:background="#333333" > - </LinearLayout> - - </android.support.v4.widget.DrawerLayout> - -</LinearLayout> - -  + </LinearLayout> + + </android.support.v4.widget.DrawerLayout> + +</LinearLayout> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 591fb60..e10c89c 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -70,6 +70,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC private TextView downloadText = null; private TextView uploadText = null; + private TextView mTxtOrbotLog = null; + private Button mBtnBrowser = null; private Button mBtnVPN = null; @@ -211,6 +213,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC setupMenu(); + mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); + lblStatus = (TextView)findViewById(R.id.lblStatus); lblStatus.setOnLongClickListener(this); imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); @@ -889,10 +893,13 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); + if (lblStatus != null && torServiceMsg != null) + if (torServiceMsg.indexOf('%')!=-1) + lblStatus.setText(torServiceMsg); if (torServiceMsg != null && torServiceMsg.length() > 0) { - // appendLogTextAndScroll(torServiceMsg); + mTxtOrbotLog.append(torServiceMsg + '\n'); } boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); @@ -930,9 +937,11 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC if (torServiceMsg.indexOf('%')!=-1) lblStatus.setText(torServiceMsg); - //appendLogTextAndScroll(torServiceMsg); - - + if (torServiceMsg != null && torServiceMsg.length() > 0) + { + mTxtOrbotLog.append(torServiceMsg + '\n'); + } + } else if (torStatus == TorServiceConstants.STATUS_OFF) { @@ -960,7 +969,7 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC startService (TorServiceConstants.CMD_START); torStatus = TorServiceConstants.STATUS_CONNECTING; -// mTxtOrbotLog.setText(""); + mTxtOrbotLog.setText(""); //here we update the UI which is a bit sloppy and mixed up code wise //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense

1 0

[orbot/master] remove unused alt manifests
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 17f2a0bdacddc8e2fd699dfa9e245aec8fd4a083 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 12:37:04 2015 -0500 remove unused alt manifests --- AndroidManifest.KITKAT_AND_LOWER.xml | 132 ---------------------------------- AndroidManifest.LOLLIPOP.xml | 132 ---------------------------------- 2 files changed, 264 deletions(-) diff --git a/AndroidManifest.KITKAT_AND_LOWER.xml b/AndroidManifest.KITKAT_AND_LOWER.xml deleted file mode 100644 index 5ba968d..0000000 --- a/AndroidManifest.KITKAT_AND_LOWER.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" - android:versionName="14.1.4-noPIE" - android:versionCode="132" - android:installLocation="auto" - > - - <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/> - <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> - <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> - - <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:description="@string/app_description" - android:configChanges="locale|orientation|screenSize" - android:theme="@style/CustomActionBarTheme" - android:allowBackup="false" - android:allowClearUserData="true" - android:persistent="true" - android:stopWithTask="false" - android:largeHeap="false" - > - - <activity android:name=".Orbot" - android:configChanges="orientation|screenSize" - android:excludeFromRecents="true" - android:launchMode="singleTop" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <data android:scheme="bridge" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - -  - - </activity> - -  - <activity - android:name=".service.DummyActivity" - android:theme="@android:style/Theme.NoDisplay" - android:enabled="true" - android:allowTaskReparenting="true" - android:noHistory="true" - android:excludeFromRecents="true" - android:alwaysRetainTaskState="false" - android:stateNotNeeded="true" - android:clearTaskOnLaunch="true" - android:finishOnTaskLaunch="true" - /> - - - <activity android:name=".wizard.LotsaText" android:exported="false"/> - <activity android:name=".wizard.Permissions" android:exported="false"/> - <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> - <activity android:name=".wizard.ConfigureTransProxy" android:exported="false"/> - <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> - - <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".settings.AppManager" android:label="@string/app_name"/> - - <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - <receiver android:name=".OnBootReceiver"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.MEDIA_MOUNTED"/> - </intent-filter> - </receiver> - - - <service android:name="org.torproject.android.vpn.OrbotVpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService"/> - </intent-filter> - </service> - - </application> - - -</manifest> diff --git a/AndroidManifest.LOLLIPOP.xml b/AndroidManifest.LOLLIPOP.xml deleted file mode 100644 index 70841f4..0000000 --- a/AndroidManifest.LOLLIPOP.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" - android:versionName="14.1.4-PIE" - android:versionCode="133" - android:installLocation="auto" - > - - <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/> - <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> - <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> - - <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:description="@string/app_description" - android:configChanges="locale|orientation|screenSize" - android:theme="@style/CustomActionBarTheme" - android:allowBackup="false" - android:allowClearUserData="true" - android:persistent="true" - android:stopWithTask="false" - android:largeHeap="false" - > - - <activity android:name=".Orbot" - android:configChanges="orientation|screenSize" - android:excludeFromRecents="true" - android:launchMode="singleTop" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <data android:scheme="bridge" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - -  - - </activity> - -  - <activity - android:name=".service.DummyActivity" - android:theme="@android:style/Theme.NoDisplay" - android:enabled="true" - android:allowTaskReparenting="true" - android:noHistory="true" - android:excludeFromRecents="true" - android:alwaysRetainTaskState="false" - android:stateNotNeeded="true" - android:clearTaskOnLaunch="true" - android:finishOnTaskLaunch="true" - /> - - - <activity android:name=".wizard.LotsaText" android:exported="false"/> - <activity android:name=".wizard.Permissions" android:exported="false"/> - <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> - <activity android:name=".wizard.ConfigureTransProxy" android:exported="false"/> - <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> - - <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".settings.AppManager" android:label="@string/app_name"/> - - <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - <receiver android:name=".OnBootReceiver"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.MEDIA_MOUNTED"/> - </intent-filter> - </receiver> - - - <service android:name="org.torproject.android.vpn.OrbotVpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService"/> - </intent-filter> - </service> - - </application> - - -</manifest>

1 0

[orbot/master] enable local DNS listen on 10.0.0.1 for VPN service
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 1852cde041851b0529ef50a110a74a029bd97b02 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 14:55:57 2015 -0500 enable local DNS listen on 10.0.0.1 for VPN service also add support for stopping VPNBuilder instance --- src/org/torproject/android/service/TorService.java | 27 ++++++++-- .../torproject/android/vpn/OrbotVpnService.java | 55 ++++++++++++++------ 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a20a227..b287975 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -141,6 +141,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean mTransProxyTethering = false; private boolean mTransProxyNetworkRefresh = false; + private boolean mUseVPN = false; + private ExecutorService mExecutor = Executors.newFixedThreadPool(1); public void debug(String msg) @@ -368,7 +370,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (action!=null){ if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals(CMD_START)){ - clearVpnProxy(); setTorProfile(STATUS_ON); }else if (action.equals(CMD_STOP)){ setTorProfile(STATUS_OFF); @@ -381,7 +382,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst flushTransparentProxyRules(); }else if (action.equals(CMD_UPDATE)){ processSettings(); - }else if (action.equals(CMD_VPN)){ + }else if (action.equals(CMD_VPN)){ enableVpnProxy(); } else if (action.equals(CMD_VPN_CLEAR)){ @@ -1422,6 +1423,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void enableVpnProxy () { + debug ("enabling VPN Proxy"); + + mUseVPN = true; + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); Editor ePrefs = prefs.edit(); @@ -1434,12 +1439,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettings(); Intent intent = new Intent(TorService.this, OrbotVpnService.class); + intent.setAction("start"); startService(intent); + } public void clearVpnProxy () - { + { + debug ("clearing VPN Proxy"); + + mUseVPN = false; + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); Editor ePrefs = prefs.edit(); ePrefs.remove("pref_proxy_type"); @@ -1449,6 +1460,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst ePrefs.remove("pref_proxy_password"); ePrefs.commit(); processSettings(); + + Intent intent = new Intent(TorService.this, OrbotVpnService.class); + intent.setAction("stop"); + startService(intent); } @@ -2314,6 +2329,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst updateConfiguration("HiddenServiceDir","", false); } + + if (mUseVPN) + { + updateConfiguration("DNSListenAddress","10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); + } + saveConfiguration(); diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 315ace8..c53d288 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -41,7 +41,7 @@ import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone; @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class OrbotVpnService extends VpnService implements Handler.Callback { - private static final String TAG = "DrobotVpnService"; + private static final String TAG = "OrbotVpnService"; private PendingIntent mConfigureIntent; @@ -60,20 +60,32 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { @Override public int onStartCommand(Intent intent, int flags, int startId) { - // The handler is only used to show messages. - if (mHandler == null) { - mHandler = new Handler(this); - } - - // Stop the previous session by interrupting the thread. - if (mThreadVPN == null || (!mThreadVPN.isAlive())) - { - enableAppRouting (); - setupTun2Socks(); - } + String action = intent.getAction(); + + if (action.equals("start")) + { + Log.d(TAG,"starting OrbotVPNService service!"); + + // The handler is only used to show messages. + if (mHandler == null) { + mHandler = new Handler(this); + } + + // Stop the previous session by interrupting the thread. + if (mThreadVPN == null || (!mThreadVPN.isAlive())) + { + enableAppRouting (); + setupTun2Socks(); + } + } + else if (action.equals("stop")) + { + stopVPN(); + mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000); + } - return START_STICKY; + return START_NOT_STICKY; } private void enableAppRouting () @@ -113,12 +125,21 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { @Override public void onDestroy() { + stopVPN(); + + } + + private void stopVPN () + { if (mProxyServer != null){ mProxyServer.stop(); + mProxyServer = null; } if (mInterface != null){ try { + Log.d(TAG,"closing interface, destroying VPN interface"); mInterface.close(); + mInterface = null; } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -154,14 +175,14 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { // (i.e., Farsi and Arabic).^M Locale.setDefault(new Locale("en")); - String localhost = InetAddress.getLocalHost().getHostAddress(); + //String localhost = InetAddress.getLocalHost().getHostAddress(); String vpnName = "OrbotVPN"; String virtualGateway = "10.0.0.1"; String virtualIP = "10.0.0.2"; String virtualNetMask = "255.255.255.0"; - String localSocks = localhost + ':' + TorServiceConstants.PORT_SOCKS_DEFAULT; - String localDNS = localhost + ':' + TorServiceConstants.TOR_DNS_PORT_DEFAULT; + String localSocks = "127.0.0.1" + ':' + TorServiceConstants.PORT_SOCKS_DEFAULT; + String localDNS = "10.0.0.1" + ':' + TorServiceConstants.TOR_DNS_PORT_DEFAULT; Builder builder = new Builder(); @@ -170,7 +191,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { builder.addAddress(virtualGateway,28); builder.setSession(vpnName); builder.addRoute("0.0.0.0",0); - builder.addDnsServer("8.8.8.8"); + // builder.addDnsServer("8.8.8.8"); // Create a new interface using the builder and save the parameters. mInterface = builder.setSession(mSessionName)

1 0