tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[meek/master] Oops, stdin, not stdout.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 5eeb8439d64c36971da3717b4163c8220f74a164 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 8 01:43:12 2014 -0700 Oops, stdin, not stdout. --- meek-client-torbrowser/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go index b00cc34..f7d96f2 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -151,7 +151,7 @@ func main() { // On Windows, we don't get a SIGINT or SIGTERM, rather we are killed // without a chance to clean up our subprocesses. When run inside // processterminate-buffer, it is instead processterminate-buffer that - // is killed, and we can detect that event by that our stdout gets + // is killed, and we can detect that event by that our stdin gets // closed. // https://trac.torproject.org/projects/tor/ticket/9330 go func() {

1 0

[meek/master] Comment out some debugging.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 0b062b1f9c52ac39ce265b13d3e2013d954923f0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 19:17:20 2014 -0700 Comment out some debugging. --- firefox/components/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 74df52f..43979e3 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -80,13 +80,13 @@ MeekHTTPHelper.prototype = { // nsIServerSocketListener implementation. onSocketAccepted: function(server, transport) { - dump("onSocketAccepted " + transport.host + ":" + transport.port + "\n"); + // dump("onSocketAccepted " + transport.host + ":" + transport.port + "\n"); // 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"); + // dump("onStopListening status " + status + "\n"); }, }; @@ -317,10 +317,10 @@ MeekHTTPHelper.HttpStreamListener = function(callback) { MeekHTTPHelper.HttpStreamListener.prototype = { // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIReque… onStartRequest: function(req, context) { - dump("onStartRequest\n"); + // dump("onStartRequest\n"); }, onStopRequest: function(req, context, status) { - dump("onStopRequest " + status + "\n"); + // dump("onStopRequest " + status + "\n"); var resp = { status: context.responseStatus, };

1 0

[meek/master] Log the helper address.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 4b93398800605730e8ffd9dac83b3dc0424c8ebc Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 10:10:31 2014 -0700 Log the helper address. --- meek-client/meek-client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 6ce95f0..536dd69 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -252,6 +252,7 @@ func main() { if err != nil { log.Fatalf("can't resolve helper address: %s", err) } + log.Printf("using helper on %s", options.HelperAddr) } if httpProxy != "" {

1 0

[meek/master] Actually use the "profile-after-change" observer.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 2c389fafe92afbed16eabcfbd00fd754f7c9b73f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 23 17:04:33 2014 -0700 Actually use the "profile-after-change" observer. Before we were starting the listener as a side effect of the constructor. Actually wait until we get the "profile-after-change" notification before running. --- firefox/components/main.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index a55eb8c..d4b4d35 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -37,16 +37,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); // nsIServerSocketListener. function MeekHTTPHelper() { this.wrappedJSObject = this; - - 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); - serverSocket.init(LOCAL_PORT, true, -1); - serverSocket.asyncListen(this); } MeekHTTPHelper.prototype = { classDescription: "meek HTTP helper component", @@ -55,10 +46,22 @@ MeekHTTPHelper.prototype = { // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… QueryInterface: XPCOMUtils.generateQI([ - Components.interfaces.nsIServerSocketListener, Components.interfaces.nsIObserver, + Components.interfaces.nsIServerSocketListener, ]), + // nsIObserver implementation. + observe: function(subject, topic, data) { + if (topic !== "profile-after-change") + return + + // 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(MeekHTTPHelper.LOCAL_PORT, true, -1); + serverSocket.asyncListen(this); + }, + // nsIServerSocketListener implementation. onSocketAccepted: function(server, transport) { dump("onSocketAccepted " + transport.host + ":" + transport.port + "\n"); @@ -73,6 +76,7 @@ MeekHTTPHelper.prototype = { // Global variables and functions. +MeekHTTPHelper.LOCAL_PORT = 7000; MeekHTTPHelper.LOCAL_READ_TIMEOUT = 2.0; MeekHTTPHelper.LOCAL_WRITE_TIMEOUT = 2.0;

1 0

[meek/master] Synthesize a SIGTERM on stdin close.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 8611e7da4bd50d2849daeabe0013576117ae613e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 7 23:30:12 2014 -0700 Synthesize a SIGTERM on stdin close. --- meek-client-torbrowser/main.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go index 8890f6d..c4989c3 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -141,6 +141,18 @@ func main() { } defer logKill(meekClientCmd.Process) + // On Windows, we don't get a SIGINT or SIGTERM, rather we are killed + // without a chance to clean up our subprocesses. When run inside + // processterminate-buffer, it is instead processterminate-buffer that + // is killed, and we can detect that event by that our stdout gets + // closed. + // https://trac.torproject.org/projects/tor/ticket/9330 + go func() { + io.Copy(ioutil.Discard, os.Stdin) + log.Printf("synthesizing SIGTERM because of stdin close") + sigChan <-syscall.SIGTERM + }() + sig := <-sigChan log.Printf("sig %s", sig) err = logSignal(meekClientCmd.Process, sig)

1 0

[meek/master] Use an ordinary channel, not a proxied channel.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit cf81b598defd537ed65c015cbf79c322dad26b89 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 19:58:11 2014 -0700 Use an ordinary channel, not a proxied channel. How we're going to handle the proxy issue is by setting a pref in a separate profile. --- firefox/components/main.js | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 8ed3fd1..7b962ac 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -92,19 +92,6 @@ MeekHTTPHelper.LOCAL_PORT = 7000; 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; @@ -146,10 +133,10 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { 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… - this.channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, MeekHTTPHelper.directProxyInfo, 0, 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); + this.channel = ioService.newChannel(req.url, null, null) .QueryInterface(Components.interfaces.nsIHttpChannel); if (req.header !== undefined) { for (var key in req.header) {

1 0

[meek/master] Add processterminate-buffer program.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 82a68236b1a150961d777ef9073044c88a9f9aa4 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 7 23:24:17 2014 -0700 Add processterminate-buffer program. This program insulates a transport plugin from tor on Windows, so that the transport plugin can clean up after itself. --- .gitignore | 1 + processterminate-buffer/main.go | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.gitignore b/.gitignore index 3d5729c..d442bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /meek-client/meek-client /meek-client-torbrowser/meek-client-torbrowser /meek-server/meek-server +/processterminate-buffer/processterminate-buffer diff --git a/processterminate-buffer/main.go b/processterminate-buffer/main.go new file mode 100644 index 0000000..cb68ee4 --- /dev/null +++ b/processterminate-buffer/main.go @@ -0,0 +1,33 @@ +// This program is designed to sit between tor and a transport plugin on +// Windows. On Windows, transport plugins are killed with a ProcessTerminate, +// which doesn't give them a chance to clean up before exiting. +// https://trac.torproject.org/projects/tor/ticket/9330 +// The idea of this program is that the transport plugin can read from its +// standard input, which will be closed when this program is terminated. The +// transport plugin can then treat the stdin-closed event like a SIGTERM. +package main + +import ( + "log" + "os" + "os/exec" +) + +func main() { + args := os.Args[1:] + if len(args) < 1 { + log.Fatalf("%s needs a command to run", os.Args[0]) + } + cmd := exec.Command(args[0], args[1:]...) + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err := cmd.Start() + if err != nil { + log.Fatal(err) + } + err = cmd.Wait() + if err != nil { + log.Fatal(err) + } +}

1 0

[meek/master] Add meek-client-torbrowser program.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 7cba0a659c3abd4b92eb289b20263726d1c6d610 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 10:07:33 2014 -0700 Add meek-client-torbrowser program. This program starts firefox with the meek-http-helper profile and then starts meek-client set up to talk to it. --- .gitignore | 1 + meek-client-torbrowser/Makefile | 18 +++++ meek-client-torbrowser/linux.go | 10 +++ meek-client-torbrowser/mac.go | 10 +++ meek-client-torbrowser/main.go | 160 +++++++++++++++++++++++++++++++++++++ meek-client-torbrowser/windows.go | 10 +++ 6 files changed, 209 insertions(+) diff --git a/.gitignore b/.gitignore index e085380..3d5729c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /meek-client/meek-client +/meek-client-torbrowser/meek-client-torbrowser /meek-server/meek-server diff --git a/meek-client-torbrowser/Makefile b/meek-client-torbrowser/Makefile new file mode 100644 index 0000000..7ce013b --- /dev/null +++ b/meek-client-torbrowser/Makefile @@ -0,0 +1,18 @@ +DESTDIR = +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin + +GOBUILDFLAGS = + +all: meek-client + +meek-client: *.go + go build $(GOBUILDFLAGS) + +clean: + rm -f meek-client-torbrowser + +fmt: + go fmt + +.PHONY: all install clean fmt diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go new file mode 100644 index 0000000..73e363a --- /dev/null +++ b/meek-client-torbrowser/linux.go @@ -0,0 +1,10 @@ +// +build linux +// This file is compiled only on linux. It contains paths used by the linux +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath = "Browser/firefox" +var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" +var meekClientPath = "Tor/PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go new file mode 100644 index 0000000..6830da1 --- /dev/null +++ b/meek-client-torbrowser/mac.go @@ -0,0 +1,10 @@ +// +build darwin +// This file is compiled only on mac. It contains paths used by the mac +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" +var firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" +var meekClientPath = "PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go new file mode 100644 index 0000000..8890f6d --- /dev/null +++ b/meek-client-torbrowser/main.go @@ -0,0 +1,160 @@ +// The meek-client-torbrowser program starts a copy of Tor Browser running +// meek-http-helper in a special profile, and then starts meek-client set up to +// use the browser helper. +// +// Arguments to this program are passed unmodified to meek-client, with the +// addition of a --helper option pointing to the browser helper. +package main + +import ( + "bufio" + "io" + "io/ioutil" + "log" + "os" + "os/exec" + "os/signal" + "path/filepath" + "regexp" + "syscall" +) + +var helperAddrPattern *regexp.Regexp + +// Log a call to os.Process.Kill. +func logKill(p *os.Process) error { + log.Printf("killing PID %d", p.Pid) + err := p.Kill() + if err != nil { + log.Print(err) + } + return err +} + +// Log a call to os.Process.Signal. +func logSignal(p *os.Process, sig os.Signal) error { + log.Printf("sending signal %s to PID %d", sig, p.Pid) + err := p.Signal(sig) + if err != nil { + log.Print(err) + } + return err +} + +// Run firefox and return its exec.Cmd and stdout pipe. +func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { + var profilePath string + // Mac OS X needs an absolute profile path. + profilePath, err = filepath.Abs(firefoxProfilePath) + if err != nil { + return + } + cmd = exec.Command(firefoxPath, "-no-remote", "-profile", profilePath) + cmd.Stderr = os.Stderr + stdout, err = cmd.StdoutPipe() + if err != nil { + return + } + log.Printf("running firefox command %q", cmd.Args) + err = cmd.Start() + if err != nil { + return + } + log.Printf("firefox started with pid %d", cmd.Process.Pid) + return cmd, stdout, nil +} + +// Look for the magic meek-http-helper address string in the Reader, and return +// the address it contains. Start a goroutine to continue reading and discarding +// output of the Reader before returning. +func grepHelperAddr(r io.Reader) (string, error) { + var helperAddr string + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + if m := helperAddrPattern.FindStringSubmatch(line); m != nil { + helperAddr = m[1] + break + } + } + err := scanner.Err() + if err != nil { + return "", err + } + // Ran out of input before finding the pattern. + if helperAddr == "" { + return "", io.EOF + } + // Keep reading from the browser to avoid its output buffer filling. + go io.Copy(ioutil.Discard, r) + return helperAddr, nil +} + +// Run meek-client and return its exec.Cmd. +func runMeekClient(helperAddr string) (cmd *exec.Cmd, err error) { + args := os.Args[1:] + args = append(args, []string{"--helper", helperAddr}...) + cmd = exec.Command(meekClientPath, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + log.Printf("running meek-client command %q", cmd.Args) + err = cmd.Start() + if err != nil { + return + } + log.Printf("meek-client started with pid %d", cmd.Process.Pid) + return cmd, nil +} + +func main() { + var err error + + sigChan := make(chan os.Signal, 1) + signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + + // This magic string is emitted by meek-http-helper. + helperAddrPattern, err = regexp.Compile(`^meek-http-helper: listen (127\.0\.0\.1:\d+)$`) + if err != nil { + log.Fatal(err) + } + + // Start firefox. + firefoxCmd, stdout, err := runFirefox() + if err != nil { + log.Print(err) + return + } + defer logKill(firefoxCmd.Process) + + // Find out the helper's listening address. + helperAddr, err := grepHelperAddr(stdout) + if err != nil { + log.Print(err) + return + } + + // Start meek-client with the helper address. + meekClientCmd, err := runMeekClient(helperAddr) + if err != nil { + log.Print(err) + return + } + defer logKill(meekClientCmd.Process) + + sig := <-sigChan + log.Printf("sig %s", sig) + err = logSignal(meekClientCmd.Process, sig) + if err != nil { + log.Print(err) + } + + // If SIGINT, wait for a second SIGINT. + if sig == syscall.SIGINT { + sig := <-sigChan + log.Printf("sig %s", sig) + err = logSignal(meekClientCmd.Process, sig) + if err != nil { + log.Print(err) + } + } +} diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go new file mode 100644 index 0000000..ed590d8 --- /dev/null +++ b/meek-client-torbrowser/windows.go @@ -0,0 +1,10 @@ +// +build windows +// This file is compiled only on windows. It contains paths used by the windows +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath string = "Browser/firefox.exe" +var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" +var meekClientPath = "Tor/PluggableTransports/meek-client.exe"

1 0

[meek/master] Log meek-client-torbrowser output to a file.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit d9734e12cc51788bfa8310b519dd06c4cee9dd42 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 7 23:34:14 2014 -0700 Log meek-client-torbrowser output to a file. --- meek-client-torbrowser/main.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go index c4989c3..18f165b 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -109,6 +109,13 @@ func runMeekClient(helperAddr string) (cmd *exec.Cmd, err error) { func main() { var err error + f, err := os.OpenFile("meek-client-torbrowser.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) + if err != nil { + log.Fatal(err) + } + defer f.Close() + log.SetOutput(f) + sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

1 0

[meek/master] Block without returning in profile-after-change handler.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 2c4dd9e4bec9a24e674fdcdbf0fba6be3dab3c03 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 23 19:46:15 2014 -0700 Block without returning in profile-after-change handler. As suggested in https://trac.torproject.org/projects/tor/ticket/11183#comment:11, I'm going to try running the HTTP helper in a second browser instance. The extension blocks in order that the browser won't show a browser window. There's probably a better way to block the function without returning, but for now I'm just raising a modal dialog. --- firefox/components/main.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index d4b4d35..8ed3fd1 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -55,11 +55,23 @@ MeekHTTPHelper.prototype = { if (topic !== "profile-after-change") return - // 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(MeekHTTPHelper.LOCAL_PORT, true, -1); - serverSocket.asyncListen(this); + try { + // 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); + // Listen on loopback only, with default backlog. + serverSocket.init(MeekHTTPHelper.LOCAL_PORT, true, -1); + serverSocket.asyncListen(this); + + // Block forever. + var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Components.interfaces.nsIPromptService); + prompts.confirm(null, "Query", "Get down, get funky?"); + } finally { + var app = Components.classes["@mozilla.org/toolkit/app-startup;1"] + .getService(Components.interfaces.nsIAppStartup); + app.quit(app.eForceQuit); + } }, // nsIServerSocketListener implementation.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014