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

[meek/master] Add --helper option.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit b2f25343be7fac172d8327f8d7e5c3df6b14c5a7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:40:31 2014 -0700 Add --helper option. Controls whether to use a browser extension helper and what address to connect to it on. --- meek-client/meek-client.go | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index cfb475f..1f64d9e 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -37,6 +37,7 @@ var options struct { URL string Front string HTTPProxyURL *url.URL + HelperAddr *net.TCPAddr } // When a connection handler starts, +1 is written to this channel; when it @@ -60,7 +61,7 @@ type RequestInfo struct { HTTPProxyURL *url.URL } -func roundTrip(buf []byte, info *RequestInfo) (*http.Response, error) { +func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { tr := http.DefaultTransport if info.HTTPProxyURL != nil { tr = &http.Transport{ @@ -94,7 +95,7 @@ type JSONResponse struct { // Ask a locally running browser extension to make the request for us. func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { - s, err := net.Dial("tcp", "127.0.0.1:7000") + s, err := net.DialTCP("tcp", nil, options.HelperAddr) if err != nil { return nil, err } @@ -165,7 +166,11 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) } func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { - resp, err := roundTripWithHelper(buf, info) + roundTrip := roundTripWithHTTP + if options.HelperAddr != nil { + roundTrip = roundTripWithHelper + } + resp, err := roundTrip(buf, info) if err != nil { return 0, err } @@ -303,11 +308,13 @@ func acceptLoop(ln *pt.SocksListener) error { } func main() { + var helperAddr string var httpProxy string var logFilename string var err error flag.StringVar(&options.Front, "front", "", "front domain name if no front= SOCKS arg") + flag.StringVar(&helperAddr, "helper", "", "address of HTTP helper (browser extension)") flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from HTTP_PROXY environment variable") flag.StringVar(&logFilename, "log", "", "name of log file") flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") @@ -322,6 +329,17 @@ func main() { log.SetOutput(f) } + if helperAddr != "" && httpProxy != "" { + log.Fatalf("--helper and --http-proxy can't be used together") + } + + if helperAddr != "" { + options.HelperAddr, err = net.ResolveTCPAddr("tcp", helperAddr) + if err != nil { + log.Fatalf("can't resolve helper address: %s", err) + } + } + if httpProxy != "" { options.HTTPProxyURL, err = url.Parse(httpProxy) if err != nil {

1 0

[meek/master] Explain a bit what is going on.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 87b4c76a960a1626204cf8cd16fe8217fddd9a57 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 11:00:50 2014 -0700 Explain a bit what is going on. --- firefox/components/main.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index 8bda493..85ec543 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -1,3 +1,33 @@ +// This is an extension that allows external programs to make HTTP requests +// using the browser's networking libraries. +// +// The extension opens a TCP socket listening on localhost (port 7000). When it +// receives a connection, it reads a 4-byte big-endian length field, then tries +// to read that many bytes of data. The data is UTF-8–encoded JSON, having the +// format +// { +// "method": "POST", +// "url": "https://www.google.com/", +// "header": { +// "Host": "meek-reflect.appspot.com", +// "X-Session-Id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"} +// } +// } +// The extension makes the request as commanded. It returns the response to the +// client as a JSON blob, preceded by a 4-byte length as before. If successful, +// the response looks like +// { +// "status": 200, +// "body": "...base64..." +// } +// If there is a network error, the "error" key will be defined. A 404 response +// or similar from the target web server is not considered such an error. +// { +// "error": "NS_ERROR_UNKNOWN_HOST" +// } +// The extension closes the connectionn after each transaction, and the client +// must reconnect to do another request. + // https://developer.mozilla.org/en-US/docs/How_to_Build_an_XPCOM_Component_in… // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");

1 0

[meek/master] Make requests through the browser extension.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 7f449eaa782be553a0be98ef5e6956c8d6d1ffc3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:31:07 2014 -0700 Make requests through the browser extension. --- meek-client/meek-client.go | 91 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 94314cf..cfb475f 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -4,10 +4,13 @@ import ( "bytes" "crypto/rand" "encoding/base64" + "encoding/binary" + "encoding/json" "errors" "flag" "fmt" "io" + "io/ioutil" "log" "net" "net/http" @@ -26,6 +29,7 @@ const maxPayloadLength = 0x10000 const initPollInterval = 100 * time.Millisecond const maxPollInterval = 5 * time.Second const pollIntervalMultiplier = 1.5 +const maxHelperResponseLength = 10000000 var ptInfo pt.ClientInfo @@ -75,8 +79,93 @@ func roundTrip(buf []byte, info *RequestInfo) (*http.Response, error) { return tr.RoundTrip(req) } +type JSONRequest struct { + Method string `json:"method,omitempty"` + URL string `json:"url,omitempty"` + Header map[string]string `json:"header,omitempty"` + Body []byte `json:"body,omitempty"` +} + +type JSONResponse struct { + Error string `json:"error,omitempty"` + Status int `json:"status"` + Body []byte `json:"body"` +} + +// Ask a locally running browser extension to make the request for us. +func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { + s, err := net.Dial("tcp", "127.0.0.1:7000") + if err != nil { + return nil, err + } + defer s.Close() + + // Encode our JSON. + req := JSONRequest{ + Method: "POST", + URL: info.URL.String(), + Header: make(map[string]string), + Body: buf, + } + req.Header["X-Session-Id"] = info.SessionID + if info.Host != "" { + req.Header["Host"] = info.Host + } + encReq, err := json.Marshal(&req) + if err != nil { + return nil, err + } + // log.Printf("encoded %s", encReq) + + // Send the request. + err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) + if err != nil { + return nil, err + } + _, err = s.Write(encReq) + if err != nil { + return nil, err + } + + // Read the response. + var length uint32 + err = binary.Read(s, binary.BigEndian, &length) + if err != nil { + return nil, err + } + if length > maxHelperResponseLength { + return nil, errors.New(fmt.Sprintf("helper's returned data is too big (%d > %d)", + length, maxHelperResponseLength)) + } + encResp := make([]byte, length) + _, err = io.ReadFull(s, encResp) + if err != nil { + return nil, err + } + // log.Printf("received %s", encResp) + + // Decode their JSON. + var jsonResp JSONResponse + err = json.Unmarshal(encResp, &jsonResp) + if err != nil { + return nil, err + } + if jsonResp.Error != "" { + return nil, errors.New(fmt.Sprintf("helper returned error: %s", jsonResp.Error)) + } + + // Mock up an HTTP response. + resp := http.Response{ + Status: http.StatusText(jsonResp.Status), + StatusCode: jsonResp.Status, + Body: ioutil.NopCloser(bytes.NewReader(jsonResp.Body)), + ContentLength: int64(len(jsonResp.Body)), + } + return &resp, nil +} + func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { - resp, err := roundTrip(buf, info) + resp, err := roundTripWithHelper(buf, info) if err != nil { return 0, err }

1 0

[meek/master] Put timeouts on helper interaction.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 2d766407d82ee4ff9329041dc803301a5adace1c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 11:04:47 2014 -0700 Put timeouts on helper interaction. --- meek-client/meek-client.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 1f64d9e..930b123 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -30,6 +30,8 @@ const initPollInterval = 100 * time.Millisecond const maxPollInterval = 5 * time.Second const pollIntervalMultiplier = 1.5 const maxHelperResponseLength = 10000000 +const helperReadTimeout = 60 * time.Second +const helperWriteTimeout = 2 * time.Second var ptInfo pt.ClientInfo @@ -119,6 +121,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) // log.Printf("encoded %s", encReq) // Send the request. + s.SetWriteDeadline(time.Now().Add(helperWriteTimeout)) err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) if err != nil { return nil, err @@ -130,6 +133,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) // Read the response. var length uint32 + s.SetReadDeadline(time.Now().Add(helperReadTimeout)) err = binary.Read(s, binary.BigEndian, &length) if err != nil { return nil, err

1 0

[meek/master] Handle connections, do JSON, make requests.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 10e4dfeb23cddbb6d367d85f536b0d473a163b45 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 15 20:27:38 2014 -0700 Handle connections, do JSON, make requests. --- firefox/components/main.js | 302 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 263 insertions(+), 39 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index c38eeda..8bda493 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -2,31 +2,20 @@ // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +// Everything resides within the MeekHTTPHelper namespace. MeekHTTPHelper is +// also the type from which NSGetFactory is constructed, and it is the top-level +// nsIServerSocketListener. function MeekHTTPHelper() { this.wrappedJSObject = this; const LOCAL_PORT = 7000; - // Create a "direct" nsIProxyInfo that bypasses the default proxy. - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProto… - var pps = Components.classes["@mozilla.org/network/protocol-proxy-service;1"] - .getService(Components.interfaces.nsIProtocolProxyService); - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProxy… - this.directProxyInfo = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); - - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… - this.ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); - this.httpProtocolHandler = this.ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIServe… var serverSocket = Components.classes["@mozilla.org/network/server-socket;1"] .createInstance(Components.interfaces.nsIServerSocket); serverSocket.init(LOCAL_PORT, true, -1); serverSocket.asyncListen(this); } - MeekHTTPHelper.prototype = { classDescription: "meek HTTP helper component", classID: Components.ID("{e7bc2b9c-f454-49f3-a19f-14848a4d871d}"), @@ -39,51 +28,286 @@ MeekHTTPHelper.prototype = { ]), // nsIServerSocketListener implementation. - onSocketAccepted: function(aServ, aTransport) { - dump("onSocketAccepted host " + aTransport.host + "\n"); + onSocketAccepted: function(server, transport) { + dump("onSocketAccepted " + transport.host + ":" + transport.port + "\n"); + new MeekHTTPHelper.LocalConnectionHandler(transport); + }, + onStopListening: function(server, status) { + dump("onStopListening status " + status + "\n"); + }, +}; - const FRONT_URL = "https://www.google.com/"; - const HOST = "meek-reflect.appspot.com"; +// Global variables and functions. - var uri = this.ioService.newURI(FRONT_URL, null, null); +MeekHTTPHelper.LOCAL_READ_TIMEOUT = 2.0; +MeekHTTPHelper.LOCAL_WRITE_TIMEOUT = 2.0; + +// A "direct" nsIProxyInfo that bypasses the default proxy. +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProto… +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProxy… +MeekHTTPHelper.directProxyInfo = Components.classes["@mozilla.org/network/protocol-proxy-service;1"] + .getService(Components.interfaces.nsIProtocolProxyService) + .newProxyInfo("direct", "", 0, 0, 0xffffffff, null); + +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… +MeekHTTPHelper.ioService = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService); +MeekHTTPHelper.httpProtocolHandler = MeekHTTPHelper.ioService.getProtocolHandler("http") + .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); + +// Set the transport to time out at the given absolute deadline. +MeekHTTPHelper.refreshDeadline = function(transport, deadline) { + var timeout; + if (deadline === null) + timeout = 0xffffffff; + else + timeout = Math.max(0.0, Math.ceil((deadline - Date.now()) / 1000.0)); + transport.setTimeout(Components.interfaces.nsISocketTransport.TIMEOUT_READ_WRITE, timeout); +}; + +// Reverse-index the Components.results table. +MeekHTTPHelper.lookupStatus = function(status) { + for (var name in Components.results) { + if (Components.results[name] === status) + return name; + } + return null; +}; + +// LocalConnectionHandler handles each new client connection received on the +// socket opened by MeekHTTPHelper. It reads a JSON request, makes the request +// on the Internet, and writes the result back to the socket. Error handling +// happens within callbacks. +MeekHTTPHelper.LocalConnectionHandler = function(transport) { + dump("LocalConnectionHandler\n"); + this.transport = transport; + this.readRequest(this.makeRequest.bind(this)); +}; +MeekHTTPHelper.LocalConnectionHandler.prototype = { + readRequest: function(callback) { + dump("readRequest\n"); + new MeekHTTPHelper.RequestReader(this.transport, this.makeRequest.bind(this)); + }, + + makeRequest: function(req) { + dump("makeRequest " + JSON.stringify(req) + "\n"); + if (!this.requestOk(req)) { + this.transport.close(0); + return; + } + var uri = MeekHTTPHelper.ioService.newURI(req.url, null, null); // Construct an HTTP channel with the proxy bypass. // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… - var channel = this.httpProtocolHandler.newProxiedChannel(uri, this.directProxyInfo, 0, null) + var channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, MeekHTTPHelper.directProxyInfo, 0, null) .QueryInterface(Components.interfaces.nsIHttpChannel); - // Set the host we really want. - channel.setRequestHeader("Host", HOST, false); - channel.redirectionLimit = 0; + if (req.header !== undefined) { + for (var key in req.header) { + dump("setting header " + key + ": " + req.header[key] + "\n"); + channel.setRequestHeader(key, req.header[key], false); + } + } + if (req.body !== undefined) { + let body = atob(req.body); + let inputStream = Components.classes["@mozilla.org/io/string-input-stream;1"] + .createInstance(Components.interfaces.nsIStringInputStream); + inputStream.setData(body, body.length); + let uploadChannel = channel.QueryInterface(Components.interfaces.nsIUploadChannel); + uploadChannel.setUploadStream(inputStream, "application/octet-stream", body.length); + } // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… - // channel.requestMethod = "POST"; + // says we must set requestMethod after calling setUploadStream. + channel.requestMethod = req.method; + channel.redirectionLimit = 0; - channel.asyncOpen(new this.httpResponseStreamListener(), null); + channel.asyncOpen(new MeekHTTPHelper.HttpStreamListener(this.returnResponse.bind(this)), channel); }, - onStopListening: function(aServ, aStatus) { - dump("onStopListening status " + aStatus + "\n"); + + returnResponse: function(resp) { + dump("returnResponse " + JSON.stringify(resp) + "\n"); + outputStream = this.transport.openOutputStream( + Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); + var output = Components.classes["@mozilla.org/binaryoutputstream;1"] + .createInstance(Components.interfaces.nsIBinaryOutputStream); + output.setOutputStream(outputStream); + + var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + converter.charset = "UTF-8"; + var s = JSON.stringify(resp); + var data = converter.convertToByteArray(s); + + var deadline = Date.now() + MeekHTTPHelper.LOCAL_WRITE_TIMEOUT * 1000; + try { + MeekHTTPHelper.refreshDeadline(this.transport, deadline); + output.write32(data.length); + MeekHTTPHelper.refreshDeadline(this.transport, deadline); + output.writeByteArray(data, data.length); + } finally { + output.close(); + } + }, + + // Enforce restrictions on what requests we are willing to make. These can + // probably be loosened up. Try and rule out anything unexpected until we + // know we need otherwise. + requestOk: function(req) { + if (req.method === undefined) { + dump("req missing \"method\".\n"); + return false; + } + if (req.url === undefined) { + dump("req missing \"url\".\n"); + return false; + } + + if (req.method !== "POST") { + dump("req.method is " + JSON.stringify(req.method) + ", not \"POST\".\n"); + return false; + } + if (!req.url.startsWith("https://")) { + dump("req.url doesn't start with \"https://\".\n"); + return false; + } + + return true; }, }; +// RequestReader reads a JSON-encoded request from the given transport, and +// calls the given callback with the request as an argument. In case of error, +// the transport is closed and the callback is not called. +MeekHTTPHelper.RequestReader = function(transport, callback) { + dump("RequestReader\n"); + this.transport = transport; + this.callback = callback; -// https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections -MeekHTTPHelper.prototype.httpResponseStreamListener = function() { + this.curThread = Components.classes["@mozilla.org/thread-manager;1"].getService().currentThread; + this.inputStream = this.transport.openInputStream( + Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); + + this.state = this.STATE_READING_LENGTH; + this.buf = new Uint8Array(4); + this.bytesToRead = this.buf.length; + this.deadline = Date.now() + MeekHTTPHelper.LOCAL_READ_TIMEOUT * 1000; + this.asyncWait(); }; -MeekHTTPHelper.prototype.httpResponseStreamListener.prototype = { +MeekHTTPHelper.RequestReader.prototype = { + STATE_READING_LENGTH: 1, + STATE_READING_OBJECT: 2, + STATE_DONE: 3, + + // Do an asyncWait and handle the result. + asyncWait: function() { + MeekHTTPHelper.refreshDeadline(this.transport, this.deadline); + this.inputStream.asyncWait(this, 0, 0, this.curThread); + }, + + // nsIInputStreamCallback implementation. + onInputStreamReady: function(inputStream) { + var input = Components.classes["@mozilla.org/binaryinputstream;1"] + .createInstance(Components.interfaces.nsIBinaryInputStream); + input.setInputStream(inputStream); + try { + switch (this.state) { + case this.STATE_READING_LENGTH: + this.doStateReadingLength(input); + this.asyncWait(inputStream); + break; + case this.STATE_READING_OBJECT: + this.doStateReadingObject(input); + if (this.bytesToRead > 0) + this.asyncWait(inputStream); + break; + } + } catch (e) { + dump("got exception " + e + "\n"); + this.transport.close(0); + return; + } + }, + + // Read into this.buf (up to its capacity) and decrement this.bytesToRead. + readIntoBuf: function(input) { + var n = Math.min(input.available(), this.bytesToRead); + var data = input.readByteArray(n); + this.buf.subarray(this.buf.length - this.bytesToRead, n).set(data) + this.bytesToRead -= n; + }, + + doStateReadingLength: function(input) { + this.readIntoBuf(input); + if (this.bytesToRead > 0) + return; + + this.state = this.STATE_READING_OBJECT; + var b = this.buf; + this.bytesToRead = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]; + if (this.bytesToRead > 1000000) { + dump("Object length is too long (" + this.bytesToRead + "), ignoring.\n"); + throw Components.results.NS_ERROR_FAILURE; + } + this.buf = new Uint8Array(this.bytesToRead); + }, + + doStateReadingObject: function(input) { + this.readIntoBuf(input); + if (this.bytesToRead > 0) + return; + + this.state = this.STATE_DONE; + var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + converter.charset = "UTF-8"; + var s = converter.convertFromByteArray(this.buf, this.buf.length); + var req = JSON.parse(s); + this.callback(req); + }, +}; + +// HttpStreamListener makes the requested HTTP request and calls the given +// callback with a representation of the response. The "error" key of the return +// value is defined if and only if there was an error. +MeekHTTPHelper.HttpStreamListener = function(callback) { + this.callback = callback; + // This is a list of binary strings that is concatenated in onStopRequest. + this.body = []; + this.length = 0; +}; +// https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections +MeekHTTPHelper.HttpStreamListener.prototype = { // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIReque… - onStartRequest: function(aRequest, aContext) { + onStartRequest: function(req, context) { dump("onStartRequest\n"); }, - onStopRequest: function(aRequest, aContext, aStatus) { - dump("onStopRequest\n"); + onStopRequest: function(req, context, status) { + dump("onStopRequest " + status + "\n"); + var resp = { + status: context.responseStatus, + }; + if (Components.isSuccessCode(status)) { + resp.body = btoa(this.body.join("")); + } else { + let err = MeekHTTPHelper.lookupStatus(status); + if (err !== null) + resp.error = err; + else + resp.error = "error " + String(status); + } + this.callback(resp); }, + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIStrea… - onDataAvailable: function(aRequest, aContext, aStream, aSourceOffset, aLength) { - dump("onDataAvailable\n"); - var a = new Uint8Array(aLength); + onDataAvailable: function(request, context, stream, sourceOffset, length) { + dump("onDataAvailable " + length + " bytes\n"); + if (this.length + length > 1000000) { + request.cancel(Components.results.NS_ERROR_ILLEGAL_VALUE); + return; + } + this.length += length; var input = Components.classes["@mozilla.org/binaryinputstream;1"] .createInstance(Components.interfaces.nsIBinaryInputStream); - input.setInputStream(aStream); - input.readByteArray(aLength, a); - dump(aLength + ":" + a + "\n"); + input.setInputStream(stream); + this.body.push(String.fromCharCode.apply(null, input.readByteArray(length))); }, };

1 0

[meek/master] Add a commented --helper example to torrc.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit fbe35e1787c635b4785e8438170be37d3a090f57 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:43:50 2014 -0700 Add a commented --helper example to torrc. --- meek-client/torrc | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-client/torrc b/meek-client/torrc index e839a4c..62f2c72 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -2,5 +2,6 @@ UseBridges 1 # Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com # ClientTransportPlugin meek exec ./meek-client --log meek-client.log Bridge meek 0.0.2.0:1 +# 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 ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log DataDirectory datadir

1 0

[meek/master] typo
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 87988ac6f2ce93204a61e80abb5e3a15e7c3372b Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 12:05:26 2014 -0700 typo --- firefox/components/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 85ec543..0034db6 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -25,7 +25,7 @@ // { // "error": "NS_ERROR_UNKNOWN_HOST" // } -// The extension closes the connectionn after each transaction, and the client +// The extension closes the connection after each transaction, and the client // must reconnect to do another request. // https://developer.mozilla.org/en-US/docs/How_to_Build_an_XPCOM_Component_in…

1 0

[meek/master] Hold on to references to handlers.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 9494cf0f36127e0afa941c7ab2d2636b51e2ca2d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 20 23:03:23 2014 -0700 Hold on to references to handlers. So they don't get garbage collected. --- firefox/components/main.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 0034db6..08e9ce2 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -40,6 +40,8 @@ function MeekHTTPHelper() { const LOCAL_PORT = 7000; + this.handlers = []; + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIServe… var serverSocket = Components.classes["@mozilla.org/network/server-socket;1"] .createInstance(Components.interfaces.nsIServerSocket); @@ -60,7 +62,9 @@ MeekHTTPHelper.prototype = { // nsIServerSocketListener implementation. onSocketAccepted: function(server, transport) { dump("onSocketAccepted " + transport.host + ":" + transport.port + "\n"); - new MeekHTTPHelper.LocalConnectionHandler(transport); + // Stop referencing handlers that are no longer alive. + this.handlers = this.handlers.filter(function(h) { return h.transport.isAlive(); }); + this.handlers.push(new MeekHTTPHelper.LocalConnectionHandler(transport)); }, onStopListening: function(server, status) { dump("onStopListening status " + status + "\n"); @@ -111,12 +115,15 @@ MeekHTTPHelper.lookupStatus = function(status) { MeekHTTPHelper.LocalConnectionHandler = function(transport) { dump("LocalConnectionHandler\n"); this.transport = transport; + this.requestreader = null; + this.channel = null; + this.listener = null; this.readRequest(this.makeRequest.bind(this)); }; MeekHTTPHelper.LocalConnectionHandler.prototype = { readRequest: function(callback) { dump("readRequest\n"); - new MeekHTTPHelper.RequestReader(this.transport, this.makeRequest.bind(this)); + this.requestreader = new MeekHTTPHelper.RequestReader(this.transport, this.makeRequest.bind(this)); }, makeRequest: function(req) { @@ -128,12 +135,12 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { var uri = MeekHTTPHelper.ioService.newURI(req.url, null, null); // Construct an HTTP channel with the proxy bypass. // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… - var channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, MeekHTTPHelper.directProxyInfo, 0, null) + this.channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, MeekHTTPHelper.directProxyInfo, 0, null) .QueryInterface(Components.interfaces.nsIHttpChannel); if (req.header !== undefined) { for (var key in req.header) { dump("setting header " + key + ": " + req.header[key] + "\n"); - channel.setRequestHeader(key, req.header[key], false); + this.channel.setRequestHeader(key, req.header[key], false); } } if (req.body !== undefined) { @@ -141,15 +148,16 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { let inputStream = Components.classes["@mozilla.org/io/string-input-stream;1"] .createInstance(Components.interfaces.nsIStringInputStream); inputStream.setData(body, body.length); - let uploadChannel = channel.QueryInterface(Components.interfaces.nsIUploadChannel); + let uploadChannel = this.channel.QueryInterface(Components.interfaces.nsIUploadChannel); uploadChannel.setUploadStream(inputStream, "application/octet-stream", body.length); } // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… // says we must set requestMethod after calling setUploadStream. - channel.requestMethod = req.method; - channel.redirectionLimit = 0; + this.channel.requestMethod = req.method; + this.channel.redirectionLimit = 0; - channel.asyncOpen(new MeekHTTPHelper.HttpStreamListener(this.returnResponse.bind(this)), channel); + this.listener = new MeekHTTPHelper.HttpStreamListener(this.returnResponse.bind(this)); + this.channel.asyncOpen(this.listener, this.channel); }, returnResponse: function(resp) {

1 0

[meek/master] Tone down the debugging output.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 0a87c0d5cc580135f539e414b57a28142615acaa Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 21 03:30:08 2014 -0700 Tone down the debugging output. --- firefox/components/main.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 08e9ce2..a55eb8c 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -113,7 +113,6 @@ MeekHTTPHelper.lookupStatus = function(status) { // on the Internet, and writes the result back to the socket. Error handling // happens within callbacks. MeekHTTPHelper.LocalConnectionHandler = function(transport) { - dump("LocalConnectionHandler\n"); this.transport = transport; this.requestreader = null; this.channel = null; @@ -122,12 +121,11 @@ MeekHTTPHelper.LocalConnectionHandler = function(transport) { }; MeekHTTPHelper.LocalConnectionHandler.prototype = { readRequest: function(callback) { - dump("readRequest\n"); this.requestreader = new MeekHTTPHelper.RequestReader(this.transport, this.makeRequest.bind(this)); }, makeRequest: function(req) { - dump("makeRequest " + JSON.stringify(req) + "\n"); + // dump("makeRequest " + JSON.stringify(req) + "\n"); if (!this.requestOk(req)) { this.transport.close(0); return; @@ -139,7 +137,6 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { .QueryInterface(Components.interfaces.nsIHttpChannel); if (req.header !== undefined) { for (var key in req.header) { - dump("setting header " + key + ": " + req.header[key] + "\n"); this.channel.setRequestHeader(key, req.header[key], false); } } @@ -161,7 +158,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { }, returnResponse: function(resp) { - dump("returnResponse " + JSON.stringify(resp) + "\n"); + // dump("returnResponse " + JSON.stringify(resp) + "\n"); outputStream = this.transport.openOutputStream( Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); var output = Components.classes["@mozilla.org/binaryoutputstream;1"] @@ -215,7 +212,6 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { // calls the given callback with the request as an argument. In case of error, // the transport is closed and the callback is not called. MeekHTTPHelper.RequestReader = function(transport, callback) { - dump("RequestReader\n"); this.transport = transport; this.callback = callback; @@ -336,7 +332,7 @@ MeekHTTPHelper.HttpStreamListener.prototype = { // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIStrea… onDataAvailable: function(request, context, stream, sourceOffset, length) { - dump("onDataAvailable " + length + " bytes\n"); + // dump("onDataAvailable " + length + " bytes\n"); if (this.length + length > 1000000) { request.cancel(Components.results.NS_ERROR_ILLEGAL_VALUE); return;

1 0

[meek/master] Move helper code to its own file.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit baf34b96cf3969eb0a517d5993a39632e98c2f26 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 22 00:13:11 2014 -0700 Move helper code to its own file. --- meek-client/helper.go | 104 ++++++++++++++++++++++++++++++++++++++++++++ meek-client/meek-client.go | 90 -------------------------------------- 2 files changed, 104 insertions(+), 90 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go new file mode 100644 index 0000000..98fd771 --- /dev/null +++ b/meek-client/helper.go @@ -0,0 +1,104 @@ +package main + +import ( + "bytes" + "encoding/binary" + "encoding/json" + "errors" + "fmt" + "io" + "io/ioutil" + "net" + "net/http" + "time" +) + +// The code in this file has to do communicating with the meek-http-helper +// browser extension. + +type JSONRequest struct { + Method string `json:"method,omitempty"` + URL string `json:"url,omitempty"` + Header map[string]string `json:"header,omitempty"` + Body []byte `json:"body,omitempty"` +} + +type JSONResponse struct { + Error string `json:"error,omitempty"` + Status int `json:"status"` + Body []byte `json:"body"` +} + +// Ask a locally running browser extension to make the request for us. +func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { + s, err := net.DialTCP("tcp", nil, options.HelperAddr) + if err != nil { + return nil, err + } + defer s.Close() + + // Encode our JSON. + req := JSONRequest{ + Method: "POST", + URL: info.URL.String(), + Header: make(map[string]string), + Body: buf, + } + req.Header["X-Session-Id"] = info.SessionID + if info.Host != "" { + req.Header["Host"] = info.Host + } + encReq, err := json.Marshal(&req) + if err != nil { + return nil, err + } + // log.Printf("encoded %s", encReq) + + // Send the request. + s.SetWriteDeadline(time.Now().Add(helperWriteTimeout)) + err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) + if err != nil { + return nil, err + } + _, err = s.Write(encReq) + if err != nil { + return nil, err + } + + // Read the response. + var length uint32 + s.SetReadDeadline(time.Now().Add(helperReadTimeout)) + err = binary.Read(s, binary.BigEndian, &length) + if err != nil { + return nil, err + } + if length > maxHelperResponseLength { + return nil, errors.New(fmt.Sprintf("helper's returned data is too big (%d > %d)", + length, maxHelperResponseLength)) + } + encResp := make([]byte, length) + _, err = io.ReadFull(s, encResp) + if err != nil { + return nil, err + } + // log.Printf("received %s", encResp) + + // Decode their JSON. + var jsonResp JSONResponse + err = json.Unmarshal(encResp, &jsonResp) + if err != nil { + return nil, err + } + if jsonResp.Error != "" { + return nil, errors.New(fmt.Sprintf("helper returned error: %s", jsonResp.Error)) + } + + // Mock up an HTTP response. + resp := http.Response{ + Status: http.StatusText(jsonResp.Status), + StatusCode: jsonResp.Status, + Body: ioutil.NopCloser(bytes.NewReader(jsonResp.Body)), + ContentLength: int64(len(jsonResp.Body)), + } + return &resp, nil +} diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 930b123..6ce95f0 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -4,13 +4,10 @@ import ( "bytes" "crypto/rand" "encoding/base64" - "encoding/binary" - "encoding/json" "errors" "flag" "fmt" "io" - "io/ioutil" "log" "net" "net/http" @@ -82,93 +79,6 @@ func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { return tr.RoundTrip(req) } -type JSONRequest struct { - Method string `json:"method,omitempty"` - URL string `json:"url,omitempty"` - Header map[string]string `json:"header,omitempty"` - Body []byte `json:"body,omitempty"` -} - -type JSONResponse struct { - Error string `json:"error,omitempty"` - Status int `json:"status"` - Body []byte `json:"body"` -} - -// Ask a locally running browser extension to make the request for us. -func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { - s, err := net.DialTCP("tcp", nil, options.HelperAddr) - if err != nil { - return nil, err - } - defer s.Close() - - // Encode our JSON. - req := JSONRequest{ - Method: "POST", - URL: info.URL.String(), - Header: make(map[string]string), - Body: buf, - } - req.Header["X-Session-Id"] = info.SessionID - if info.Host != "" { - req.Header["Host"] = info.Host - } - encReq, err := json.Marshal(&req) - if err != nil { - return nil, err - } - // log.Printf("encoded %s", encReq) - - // Send the request. - s.SetWriteDeadline(time.Now().Add(helperWriteTimeout)) - err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) - if err != nil { - return nil, err - } - _, err = s.Write(encReq) - if err != nil { - return nil, err - } - - // Read the response. - var length uint32 - s.SetReadDeadline(time.Now().Add(helperReadTimeout)) - err = binary.Read(s, binary.BigEndian, &length) - if err != nil { - return nil, err - } - if length > maxHelperResponseLength { - return nil, errors.New(fmt.Sprintf("helper's returned data is too big (%d > %d)", - length, maxHelperResponseLength)) - } - encResp := make([]byte, length) - _, err = io.ReadFull(s, encResp) - if err != nil { - return nil, err - } - // log.Printf("received %s", encResp) - - // Decode their JSON. - var jsonResp JSONResponse - err = json.Unmarshal(encResp, &jsonResp) - if err != nil { - return nil, err - } - if jsonResp.Error != "" { - return nil, errors.New(fmt.Sprintf("helper returned error: %s", jsonResp.Error)) - } - - // Mock up an HTTP response. - resp := http.Response{ - Status: http.StatusText(jsonResp.Status), - StatusCode: jsonResp.Status, - Body: ioutil.NopCloser(bytes.NewReader(jsonResp.Body)), - ContentLength: int64(len(jsonResp.Body)), - } - return &resp, nil -} - func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { roundTrip := roundTripWithHTTP if options.HelperAddr != nil {

1 0