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

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit f41d46960cb421ab10f7ddb15f945ff6c223a2bc Merge: 0081d00 4af6bb7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 11:00:56 2016 -0500 Merge branch 'master' of github.com:n8fr8/orbot docs/WALKTHROUGH | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] remove Pluto Go building form this Makefile for now
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit 0081d005e66e43d864ce8492f87dbed3d1153524 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 10:59:58 2016 -0500 remove Pluto Go building form this Makefile for now --- external/Makefile | 7 ++++--- external/pluto | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index 1a14869..3e0d898 100644 --- a/external/Makefile +++ b/external/Makefile @@ -275,8 +275,9 @@ polipo-clean: # PLUTO Pluggable Transports pluto/bin/android_arm/obfs4proxy: - cd pluto && \ - ./build.sh +#don't build for now until we sort out Go SDK +# cd pluto && \ +# ./build.sh pluto-build-stamp: pluto/bin/android_arm/obfs4proxy touch pluto-build-stamp @@ -287,7 +288,7 @@ pluto: pluto-build-stamp cp pluto/bin/android_arm/meek-client bin pluto-clean: - -rm -rf pluto/bin +# -rm -rf pluto/bin #------------------------------------------------------------------------------# # JTorControl library diff --git a/external/pluto b/external/pluto index c9f8799..9ca531b 160000 --- a/external/pluto +++ b/external/pluto @@ -1 +1 @@ -Subproject commit c9f8799540f329480b084010efb354e6bac8af98 +Subproject commit 9ca531b8568a2c1a945568a0c46354da7a7371c5

1 0

[orbot/master] Merge pull request #17 from PanosSakkos/patch-1
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit 4af6bb7d3b2b56b14c6ebd9c0389095e7bc5267a Merge: c687bc9 cd0bfd3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 01:41:20 2016 -0500 Merge pull request #17 from PanosSakkos/patch-1 [Trivial] Fixed broken reference to Main Activity in WALKTHROUGH docs/WALKTHROUGH | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update gitignore
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit 64493f73cd2cd2d923235be44b0f081ca897ca8f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 11 17:12:42 2016 -0500 update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a0253d7..385b3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ builds /patches/* obj releases +.transifexrc # ant build products build.xml

1 0

[orbot/master] fix the ability to select per app VPN routing
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit 39244a613ab5e39036a479234904216d3f6b9878 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 11 17:11:58 2016 -0500 fix the ability to select per app VPN routing --- src/org/torproject/android/OrbotMainActivity.java | 2 +- src/org/torproject/android/settings/AppManager.java | 1 + src/org/torproject/android/settings/TorifiedApp.java | 9 +++++++++ src/org/torproject/android/vpn/OrbotVpnService.java | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 7b7ca07..0b292d2 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -809,7 +809,7 @@ public class OrbotMainActivity extends Activity else if (torStatus == TorServiceConstants.STATUS_ON) { updateTransProxy(); - Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show(); + // Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show(); } } diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 19dff0a..6bb1437 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -300,6 +300,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC app.setUid(aInfo.uid); app.setUsername(pMgr.getNameForUid(app.getUid())); app.setProcname(aInfo.processName); + app.setPackageName(aInfo.packageName); try { diff --git a/src/org/torproject/android/settings/TorifiedApp.java b/src/org/torproject/android/settings/TorifiedApp.java index a786800..ceada4d 100644 --- a/src/org/torproject/android/settings/TorifiedApp.java +++ b/src/org/torproject/android/settings/TorifiedApp.java @@ -10,6 +10,7 @@ public class TorifiedApp implements Comparable { private String procname; private String name; private Drawable icon; + private String packageName; private boolean torified = false; private boolean usesInternet = false; @@ -127,4 +128,12 @@ public class TorifiedApp implements Comparable { { return getName(); } + + + public String getPackageName() { + return packageName; + } + public void setPackageName(String packageName) { + this.packageName = packageName; + } } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index f4dff74..6cc718c 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -343,9 +343,9 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { for (TorifiedApp app : apps) { - if (app.isTorified()) + if (app.isTorified() && (!app.getPackageName().equals(getPackageName()))) { - builder.addAllowedApplication(app.getUsername()); + builder.addAllowedApplication(app.getPackageName()); perAppEnabled = true; }

1 0

[orbot/master] 15.1.0-BETA-1
by n8fr8＠torproject.org 11 Jan '16

11 Jan '16

commit 4b31ef849a414b3ceb7b4de07c9ea8db8ada266d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 11 17:13:43 2016 -0500 15.1.0-BETA-1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fb8ed9a..e4f7df8 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.0-ALPHA-3" - android:versionCode="15100003" + android:versionName="15.1.0-BETA-1" + android:versionCode="15100011" android:installLocation="auto" >

1 0

[meek/master] Remove the Chrome extension as it is unmaintained.
by dcf＠torproject.org 11 Jan '16

11 Jan '16

commit 7210ef5a7d3b75541f784c3905a849414d05d3b8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 11 12:55:02 2016 -0800 Remove the Chrome extension as it is unmaintained. I don't know of anyone using it and I haven't tried it in a long time. We can bring it back if there is a need. --- README | 8 +-- chrome/README | 15 ---- chrome/app/background.js | 155 ---------------------------------------- chrome/app/manifest.json | 26 ------- chrome/extension/background.js | 130 --------------------------------- chrome/extension/manifest.json | 20 ------ 6 files changed, 4 insertions(+), 350 deletions(-) diff --git a/README b/README index b79d761..b042827 100644 --- a/README +++ b/README @@ -34,8 +34,8 @@ with the --helper option pointing at a browser extension that has been set up separately. How it works is meek-client tells the browser what URL to request, the browser requests it and returns the payload to meek-client. The TLS implementation is that of the browser, so it better -blends in with allowed traffic. Browser extensions for Chrome and -Firefox are in the chrome and firefox directories. +blends in with allowed traffic. A browser extensions for Firefox is in +the firefox directory. Here is a summary of the programs that appear in subdirectories. @@ -45,8 +45,8 @@ copies requests and responses to an instance of meek-server somewhere. A public instance of the App Engine web app is at https://meek-reflect.appspot.com/. -chrome, firefox: -Browser extensions for TLS camouflage. +firefox: +Browser extension for TLS camouflage. meek-client: The client transport plugin, run by a censored client. diff --git a/chrome/README b/chrome/README deleted file mode 100644 index 940e555..0000000 --- a/chrome/README +++ /dev/null @@ -1,15 +0,0 @@ -meek helper extension for Chrome. - -To use, you must disable SPDY in Chrome by running it like this: - chrome --use-spdy=off -Start Chrome, then enter the Tools→Extensions screen. Click the "Load -unpacked extension" button and add the directory "app" in this -directory. Click the button again and add the directory "extension". -(You need to add both the app and the extension.) - -If the text under meek-browser-app reads "Inspect views: background page -(Inactive)", click the link in order to make it active. The extension -will be listening on localhost port 7000. Start tor with a torrc line -like this: - -ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log --helper 127.0.0.1:7000 diff --git a/chrome/app/background.js b/chrome/app/background.js deleted file mode 100644 index e26ab1b..0000000 --- a/chrome/app/background.js +++ /dev/null @@ -1,155 +0,0 @@ -const DEBUG = false; - -function debug(str) { - if (DEBUG) { console.debug(str); } -} - -function info(str) { - console.info(str); -} - -const IP = "127.0.0.1"; -const PORT = 7000; - -const STATE_READING_LENGTH = 1; -const STATE_READING_OBJECT = 2; - -var serverSocketId; -var state = STATE_READING_LENGTH; -var buf = new Uint8Array(4); -var bytesToRead = buf.length; - -chrome.runtime.onMessageExternal.addListener( - function onHeartbeat(id, sender, sendResponse) { - console.assert(id === sender.id, "Sender's ID is incorrect."); - EXTENSION_ID = id; - chrome.runtime.onMessageExternal.removeListener(onHeartbeat); - chrome.sockets.tcpServer.create({}, function(createInfo) { - listenAndAccept(createInfo.socketId); - }); - } -); - -function listenAndAccept(socketId) { - info("listenAndAccept " + socketId); - chrome.sockets.tcpServer.listen(socketId, - IP, PORT, function(resultCode) { - onListenCallback(socketId, resultCode) - }); -} - -function onListenCallback(socketId, resultCode) { - debug("onListenCallback " + socketId); - if (resultCode < 0) { - debug("Error listening:" + - chrome.runtime.lastError.message); - return; - } - serverSocketId = socketId; - chrome.sockets.tcpServer.onAccept.addListener(onAccept); - chrome.sockets.tcpServer.onAcceptError.addListener(function(info) { - debug("onAcceptError " + JSON.stringify(info)); - }); - chrome.sockets.tcp.onReceive.addListener(onReceive); - chrome.sockets.tcp.onReceiveError.addListener(function(info) { - chrome.sockets.tcp.close(info.socketId); - debug("onReceiveError " + JSON.stringify(info)); - }); -} - -function onAccept(info) { - debug("onAccept " + JSON.stringify(info)); - if (info.socketId != serverSocketId) - return; - - chrome.sockets.tcp.setPaused(info.clientSocketId, false); -} - -function readIntoBuf(data) { - debug("readIntoBuf " + "bytesToRead: " + bytesToRead + ", datalen: " + data.byteLength + ", buflen: " + buf.length); - var n = Math.min(data.byteLength, bytesToRead); - buf.set(new Uint8Array(data.slice(0, n)), buf.length - bytesToRead); - bytesToRead -= n; - return data.slice(n); -} - -function onReceive(info) { - debug("onReceive " + JSON.stringify(info) + " len: " + info.data.byteLength); - var data = info.data; - switch (state) { - case STATE_READING_LENGTH: - data = readIntoBuf(data); - if (bytesToRead > 0) - return; - - var b = buf; - bytesToRead = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]; - debug(bytesToRead); - buf = new Uint8Array(bytesToRead); - state = STATE_READING_OBJECT; - - case STATE_READING_OBJECT: - data = readIntoBuf(data); - if (bytesToRead > 0) - return; - - var str = ab2str(buf); - debug(str); - var request = JSON.parse(str); - makeRequest(request, info.socketId); - - state = STATE_READING_LENGTH; - buf = new Uint8Array(4); - bytesToRead = buf.length; - } -} - -function makeRequest(request, socketId) { - debug("makeRequest " + JSON.stringify(request)); - - port = chrome.runtime.connect(EXTENSION_ID); - port.onMessage.addListener(function(response) { - returnResponse(response, socketId); - port.disconnect(); - }); - port.onDisconnect.addListener(function() { - debug("onDisconnect"); - }); - port.postMessage(request); -} - -function returnResponse(response, socketId) { - debug("returnResponse " + JSON.stringify(response)); - var str = JSON.stringify(response); - var b = str2ab(str); - - var buf = new Uint8Array(4 + b.byteLength); - var len = b.byteLength; - buf[0] = (len >> 24) & 0xff; - buf[1] = (len >> 16) & 0xff; - buf[2] = (len >> 8) & 0xff; - buf[3] = len & 0xff; - buf.set(new Uint8Array(b), 4); - - chrome.sockets.tcp.send(socketId, buf.buffer, function(info) { - debug("send " + socketId); - if (info.resultCode != 0) - debug("Send failed " + info.resultCode); - }); -} - -function ab2str(buffer) { - var encodedString = String.fromCharCode.apply(null, buffer), - decodedString = decodeURIComponent(escape(encodedString)); - return decodedString; -} - -function str2ab(string) { - var string = unescape(encodeURIComponent(string)), - charList = string.split(''), - buf = []; - for (var i = 0; i < charList.length; i++) { - buf.push(charList[i].charCodeAt(0)); - } - return (new Uint8Array(buf)).buffer; -} diff --git a/chrome/app/manifest.json b/chrome/app/manifest.json deleted file mode 100644 index 6c288d2..0000000 --- a/chrome/app/manifest.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "manifest_version": 2, - "name": "meek-browser-app", - "minimum_chrome_version": "24", - "version": "0.1", - - "permissions": [ - "alarms" - ], - - "sockets": { - "tcp": { - "connect": "*" - }, - "tcpServer": { - "listen": "127.0.0.1:7000" - } - }, - - "app": { - "background": { - "scripts": ["background.js"], - "persistent": true - } - } -} diff --git a/chrome/extension/background.js b/chrome/extension/background.js deleted file mode 100644 index 836f022..0000000 --- a/chrome/extension/background.js +++ /dev/null @@ -1,130 +0,0 @@ -const DEBUG = false; - -function debug(str) { - if (DEBUG) { console.info(str); } -} - -chrome.alarms.create("heartbeat", {when: 5000, periodInMinutes: 1 }); -chrome.alarms.onAlarm.addListener(function(alarm) { - chrome.management.getAll(function(extensions) { - var app_id; - for (var i = 0; i < extensions.length; i++) { - if (extensions[i].name === "meek-browser-app") { - app_id = extensions[i].id; - break; - } - } - chrome.runtime.sendMessage(app_id, chrome.runtime.id); - }); -}); - -var host = 'meek-reflect.appspot.com'; - -function onBeforeSendHeadersCallback(details) { - var did_set = false; - for (var i = 0; i < details.requestHeaders.length; ++i) { - if (details.requestHeaders[i].name === 'Host') { - details.requestHeaders[i].value = host; - did_set = true; - } - } - if (!did_set) { - details.requestHeaders.push({ - name: 'Host', - value: host - }); - } - return { requestHeaders: details.requestHeaders }; -} - -chrome.runtime.onConnectExternal.addListener(function(port) { - debug("onConnectExternal"); - port.onMessage.addListener(function(request) { - debug("onMessage"); - var timeout = 2000; - var xhr = new XMLHttpRequest(); - xhr.responseType = "arraybuffer"; - xhr.ontimeout = function() { - console.error(url + "timed out."); - chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - }; - xhr.onerror = function() { - chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - var response = { error: xhr.statusText }; - sendResponse(response); - }; - xhr.onload = function() { - debug("onload " + xhr.response.byteLength); - chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - var response = { - status: xhr.status, - body: _arrayBufferToBase64(xhr.response) - }; - port.postMessage(response); - debug("postMessage " + JSON.stringify(response)); - }; - var requestMethod = request.method; - var url = request.url; - xhr.open(requestMethod, url); - if (request.header != undefined) { - for (var key in request.header) { - if (key != "Host") { // TODO: Add more restricted header fields - xhr.setRequestHeader(key, request.header[key]); - } else { - host = request.header[key]; - } - } - } - var body = null; - if (request.body != undefined) { - body = _base64ToArrayBuffer(request.body); - xhr.overrideMimeType("Content-Type", "application/octet-stream"); - debug(body); - } - - chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeadersCallback, { - urls: [url], - types: ['xmlhttprequest'] - }, ['requestHeaders', 'blocking']); - - xhr.send(body); - }); -}); - -function _base64ToArrayBuffer(base64) { - var binary_string = atob(base64); - var len = binary_string.length; - var bytes = new Uint8Array(len); - for (var i = 0; i < len; i++) { - bytes[i] = binary_string.charCodeAt(i); - } - return bytes; -} - -function _arrayBufferToBase64(buf) { - var bytes = new Uint8Array(buf); - debug(JSON.stringify(buf)); - var base64 = ''; - var encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; - var chr1, chr2, chr3, enc1, enc2, enc3, enc4; - var i = 0; - while (i < bytes.length) { - chr1 = bytes[i++]; - chr2 = i < bytes.length ? bytes[i++] : Number.NaN; - chr3 = i < bytes.length ? bytes[i++] : Number.NaN; - - enc1 = chr1 >> 2; - enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); - enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); - enc4 = chr3 & 63; - - if (isNaN(chr2)) { - enc3 = enc4 = 64; - } else if (isNaN(chr3)) { - enc4 = 64; - } - base64 += encodings.charAt(enc1) + encodings.charAt(enc2) + - encodings.charAt(enc3) + encodings.charAt(enc4); - } - return base64; -} diff --git a/chrome/extension/manifest.json b/chrome/extension/manifest.json deleted file mode 100644 index c6bf6a3..0000000 --- a/chrome/extension/manifest.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "manifest_version": 2, - "name": "meek-browser-extension", - "minimum_chrome_version": "24", - "version": "0.1", - - "permissions": [ - "notifications", - "alarms", - "management", - "webRequest", - "webRequestBlocking", - "<all_urls>" - ], - - "background": { - "scripts": ["background.js"], - "persistent": true - } -}

1 0

[meek/master] Rearrange imports.
by dcf＠torproject.org 11 Jan '16

11 Jan '16

commit d4c4d2d63b2c3501f68aa2e4e772b4b283cc8d4e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 11 12:46:28 2016 -0800 Rearrange imports. --- meek-client/meek-client.go | 4 ++-- meek-server/meek-server.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 405230d..c42c3d8 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -45,9 +45,9 @@ import ( "strings" "syscall" "time" -) -import "git.torproject.org/pluggable-transports/goptlib.git" + "git.torproject.org/pluggable-transports/goptlib.git" +) const ( ptMethodName = "meek" diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 482fa3c..258c4c1 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -25,9 +25,9 @@ import ( "sync" "syscall" "time" -) -import "git.torproject.org/pluggable-transports/goptlib.git" + "git.torproject.org/pluggable-transports/goptlib.git" +) const ( ptMethodName = "meek"

1 0

[meek/master] Log version number in meek-server startup.
by dcf＠torproject.org 11 Jan '16

11 Jan '16

commit 1d9289ab8ddda94c011d5aea0b2fda643506368f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 11 12:49:49 2016 -0800 Log version number in meek-server startup. --- meek-server/meek-server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 258c4c1..a44d1c5 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -30,6 +30,8 @@ import ( ) const ( + programVersion = "0.21" + ptMethodName = "meek" // Reject session ids shorter than this, as a weak defense against // client bugs that send an empty session id or something similarly @@ -365,7 +367,7 @@ func main() { log.Fatalf("error in ServerSetup: %s", err) } - log.Printf("starting") + log.Printf("starting version %s", programVersion) listeners := make([]net.Listener, 0) for _, bindaddr := range ptInfo.Bindaddrs { if port != 0 {

1 0

[meek/master] Fix format string in error message.
by dcf＠torproject.org 11 Jan '16

11 Jan '16

commit 91c31227cd18d5fca580fc4cb3cae08fe46ecf9e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 11 12:46:59 2016 -0800 Fix format string in error message. --- meek-server/useraddr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/useraddr.go b/meek-server/useraddr.go index a01944b..7173f4c 100644 --- a/meek-server/useraddr.go +++ b/meek-server/useraddr.go @@ -44,7 +44,7 @@ func originalClientIP(req *http.Request) (net.IP, error) { ip := net.ParseIP(host) if ip == nil { - return nil, fmt.Errorf("cannot parse %q as IP address") + return nil, fmt.Errorf("cannot parse %q as IP address", host) } return ip, nil }

1 0