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

[orbot/master] update build path for tun2socks
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit ab8f8f12f9a35299d2883da4761c4691846c471d Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 12:23:34 2015 -0400 update build path for tun2socks --- jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/Android.mk b/jni/Android.mk index f8ca80f..4eb1e78 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,3 +1,3 @@ ##include ../OriginalDest/Android.mk -include ./external/badvpn_dns/Android.mk +include ./external/badvpn/Android.mk ##include ../kalium-jni/jni/Android.mk

1 0

[orbot/master] fix JNI build info
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit a2e84b8ea07d50f08732f6b6e016ad2563511d03 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 12:59:07 2015 -0400 fix JNI build info --- jni/Application.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jni/Application.mk b/jni/Application.mk index 512556b..d4d6c44 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1 +1,3 @@ +APP_OPTIM := release APP_ABI := armeabi armeabi-v7a +APP_PLATFORM := android-14

1 0

[orbot/master] remove browser view handlers in manifest
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 398ff17e1953e29ef212002e99063f9b6fa5df51 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 12:28:59 2015 -0400 remove browser view handlers in manifest --- AndroidManifest.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 18e13c3..8555e96 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -13,11 +13,9 @@ android:protectionLevel="signature"/> <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <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" /> - <application android:name="org.torproject.android.OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" @@ -40,13 +38,7 @@ <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" />

1 0

[orbot/master] update tun2socks binaries
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit b318e6bb69ac8abf1c6114a5100b5e8958183410 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 13:01:21 2015 -0400 update tun2socks binaries --- libs/armeabi-v7a/libtun2socks.so | Bin 117192 -> 117192 bytes libs/armeabi/libtun2socks.so | Bin 125376 -> 125376 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so index 2ac9336..9e0c5af 100755 Binary files a/libs/armeabi-v7a/libtun2socks.so and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so index 91689fa..6231024 100755 Binary files a/libs/armeabi/libtun2socks.so and b/libs/armeabi/libtun2socks.so differ

1 0

[orbot/master] update CHANGELOG for v15 beta 1
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 627b04807b1f75a091789fafd47cad6c4b94a58b Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 13:02:57 2015 -0400 update CHANGELOG for v15 beta 1 --- CHANGELOG | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f686a99..4f62ed9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,33 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.0.0 Beta 1 / 3-Apr-2015 / 989d43aca7d999c413ba23ae4ebdcac72fb0f9c5 **/ + +6fd6a5a tune first-time experience (No more wizard!) +b318e6b update tun2socks binaries +cd303bd commit to latest dev head +a2e84b8 fix JNI build info +398ff17 remove browser view handlers in manifest +75426bb Improve VPN service support - fix network switching handling We now refresh the VPN and tun2socks interfaces when the network +d14dabb update tun2socks shared libraries +6d15a46 update jni build documents +ab8f8f1 update build path for tun2socks +7774ca3 remove old embedded badvpn_dns +2724551 tag badvpn to latest +39ce7f1 improved clean-up, shutdown of Tun2Socks and VPN service +b1d46e2 use getbridge email instead of web, as it makes more sense for users in censored/filtered locations to send an email than to a +9d83a5b update app vpn warning +26aeb67 updating string resources / localizations +7dd4949 update jsocks with reduced debug output +8493259 new helper activities for Apps and Bridge setup +150488d fixes for onboot logic and handling +8c5b38e more UI clean-up, removing old wizard code +7b830a0 remove HTTP proxy for VPN - not needed anymore! +6a7c593 a little bit of code re-org and new package for wizard +1a66924 update ant build for new external jsocks +9393928 add jsocks external modules and project +e30c78b remove jsocks from main code and move to external/jsocks +784c1c1 peg external to jsocks commit + /** 15.0.0 Alpha 5 / 19-Mar-2015 / b7aa69c **/ 2d5ee42 calling stop() makes tun2socks crash since VPN is still enabled

1 0

[orbot/master] commit to latest dev head
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit cd303bd48a87fda5fc072ed11a3b82672d1aff4f Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 13:01:11 2015 -0400 commit to latest dev head --- external/badvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/badvpn b/external/badvpn index baf4dda..1359c04 160000 --- a/external/badvpn +++ b/external/badvpn @@ -1 +1 @@ -Subproject commit baf4dda0dcf844d310ef6ae74c1b821336df8437 +Subproject commit 1359c04fe9d075ecdad4c9d3e2b81cf9b653da2c

1 0

[orbot/master] v15.0.0 beta 1
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 989d43aca7d999c413ba23ae4ebdcac72fb0f9c5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 3 13:02:00 2015 -0400 v15.0.0 beta 1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8555e96..1041e6a 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.0.0-alpha-5" - android:versionCode="15005" + android:versionName="15.0.0-beta-1" + android:versionCode="15100" android:installLocation="auto" >

1 0

[orbot/master] update jsocks with reduced debug output
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 7dd494932dacf96777775d5f0b257fcb13032118 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 2 23:17:33 2015 -0400 update jsocks with reduced debug output --- external/jsocks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/jsocks b/external/jsocks index 9d0d2e7..9ae7520 160000 --- a/external/jsocks +++ b/external/jsocks @@ -1 +1 @@ -Subproject commit 9d0d2e77f0bdb786bbc0fe5eaee3d762b232f2a2 +Subproject commit 9ae7520508d37a2b7fbb8477871f8f2c2a0a3b3d

1 0

[orbot/master] remove HTTP proxy for VPN - not needed anymore!
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 7b830a0df48fe94d768664df138451f111480e73 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Mar 28 00:41:06 2015 -0400 remove HTTP proxy for VPN - not needed anymore! --- src/org/torproject/android/vpn/HttpProxy.java | 636 ------------------------- 1 file changed, 636 deletions(-) diff --git a/src/org/torproject/android/vpn/HttpProxy.java b/src/org/torproject/android/vpn/HttpProxy.java deleted file mode 100644 index ac62786..0000000 --- a/src/org/torproject/android/vpn/HttpProxy.java +++ /dev/null @@ -1,636 +0,0 @@ -package org.torproject.android.vpn; -/*  <pre> */ -/* - * This is a simple multi-threaded Java proxy server - * for HTTP requests (HTTPS doesn't seem to work, because - * the CONNECT requests aren't always handled properly). - * I implemented the class as a thread so you can call it - * from other programs and kill it, if necessary (by using - * the closeSocket() method). - * - * We'll call this the 1.1 version of this class. All I - * changed was to separate the HTTP header elements with - * \r\n instead of just \n, to comply with the official - * HTTP specification. - * - * This can be used either as a direct proxy to other - * servers, or as a forwarding proxy to another proxy - * server. This makes it useful if you want to monitor - * traffic going to and from a proxy server (for example, - * you can run this on your local machine and set the - * fwdServer and fwdPort to a real proxy server, and then - * tell your browser to use "localhost" as the proxy, and - * you can watch the browser traffic going in and out). - * - * One limitation of this implementation is that it doesn't - * close the ProxyThread socket if the client disconnects - * or the server never responds, so you could end up with - * a bunch of loose threads running amuck and waiting for - * connections. As a band-aid, you can set the server socket - * to timeout after a certain amount of time (use the - * setTimeout() method in the ProxyThread class), although - * this can cause false timeouts if a remote server is simply - * slow to respond. - * - * Another thing is that it doesn't limit the number of - * socket threads it will create, so if you use this on a - * really busy machine that processed a bunch of requests, - * you may have problems. You should use thread pools if - * you're going to try something like this in a "real" - * application. - * - * Note that if you're using the "main" method to run this - * by itself and you don't need the debug output, it will - * run a bit faster if you pipe the std output to 'nul'. - * - * You may use this code as you wish, just don't pretend - * that you wrote it yourself, and don't hold me liable for - * anything that it does or doesn't do. If you're feeling - * especially honest, please include a link to nsftools.com - * along with the code. Thanks, and good luck. - * - * Julian Robichaux -- http://www.nsftools.com - */ -import java.io.*; -import java.net.*; -import java.nio.channels.SocketChannel; -import java.lang.reflect.Array; - -import android.net.VpnService; - -public class HttpProxy extends Thread -{ - public static final int DEFAULT_PORT = 8080; - - private ServerSocket server = null; - private int thisPort = DEFAULT_PORT; - private String fwdServer = ""; - private int fwdPort = 0; - private int ptTimeout = ProxyThread.DEFAULT_TIMEOUT; - private int debugLevel = 0; - private PrintStream debugOut = System.out; - - public static VpnService vpnService; - - /* here's a main method, in case you want to run this by itself */ - public static void main (String args[]) - { - int port = 0; - String fwdProxyServer = ""; - int fwdProxyPort = 0; - - if (args.length == 0) - { - System.err.println("USAGE: java HttpProxy <port number> [<fwd proxy> <fwd port>]"); - System.err.println(" <port number> the port this service listens on"); - System.err.println(" <fwd proxy> optional proxy server to forward requests to"); - System.err.println(" <fwd port> the port that the optional proxy server is on"); - System.err.println("\nHINT: if you don't want to see all the debug information flying by,"); - System.err.println("you can pipe the output to a file or to 'nul' using \">\". For example:"); - System.err.println(" to send output to the file prox.txt: java HttpProxy 8080 > prox.txt"); - System.err.println(" to make the output go away: java HttpProxy 8080 > nul"); - return; - } - - // get the command-line parameters - port = Integer.parseInt(args[0]); - if (args.length > 2) - { - fwdProxyServer = args[1]; - fwdProxyPort = Integer.parseInt(args[2]); - } - - // create and start the HttpProxy thread, using a 20 second timeout - // value to keep the threads from piling up too much - System.err.println(" ** Starting HttpProxy on port " + port + ". Press CTRL-C to end. **\n"); - HttpProxy jp = new HttpProxy(port, fwdProxyServer, fwdProxyPort, 20); - jp.setDebug(1, System.out); // or set the debug level to 2 for tons of output - jp.start(); - - // run forever; if you were calling this class from another - // program and you wanted to stop the HttpProxy thread at some - // point, you could write a loop that waits for a certain - // condition and then calls HttpProxy.closeSocket() to kill - // the running HttpProxy thread - while (true) - { - try { Thread.sleep(3000); } catch (Exception e) {} - } - - // if we ever had a condition that stopped the loop above, - // we'd want to do this to kill the running thread - //jp.closeSocket(); - //return; - } - - - /* the proxy server just listens for connections and creates - * a new thread for each connection attempt (the ProxyThread - * class really does all the work) - */ - public HttpProxy (int port) - { - thisPort = port; - } - - public HttpProxy (int port, String proxyServer, int proxyPort) - { - thisPort = port; - fwdServer = proxyServer; - fwdPort = proxyPort; - } - - public HttpProxy (int port, String proxyServer, int proxyPort, int timeout) - { - thisPort = port; - fwdServer = proxyServer; - fwdPort = proxyPort; - ptTimeout = timeout; - } - - public static void setVpnService (final VpnService v) - { - vpnService = v; - } - - /* allow the user to decide whether or not to send debug - * output to the console or some other PrintStream - */ - public void setDebug (int level, PrintStream out) - { - debugLevel = level; - debugOut = out; - } - - - /* get the port that we're supposed to be listening on - */ - public int getPort () - { - return thisPort; - } - - - /* return whether or not the socket is currently open - */ - public boolean isRunning () - { - if (server == null) - return false; - else - return true; - } - - - /* closeSocket will close the open ServerSocket; use this - * to halt a running HttpProxy thread - */ - public void closeSocket () - { - try { - // close the open server socket - server.close(); - // send it a message to make it stop waiting immediately - // (not really necessary) - /*Socket s = new Socket("localhost", thisPort); - OutputStream os = s.getOutputStream(); - os.write((byte)0); - os.close(); - s.close();*/ - } catch(Exception e) { - if (debugLevel > 0) - debugOut.println(e); - } - - server = null; - } - - - public void run() - { - try { - // create a server socket, and loop forever listening for - // client connections - server = new ServerSocket(thisPort,5,InetAddress.getLocalHost()); - if (debugLevel > 0) - debugOut.println("Started HttpProxy on port " + thisPort); - - while (true) - { - Socket client = server.accept(); - ProxyThread t = new ProxyThread(client, fwdServer, fwdPort); - t.setDebug(debugLevel, debugOut); - t.setTimeout(ptTimeout); - t.start(); - } - } catch (Exception e) { - if (debugLevel > 0) - debugOut.println("HttpProxy Thread error: " + e); - } - - closeSocket(); - } - -} - - -/* - * The ProxyThread will take an HTTP request from the client - * socket and send it to either the server that the client is - * trying to contact, or another proxy server - */ -class ProxyThread extends Thread -{ - private Socket pSocket; - private String fwdServer = ""; - private int fwdPort = 0; - private int debugLevel = 0; - private PrintStream debugOut = System.out; - - // the socketTimeout is used to time out the connection to - // the remote server after a certain period of inactivity; - // the value is in milliseconds -- use zero if you don't want - // a timeout - public static final int DEFAULT_TIMEOUT = 20 * 1000; - private int socketTimeout = DEFAULT_TIMEOUT; - - - public ProxyThread(Socket s) - { - pSocket = s; - } - - public ProxyThread(Socket s, String proxy, int port) - { - pSocket = s; - fwdServer = proxy; - fwdPort = port; - } - - - public void setTimeout (int timeout) - { - // assume that the user will pass the timeout value - // in seconds (because that's just more intuitive) - socketTimeout = timeout * 1000; - } - - - public void setDebug (int level, PrintStream out) - { - debugLevel = level; - debugOut = out; - } - - - public void run() - { - try - { - long startTime = System.currentTimeMillis(); - - // client streams (make sure you're using streams that use - // byte arrays, so things like GIF and JPEG files and file - // downloads will transfer properly) - BufferedInputStream clientIn = new BufferedInputStream(pSocket.getInputStream()); - BufferedOutputStream clientOut = new BufferedOutputStream(pSocket.getOutputStream()); - - // the socket to the remote server - Socket server = null; - - // other variables - byte[] request = null; - byte[] response = null; - int requestLength = 0; - int responseLength = 0; - int pos = -1; - StringBuffer host = new StringBuffer(""); - String hostName = ""; - int hostPort = 80; - - // get the header info (the web browser won't disconnect after - // it's sent a request, so make sure the waitForDisconnect - // parameter is false) - request = getHTTPData(clientIn, host, false); - requestLength = Array.getLength(request); - - // separate the host name from the host port, if necessary - // (like if it's "servername:8000") - hostName = host.toString(); - pos = hostName.indexOf(":"); - if (pos > 0) - { - try { hostPort = Integer.parseInt(hostName.substring(pos + 1)); - } catch (Exception e) { } - hostName = hostName.substring(0, pos); - } - - // either forward this request to another proxy server or - // send it straight to the Host - try - { - server = SocketChannel.open().socket(); - InetSocketAddress remoteHost = new InetSocketAddress(hostName, hostPort); - - if ((null != server) && (null != HttpProxy.vpnService)) { - HttpProxy.vpnService.protect(server); - } - - if ((fwdServer.length() > 0) && (fwdPort > 0)) - { - server.connect(new InetSocketAddress(fwdServer, fwdPort)); - - } else { - server.connect(remoteHost); - - } - - } catch (Exception e) { - // tell the client there was an error - String errMsg = "HTTP/1.0 500\nContent Type: text/plain\n\n" + - "Error connecting to the server:\n" + e + "\n"; - clientOut.write(errMsg.getBytes(), 0, errMsg.length()); - } - - if (server != null) - { - server.setSoTimeout(socketTimeout); - - - BufferedInputStream serverIn = new BufferedInputStream(server.getInputStream()); - BufferedOutputStream serverOut = new BufferedOutputStream(server.getOutputStream()); - - if (requestLength > 0) - { - // send the request out - serverOut.write(request, 0, requestLength); - serverOut.flush(); - - // and get the response; if we're not at a debug level that - // requires us to return the data in the response, just stream - // it back to the client to save ourselves from having to - // create and destroy an unnecessary byte array. Also, we - // should set the waitForDisconnect parameter to 'true', - // because some servers (like Google) don't always set the - // Content-Length header field, so we have to listen until - // they decide to disconnect (or the connection times out). - if (debugLevel > 1) - { - response = getHTTPData(serverIn, true); - responseLength = Array.getLength(response); - } else { - responseLength = streamHTTPData(serverIn, clientOut, true); - } - - serverIn.close(); - serverOut.close(); - } - else - { - int i = 0; - byte[] buffer = new byte[4096]; - - int avail = clientIn.available(); - while (avail > 0 && (i = clientIn.read(buffer,0,avail))!=-1) - { - serverOut.write(buffer,0,i); - avail = clientIn.available(); - } - - while ((i = serverIn.read(buffer))!=-1) - clientOut.write(buffer,0,i); - - clientOut.close(); - clientIn.close(); - pSocket.close(); - return; - } - } - - // send the response back to the client, if we haven't already - if (debugLevel > 1) - clientOut.write(response, 0, responseLength); - - // if the user wants debug info, send them debug info; however, - // keep in mind that because we're using threads, the output won't - // necessarily be synchronous - if (debugLevel > 0) - { - long endTime = System.currentTimeMillis(); - debugOut.println("Request from " + pSocket.getInetAddress().getHostAddress() + - " on Port " + pSocket.getLocalPort() + - " to host " + hostName + ":" + hostPort + - "\n (" + requestLength + " bytes sent, " + - responseLength + " bytes returned, " + - Long.toString(endTime - startTime) + " ms elapsed)"); - debugOut.flush(); - } - if (debugLevel > 1) - { - debugOut.println("REQUEST:\n" + (new String(request))); - debugOut.println("RESPONSE:\n" + (new String(response))); - debugOut.flush(); - } - - // close all the client streams so we can listen again - clientOut.close(); - clientIn.close(); - pSocket.close(); - } catch (Exception e) { - if (debugLevel > 0) - debugOut.println("Error in ProxyThread: " + e); - //e.printStackTrace(); - } - - } - - - private byte[] getHTTPData (InputStream in, boolean waitForDisconnect) - { - // get the HTTP data from an InputStream, and return it as - // a byte array - // the waitForDisconnect parameter tells us what to do in case - // the HTTP header doesn't specify the Content-Length of the - // transmission - StringBuffer foo = new StringBuffer(""); - return getHTTPData(in, foo, waitForDisconnect); - } - - - private byte[] getHTTPData (InputStream in, StringBuffer host, boolean waitForDisconnect) - { - // get the HTTP data from an InputStream, and return it as - // a byte array, and also return the Host entry in the header, - // if it's specified -- note that we have to use a StringBuffer - // for the 'host' variable, because a String won't return any - // information when it's used as a parameter like that - ByteArrayOutputStream bs = new ByteArrayOutputStream(); - streamHTTPData(in, bs, host, waitForDisconnect); - return bs.toByteArray(); - } - - - private int streamHTTPData (InputStream in, OutputStream out, boolean waitForDisconnect) - { - StringBuffer foo = new StringBuffer(""); - return streamHTTPData(in, out, foo, waitForDisconnect); - } - - private int streamHTTPData (InputStream in, OutputStream out, - StringBuffer host, boolean waitForDisconnect) - { - // get the HTTP data from an InputStream, and send it to - // the designated OutputStream - StringBuffer header = new StringBuffer(""); - String data = ""; - int responseCode = 200; - int contentLength = 0; - int pos = -1; - int byteCount = 0; - - try - { - // get the first line of the header, so we know the response code - data = readLine(in); - if (data != null) - { - header.append(data + "\r\n"); - pos = data.indexOf(" "); - if ((data.toLowerCase().startsWith("http")) && - (pos >= 0) && (data.indexOf(" ", pos+1) >= 0)) - { - String rcString = data.substring(pos+1, data.indexOf(" ", pos+1)); - try - { - responseCode = Integer.parseInt(rcString); - } catch (Exception e) { - if (debugLevel > 0) - debugOut.println("Error parsing response code " + rcString); - } - } - //CONNECT www.comodo.com:443 HTTP/1.1 - - else if (data.toLowerCase().startsWith("connect ")) - { - - String connectHost = data.substring(pos+1, data.indexOf(" ", pos+1)); - host.append(connectHost); - return 0; - - } - } - - // get the rest of the header info - while ((data = readLine(in)) != null) - { - // the header ends at the first blank line - if (data.length() == 0) - break; - header.append(data + "\r\n"); - - // check for the Host header - pos = data.toLowerCase().indexOf("host:"); - if (pos >= 0) - { - host.setLength(0); - host.append(data.substring(pos + 5).trim()); - } - - // check for the Content-Length header - pos = data.toLowerCase().indexOf("content-length:"); - if (pos >= 0) - contentLength = Integer.parseInt(data.substring(pos + 15).trim()); - } - - // add a blank line to terminate the header info - header.append("\r\n"); - - // convert the header to a byte array, and write it to our stream - out.write(header.toString().getBytes(), 0, header.length()); - - // if the header indicated that this was not a 200 response, - // just return what we've got if there is no Content-Length, - // because we may not be getting anything else - if ((responseCode != 200) && (contentLength == 0)) - { - out.flush(); - return header.length(); - } - - // get the body, if any; we try to use the Content-Length header to - // determine how much data we're supposed to be getting, because - // sometimes the client/server won't disconnect after sending us - // information... - if (contentLength > 0) - waitForDisconnect = false; - - if ((contentLength > 0) || (waitForDisconnect)) - { - try { - byte[] buf = new byte[4096]; - int bytesIn = 0; - while ( ((byteCount < contentLength) || (waitForDisconnect)) - && ((bytesIn = in.read(buf)) >= 0) ) - { - out.write(buf, 0, bytesIn); - byteCount += bytesIn; - } - } catch (Exception e) { - String errMsg = "Error getting HTTP body: " + e; - if (debugLevel > 0) - debugOut.println(errMsg); - //bs.write(errMsg.getBytes(), 0, errMsg.length()); - } - } - } catch (Exception e) { - if (debugLevel > 0) - debugOut.println("Error getting HTTP data: " + e); - } - - //flush the OutputStream and return - try { out.flush(); } catch (Exception e) {} - return (header.length() + byteCount); - } - - - private String readLine (InputStream in) - { - // reads a line of text from an InputStream - StringBuffer data = new StringBuffer(""); - int c; - - try - { - // if we have nothing to read, just return null - in.mark(1); - if (in.read() == -1) - return null; - else - in.reset(); - - while ((c = in.read()) >= 0) - { - // check for an end-of-line character - if ((c == 0) || (c == 10) || (c == 13)) - break; - else - data.append((char)c); - } - - // deal with the case where the end-of-line terminator is \r\n - if (c == 13) - { - in.mark(1); - if (in.read() != 10) - in.reset(); - } - } catch (Exception e) { - if (debugLevel > 0) - debugOut.println("Error getting header: " + e); - } - - // and return what we have - return data.toString(); - } - -}

1 0

[orbot/master] new helper activities for Apps and Bridge setup
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 84932594ce14746e74250aad9dc931334549a736 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 2 23:11:23 2015 -0400 new helper activities for Apps and Bridge setup --- res/layout/layout_diag.xml | 17 ++- res/layout/layout_vpn_setup.xml | 34 ++++++ res/values/strings.xml | 12 ++ src/org/torproject/android/OrbotConstants.java | 1 + src/org/torproject/android/OrbotMainActivity.java | 115 ++++++++++++++++++-- .../torproject/android/ui/BridgeSetupActivity.java | 5 + .../torproject/android/ui/VPNSetupActivity.java | 5 + 7 files changed, 171 insertions(+), 18 deletions(-) diff --git a/res/layout/layout_diag.xml b/res/layout/layout_diag.xml index 56cd8bb..c19a5b1 100644 --- a/res/layout/layout_diag.xml +++ b/res/layout/layout_diag.xml @@ -4,12 +4,11 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView - android:id="@+id/diaglog" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - </ScrollView> + <TextView + android:id="@+id/diaglog" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_margin="9dp" + /> +</ScrollView> \ No newline at end of file diff --git a/res/layout/layout_vpn_setup.xml b/res/layout/layout_vpn_setup.xml new file mode 100644 index 0000000..5d2c6dc --- /dev/null +++ b/res/layout/layout_vpn_setup.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> + +<ScrollView android:id="@+id/aboutscrollview" + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="fill_parent"> + <LinearLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <TextView android:text="Apps Mode" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="15px" + android:paddingLeft="15px" + android:textStyle="bold" + android:textColor="#00ff00" /> + <TextView android:text="" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:textColorLink="#ffffff" + android:paddingLeft="15px" + android:textColor="#ffffff" /> + + <Button android:id="@+id/btnActivateVPN" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Activate" + android:layout_margin="0sp"/> + + </LinearLayout> + </ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index f5a1fe7..3aeb067 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -318,4 +318,16 @@ <string name="restart_orbot_to_use_this_bridge_">"Restart Orbot to use these bridges: "</string> <string name="menu_qr">QR Codes</string> + + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Tor Bridge to access the network.\n\nYou can get a bridge address from https://bridges.torproject.org or scan a bridge QR code from a friend.\n\nAnother way to get bridges is to send an email to bridges(a)torproject.org. Please note that you must send the email using an address from one of the following email providers: Riseup, Gmail or Yahoo.</string> + + <string name="bridge_mode">Bridge Mode</string> + + <string name="get_bridges">Get Bridges</string> + + <string name="activate">Activate</string> + + <string name="apps_mode">Apps Mode</string> + + <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.</string> </resources> diff --git a/src/org/torproject/android/OrbotConstants.java b/src/org/torproject/android/OrbotConstants.java index e400851..745ace4 100644 --- a/src/org/torproject/android/OrbotConstants.java +++ b/src/org/torproject/android/OrbotConstants.java @@ -16,6 +16,7 @@ public interface OrbotConstants { //path to check Tor against public final static String URL_TOR_CHECK = "https://check.torproject.org"; + public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org"; public final static String NEWLINE = "\n"; diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 886c222..62e666e 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -15,7 +15,6 @@ import org.torproject.android.service.TorServiceUtils; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.Rotate3dAnimation; -import org.torproject.android.ui.wizard.ChooseLocaleWizardActivity; import org.torproject.android.ui.wizard.PromoAppsActivity; import android.annotation.TargetApi; @@ -267,7 +266,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon public void onClick(View v) { if (mBtnVPN.isChecked()) - startVpnService(); + promptStartVpnService(); else stopVpnService(); @@ -286,11 +285,8 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon @Override public void onClick(View v) { - Editor edit = mPrefs.edit(); - edit.putBoolean("pref_bridges_enabled", mBtnBridges.isChecked()); - edit.commit(); + promptSetupBridges (); - updateSettings(); } @@ -842,10 +838,8 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon setNewBridges(results); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Log.e(TAG,"unsupported",e); } } @@ -853,6 +847,109 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } + public void promptSetupBridges () + { + LayoutInflater li = LayoutInflater.from(this); + View view = li.inflate(R.layout.layout_diag, null); + + TextView versionName = (TextView)view.findViewById(R.id.diaglog); + versionName.setText(R.string.if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_); + + if (mBtnBridges.isChecked()) + { + new AlertDialog.Builder(this) + .setTitle(R.string.bridge_mode) + .setView(view) + .setNeutralButton(R.string.get_bridges, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + openBrowser(URL_TOR_BRIDGES); + + } + + + }) + .setPositiveButton(R.string.activate, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + enableBridges (true); + + } + + + }) + .setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) { + + mBtnBridges.setChecked(false); + + } + }) + .show(); + } + else + { + enableBridges(false); + } + + } + + private void enableBridges (boolean enable) + { + + Editor edit = mPrefs.edit(); + edit.putBoolean("pref_bridges_enabled", enable); + edit.commit(); + + updateSettings(); + } + + public void promptStartVpnService () + { + LayoutInflater li = LayoutInflater.from(this); + View view = li.inflate(R.layout.layout_diag, null); + + TextView versionName = (TextView)view.findViewById(R.id.diaglog); + versionName.setText(R.string.you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_); + + new AlertDialog.Builder(this) + .setTitle(R.string.apps_mode) + .setView(view) + .setPositiveButton(R.string.activate, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + startVpnService(); + + } + + + }) + .setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + mBtnVPN.setChecked(false); + + } + + + }) + .show(); + } + @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public void startVpnService () { diff --git a/src/org/torproject/android/ui/BridgeSetupActivity.java b/src/org/torproject/android/ui/BridgeSetupActivity.java new file mode 100644 index 0000000..7cabe35 --- /dev/null +++ b/src/org/torproject/android/ui/BridgeSetupActivity.java @@ -0,0 +1,5 @@ +package org.torproject.android.ui; + +public class BridgeSetupActivity { + +} diff --git a/src/org/torproject/android/ui/VPNSetupActivity.java b/src/org/torproject/android/ui/VPNSetupActivity.java new file mode 100644 index 0000000..d8674c0 --- /dev/null +++ b/src/org/torproject/android/ui/VPNSetupActivity.java @@ -0,0 +1,5 @@ +package org.torproject.android.ui; + +public class VPNSetupActivity { + +}

1 0