tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[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] Semicolon.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 84f4c045bfb85ad8474683344ec416b824c69d26 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 15 18:16:02 2014 -0700 Semicolon. --- 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 ba7e33a..c38eeda 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -66,7 +66,7 @@ MeekHTTPHelper.prototype = { // https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections MeekHTTPHelper.prototype.httpResponseStreamListener = function() { -} +}; MeekHTTPHelper.prototype.httpResponseStreamListener.prototype = { // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIReque… onStartRequest: function(aRequest, aContext) {

1 0

[meek/master] Say we support nsIObserver.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit a46298eeb68f3a2f71a3acc16bc9ebc02877788f Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 15 10:58:23 2014 -0700 Say we support nsIObserver. I got this (seemingly benign) message in the error console: While creating services from category 'profile-after-change', service for entry 'MeekHTTPHelper', contract ID '@bamsoftware.com/meek-http-helper;1' does not implement nsIObserver. It doesn't appear to be necessary to actually define the "observe" method of nsIObserver. TorProtocolService from tor-launcher does not. --- firefox/components/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index dd22dca..ba7e33a 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -35,6 +35,7 @@ MeekHTTPHelper.prototype = { // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… QueryInterface: XPCOMUtils.generateQI([ Components.interfaces.nsIServerSocketListener, + Components.interfaces.nsIObserver, ]), // nsIServerSocketListener implementation.

1 0

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

09 Apr '14

commit d233cc61a6224ca9beb20249586b9bc2977440b6 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 15 10:32:29 2014 -0700 Do QueryInterface. Without it, I got this error in the error console: Error: (intermediate value).QueryInterface is not a function Source File: resource://gre/modules/XPCOMUtils.jsm Line: 271 --- firefox/components/main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index 9db0e7e..dd22dca 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -32,6 +32,11 @@ MeekHTTPHelper.prototype = { classID: Components.ID("{e7bc2b9c-f454-49f3-a19f-14848a4d871d}"), contractID: "@bamsoftware.com/meek-http-helper;1", + // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… + QueryInterface: XPCOMUtils.generateQI([ + Components.interfaces.nsIServerSocketListener, + ]), + // nsIServerSocketListener implementation. onSocketAccepted: function(aServ, aTransport) { dump("onSocketAccepted host " + aTransport.host + "\n");

1 0

[meek/master] Wait for an incoming connection before making the request.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 6fdc8521b13eb3736473d6f17c09a61350d872dc Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 15 10:07:25 2014 -0700 Wait for an incoming connection before making the request. --- firefox/components/main.js | 97 +++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 38 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 24c2abd..9db0e7e 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -1,6 +1,3 @@ -const FRONT_URL = "https://www.google.com/"; -const HOST = "meek-reflect.appspot.com"; - // 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"); @@ -8,56 +5,80 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); 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… - var proxy = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); + this.directProxyInfo = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… - var ioService = Components.classes["@mozilla.org/network/io-service;1"] + this.ioService = Components.classes["@mozilla.org/network/io-service;1"] .getService(Components.interfaces.nsIIOService); - var httpProtocolHandler = ioService.getProtocolHandler("http") + this.httpProtocolHandler = this.ioService.getProtocolHandler("http") .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); - var uri = ioService.newURI(FRONT_URL, null, null); - // Construct an HTTP channel with the proxy bypass. - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… - var channel = httpProtocolHandler.newProxiedChannel(uri, proxy, 0, null) - .QueryInterface(Components.interfaces.nsIHttpChannel); - // Set the host we really want. - channel.setRequestHeader("Host", HOST, false); - channel.redirectionLimit = 0; - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… - // channel.requestMethod = "POST"; - - // https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections - function StreamListener() { - this.onStartRequest = function(aRequest, aContext) { - dump("onStartRequest\n"); - }; - this.onStopRequest = function(aRequest, aContext, aStatus) { - dump("onStopRequest\n"); - }; - this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { - dump("onDataAvailable\n"); - var a = new Uint8Array(aLength); - var input = Components.classes["@mozilla.org/binaryinputstream;1"] - .createInstance(Components.interfaces.nsIBinaryInputStream); - input.setInputStream(aStream); - input.readByteArray(aLength, a); - dump(aLength + ":" + a + "\n"); - }; - } - - var listener = new StreamListener(); - channel.asyncOpen(listener, null); + + // 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}"), contractID: "@bamsoftware.com/meek-http-helper;1", + + // nsIServerSocketListener implementation. + onSocketAccepted: function(aServ, aTransport) { + dump("onSocketAccepted host " + aTransport.host + "\n"); + + const FRONT_URL = "https://www.google.com/"; + const HOST = "meek-reflect.appspot.com"; + + var uri = this.ioService.newURI(FRONT_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) + .QueryInterface(Components.interfaces.nsIHttpChannel); + // Set the host we really want. + channel.setRequestHeader("Host", HOST, false); + channel.redirectionLimit = 0; + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… + // channel.requestMethod = "POST"; + + channel.asyncOpen(new this.httpResponseStreamListener(), null); + }, + onStopListening: function(aServ, aStatus) { + dump("onStopListening status " + aStatus + "\n"); + }, +}; + + +// https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections +MeekHTTPHelper.prototype.httpResponseStreamListener = function() { +} +MeekHTTPHelper.prototype.httpResponseStreamListener.prototype = { + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIReque… + onStartRequest: function(aRequest, aContext) { + dump("onStartRequest\n"); + }, + onStopRequest: function(aRequest, aContext, aStatus) { + dump("onStopRequest\n"); + }, + // 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); + var input = Components.classes["@mozilla.org/binaryinputstream;1"] + .createInstance(Components.interfaces.nsIBinaryInputStream); + input.setInputStream(aStream); + input.readByteArray(aLength, a); + dump(aLength + ":" + a + "\n"); + }, }; var NSGetFactory = XPCOMUtils.generateNSGetFactory([MeekHTTPHelper]);

1 0

[meek/master] Four-space indents.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit f17d4ab980eae475dd4c025d5fe092046a1d65ac Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 14 00:05:16 2014 -0700 Four-space indents. --- firefox/components/main.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 0588b4a..24c2abd 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -11,20 +11,20 @@ function MeekHTTPHelper() { // 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); + .getService(Components.interfaces.nsIProtocolProxyService); // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProxy… var proxy = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… var ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); + .getService(Components.interfaces.nsIIOService); var httpProtocolHandler = ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); + .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); var uri = ioService.newURI(FRONT_URL, null, null); // Construct an HTTP channel with the proxy bypass. // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… var channel = httpProtocolHandler.newProxiedChannel(uri, proxy, 0, null) - .QueryInterface(Components.interfaces.nsIHttpChannel); + .QueryInterface(Components.interfaces.nsIHttpChannel); // Set the host we really want. channel.setRequestHeader("Host", HOST, false); channel.redirectionLimit = 0; @@ -33,21 +33,21 @@ function MeekHTTPHelper() { // https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections function StreamListener() { - this.onStartRequest = function(aRequest, aContext) { - dump("onStartRequest\n"); - }; - this.onStopRequest = function(aRequest, aContext, aStatus) { - dump("onStopRequest\n"); - }; - this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { - dump("onDataAvailable\n"); - var a = new Uint8Array(aLength); - var input = Components.classes["@mozilla.org/binaryinputstream;1"] - .createInstance(Components.interfaces.nsIBinaryInputStream); - input.setInputStream(aStream); - input.readByteArray(aLength, a); - dump(aLength + ":" + a + "\n"); - }; + this.onStartRequest = function(aRequest, aContext) { + dump("onStartRequest\n"); + }; + this.onStopRequest = function(aRequest, aContext, aStatus) { + dump("onStopRequest\n"); + }; + this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { + dump("onDataAvailable\n"); + var a = new Uint8Array(aLength); + var input = Components.classes["@mozilla.org/binaryinputstream;1"] + .createInstance(Components.interfaces.nsIBinaryInputStream); + input.setInputStream(aStream); + input.readByteArray(aLength, a); + dump(aLength + ":" + a + "\n"); + }; } var listener = new StreamListener();

1 0

[meek/master] Remove extra console.log.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 0c6416c2b22afcb26f48eb4cd72feeb454a4f00e Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 11 21:07:43 2014 -0700 Remove extra console.log. --- firefox/chrome/content/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/firefox/chrome/content/main.js b/firefox/chrome/content/main.js index 6cb10d0..1430a57 100644 --- a/firefox/chrome/content/main.js +++ b/firefox/chrome/content/main.js @@ -30,7 +30,6 @@ channel.asyncOpen(listener, null); // https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections function StreamListener() { this.onStartRequest = function(aRequest, aContext) { - console.log("onStartRequest\n"); dump("onStartRequest\n"); }; this.onStopRequest = function(aRequest, aContext, aStatus) {

1 0

[meek/master] Skeleton of extension.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit e555467520bb88e2cd0d5b3d9a29c1a22ed5dec9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 9 16:39:22 2014 -0700 Skeleton of extension. --- firefox/chrome.manifest | 2 ++ firefox/chrome/content/main.xul | 4 ++++ firefox/install.rdf | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/firefox/chrome.manifest b/firefox/chrome.manifest new file mode 100644 index 0000000..5403d2b --- /dev/null +++ b/firefox/chrome.manifest @@ -0,0 +1,2 @@ +content meek-http-helper chrome/content/ +overlay chrome://browser/content/browser.xul chrome://meek-http-helper/content/main.xul diff --git a/firefox/chrome/content/main.xul b/firefox/chrome/content/main.xul new file mode 100644 index 0000000..1afd5fe --- /dev/null +++ b/firefox/chrome/content/main.xul @@ -0,0 +1,4 @@ +<?xml version="1.0"?> + +<overlay id="main" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> +</overlay> diff --git a/firefox/install.rdf b/firefox/install.rdf new file mode 100644 index 0000000..6f67ded --- /dev/null +++ b/firefox/install.rdf @@ -0,0 +1,21 @@ +<?xml version="1.0"?> + +<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#"> + <Description about="urn:mozilla:install-manifest"> + <em:id>meek-http-helper(a)bamsoftware.com</em:id> + <em:version>1.0</em:version> + <em:type>2</em:type> + +  + <em:targetApplication> + <Description> + <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> + <em:minVersion>24.0</em:minVersion> + <em:maxVersion>*</em:maxVersion> + </Description> + </em:targetApplication> + + <em:name>meek HTTP helper</em:name> + <em:description>Makes HTTP requests on behalf of meek-client.</em:description> + </Description> +</RDF>

1 0

[meek/master] Prototype of making an HTTPS request with domain fronting.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit d966f770d89ff850efa319d6f9d1f4327e00a89c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 9 22:49:11 2014 -0700 Prototype of making an HTTPS request with domain fronting. --- firefox/chrome/content/main.js | 48 +++++++++++++++++++++++++++++++++++++++ firefox/chrome/content/main.xul | 1 + 2 files changed, 49 insertions(+) diff --git a/firefox/chrome/content/main.js b/firefox/chrome/content/main.js new file mode 100644 index 0000000..6cb10d0 --- /dev/null +++ b/firefox/chrome/content/main.js @@ -0,0 +1,48 @@ +var FRONT_URL = "https://www.google.com/"; +var HOST = "meek-reflect.appspot.com"; + +// 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… +var proxy = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); + +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… +var ioService = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService); +var httpProtocolHandler = ioService.getProtocolHandler("http") + .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); +var uri = ioService.newURI(FRONT_URL, null, null); +// Construct an HTTP channel with the proxy bypass. +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… +var channel = httpProtocolHandler.newProxiedChannel(uri, proxy, 0, null) + .QueryInterface(Components.interfaces.nsIHttpChannel); +// Set the host we really want. +channel.setRequestHeader("Host", HOST, false); +channel.redirectionLimit = 0; +// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… +// channel.requestMethod = "POST"; + +var listener = new StreamListener(); +channel.asyncOpen(listener, null); + +// https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections +function StreamListener() { + this.onStartRequest = function(aRequest, aContext) { + console.log("onStartRequest\n"); + dump("onStartRequest\n"); + }; + this.onStopRequest = function(aRequest, aContext, aStatus) { + dump("onStopRequest\n"); + }; + this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { + dump("onDataAvailable\n"); + var a = new Uint8Array(aLength); + var input = Components.classes["@mozilla.org/binaryinputstream;1"] + .createInstance(Components.interfaces.nsIBinaryInputStream); + input.setInputStream(aStream); + input.readByteArray(aLength, a); + dump(aLength + ":" + a + "\n"); + }; +} diff --git a/firefox/chrome/content/main.xul b/firefox/chrome/content/main.xul index 1afd5fe..c93a89e 100644 --- a/firefox/chrome/content/main.xul +++ b/firefox/chrome/content/main.xul @@ -1,4 +1,5 @@ <?xml version="1.0"?> <overlay id="main" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <script src="chrome://meek-http-helper/content/main.js"></script> </overlay>

1 0

[meek/master] Look more like a real extension.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 1794bb4d3ba23410a302639fbe7672fe103a5b95 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 12 21:09:18 2014 -0700 Look more like a real extension. The code is now in a component, not a browser overlay. I followed some instructions from https://developer.mozilla.org/en-US/docs/How_to_Build_an_XPCOM_Component_in… https://developer.mozilla.org/en-US/docs/Mozilla/XPCOM/Receiving_startup_no… https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… It now runs just once at startup. (Previously it ran for each new browser window.) --- firefox/chrome.manifest | 7 +++-- firefox/chrome/content/main.js | 47 ----------------------------- firefox/chrome/content/main.xul | 5 ---- firefox/components/main.js | 63 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 54 deletions(-) diff --git a/firefox/chrome.manifest b/firefox/chrome.manifest index 5403d2b..ef6596c 100644 --- a/firefox/chrome.manifest +++ b/firefox/chrome.manifest @@ -1,2 +1,5 @@ -content meek-http-helper chrome/content/ -overlay chrome://browser/content/browser.xul chrome://meek-http-helper/content/main.xul +# https://developer.mozilla.org/en-US/docs/How_to_Build_an_XPCOM_Component_in… +# https://developer.mozilla.org/en-US/docs/Mozilla/XPCOM/Receiving_startup_no… +component {e7bc2b9c-f454-49f3-a19f-14848a4d871d} components/main.js +contract @bamsoftware.com/meek-http-helper;1 {e7bc2b9c-f454-49f3-a19f-14848a4d871d} +category profile-after-change MeekHTTPHelper @bamsoftware.com/meek-http-helper;1 diff --git a/firefox/chrome/content/main.js b/firefox/chrome/content/main.js deleted file mode 100644 index 1430a57..0000000 --- a/firefox/chrome/content/main.js +++ /dev/null @@ -1,47 +0,0 @@ -var FRONT_URL = "https://www.google.com/"; -var HOST = "meek-reflect.appspot.com"; - -// 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… -var proxy = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); - -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… -var ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); -var httpProtocolHandler = ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); -var uri = ioService.newURI(FRONT_URL, null, null); -// Construct an HTTP channel with the proxy bypass. -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… -var channel = httpProtocolHandler.newProxiedChannel(uri, proxy, 0, null) - .QueryInterface(Components.interfaces.nsIHttpChannel); -// Set the host we really want. -channel.setRequestHeader("Host", HOST, false); -channel.redirectionLimit = 0; -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… -// channel.requestMethod = "POST"; - -var listener = new StreamListener(); -channel.asyncOpen(listener, null); - -// https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections -function StreamListener() { - this.onStartRequest = function(aRequest, aContext) { - dump("onStartRequest\n"); - }; - this.onStopRequest = function(aRequest, aContext, aStatus) { - dump("onStopRequest\n"); - }; - this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { - dump("onDataAvailable\n"); - var a = new Uint8Array(aLength); - var input = Components.classes["@mozilla.org/binaryinputstream;1"] - .createInstance(Components.interfaces.nsIBinaryInputStream); - input.setInputStream(aStream); - input.readByteArray(aLength, a); - dump(aLength + ":" + a + "\n"); - }; -} diff --git a/firefox/chrome/content/main.xul b/firefox/chrome/content/main.xul deleted file mode 100644 index c93a89e..0000000 --- a/firefox/chrome/content/main.xul +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?> - -<overlay id="main" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script src="chrome://meek-http-helper/content/main.js"></script> -</overlay> diff --git a/firefox/components/main.js b/firefox/components/main.js new file mode 100644 index 0000000..0588b4a --- /dev/null +++ b/firefox/components/main.js @@ -0,0 +1,63 @@ +const FRONT_URL = "https://www.google.com/"; +const HOST = "meek-reflect.appspot.com"; + +// 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"); + +function MeekHTTPHelper() { + this.wrappedJSObject = this; + + // 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… + var proxy = pps.newProxyInfo("direct", "", 0, 0, 0xffffffff, null); + + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… + var ioService = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService); + var httpProtocolHandler = ioService.getProtocolHandler("http") + .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); + var uri = ioService.newURI(FRONT_URL, null, null); + // Construct an HTTP channel with the proxy bypass. + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… + var channel = httpProtocolHandler.newProxiedChannel(uri, proxy, 0, null) + .QueryInterface(Components.interfaces.nsIHttpChannel); + // Set the host we really want. + channel.setRequestHeader("Host", HOST, false); + channel.redirectionLimit = 0; + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIUploa… + // channel.requestMethod = "POST"; + + // https://developer.mozilla.org/en-US/docs/Creating_Sandboxed_HTTP_Connections + function StreamListener() { + this.onStartRequest = function(aRequest, aContext) { + dump("onStartRequest\n"); + }; + this.onStopRequest = function(aRequest, aContext, aStatus) { + dump("onStopRequest\n"); + }; + this.onDataAvailable = function(aRequest, aContext, aStream, aSourceOffset, aLength) { + dump("onDataAvailable\n"); + var a = new Uint8Array(aLength); + var input = Components.classes["@mozilla.org/binaryinputstream;1"] + .createInstance(Components.interfaces.nsIBinaryInputStream); + input.setInputStream(aStream); + input.readByteArray(aLength, a); + dump(aLength + ":" + a + "\n"); + }; + } + + var listener = new StreamListener(); + channel.asyncOpen(listener, null); +} + +MeekHTTPHelper.prototype = { + classDescription: "meek HTTP helper component", + classID: Components.ID("{e7bc2b9c-f454-49f3-a19f-14848a4d871d}"), + contractID: "@bamsoftware.com/meek-http-helper;1", +}; + +var NSGetFactory = XPCOMUtils.generateNSGetFactory([MeekHTTPHelper]);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014