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

[orbot/master] improved logging and exit code reporting for transproxy
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit 831a52a7e9b302b87a570ee564af0c22fa79e586 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:12:00 2014 -0400 improved logging and exit code reporting for transproxy --- src/org/torproject/android/service/TorService.java | 20 +++- .../torproject/android/service/TorTransProxy.java | 104 ++++++++++++-------- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 9382fe2..1d2c727 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -273,16 +273,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst appBinHome = getDir(DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); appCacheHome = getDir(DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); - - + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { @@ -293,6 +289,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst setTorProfile(PROFILE_ON); } } + else if (intent == null) + { + try { + initBinaries(); + findExistingProc () ; + + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + } // We want this service to continue running until it is explicitly // stopped, so return sticky. diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5438d16..b813ac8 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -1,7 +1,9 @@ package org.torproject.android.service; import java.io.File; +import java.io.IOException; import java.util.ArrayList; +import java.util.concurrent.TimeoutException; import org.sufficientlysecure.rootcommands.Shell; import org.sufficientlysecure.rootcommands.command.SimpleCommand; @@ -286,6 +288,7 @@ public class TorTransProxy implements TorServiceConstants { //reset script Shell shell = Shell.startRootShell(); + int lastExit = -1; //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) @@ -312,7 +315,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); // Same for DNS @@ -326,9 +329,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -345,8 +349,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(port); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + } @@ -360,8 +365,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -o lo"); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Reject all other outbound TCP packets script.append(ipTablesPath); @@ -373,9 +379,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); @@ -386,7 +393,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); + } } @@ -395,9 +404,19 @@ public class TorTransProxy implements TorServiceConstants { shell.close(); - return 1; + return lastExit; } + private int executeCommand (Shell shell, String cmdString) throws IOException, TimeoutException + { + SimpleCommand cmd = new SimpleCommand(cmdString); + shell.add(cmd); + cmd.waitForFinish(); + logMessage(cmdString + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); + + return cmd.getExitCode(); + } + public int enableTetheringRules (Context context) throws Exception { @@ -410,6 +429,8 @@ public class TorTransProxy implements TorServiceConstants { Shell shell = Shell.startRootShell(); + int lastExit = -1; + for (int i = 0; i < hwinterfaces.length; i++) { @@ -420,7 +441,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p udp --dport 53 -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); + script = new StringBuilder(); + script = new StringBuilder(); script.append(ipTablesPath); @@ -429,22 +452,22 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); + } shell.close(); - return 0; + return lastExit; } private void logMessage (String msg) { if (mTorService != null) mTorService.logMessage(msg); - else - Log.w(TorConstants.TAG,msg); } public int clearTransparentProxyingAll(Context context) throws Exception @@ -463,7 +486,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -F ").append(chainName); //delete previous user-defined chain - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); + script = new StringBuilder(); + script = new StringBuilder(); @@ -471,15 +496,11 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t filter"); script.append(" -F ").append(chainName); //delete previous user-defined chain - SimpleCommand cmd = new SimpleCommand(script.toString()); - - shell.add(cmd); - - int exitCode = cmd.getExitCode(); - + int lastExit = executeCommand (shell, script.toString()); + shell.close(); - return exitCode; + return lastExit; } public int fixTransproxyLeak (Context context) throws Exception @@ -491,16 +512,20 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder script = new StringBuilder(); script.append(ipTablesPath); script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,FIN ACK,FIN -j DROP"); - shell.add(new SimpleCommand(script.toString())); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); script = new StringBuilder(); script.append(ipTablesPath); script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,RST ACK,RST -j DROP"); - shell.add(new SimpleCommand(script.toString())); + + int lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); shell.close(); - return 1; + return lastExit; } @@ -528,9 +553,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(torUid); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Set up port redirection script.append(ipTablesPath); script.append(" -t nat"); @@ -543,7 +569,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); // Same for DNS @@ -559,9 +585,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + /** int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; @@ -591,9 +617,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -o lo"); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + if (TorService.ENABLE_DEBUG_LOG) { @@ -608,9 +634,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'"); script.append(" --log-uid"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); @@ -619,9 +645,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); script.append(" --log-uid"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + } // Reject all other outbound TCP packets @@ -634,9 +660,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); @@ -647,16 +673,12 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - SimpleCommand cmd = new SimpleCommand(script.toString()); - shell.add(cmd); + int lastExit = executeCommand (shell, script.toString()); fixTransproxyLeak (context); - - int exitCode = cmd.getExitCode(); - shell.close(); - return exitCode; + return lastExit; }

1 0

[orbot/master] fix Service init/bind logic
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit f8532715c0388f0c17558939140299524dc49076 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:11:38 2014 -0400 fix Service init/bind logic also remove updates for background drawing to save memory --- src/org/torproject/android/Orbot.java | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index f28328d..9bd504b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -75,6 +75,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic /* Tor Service interaction */ /* The primary interface we will be calling on the service. */ ITorService mService = null; + + //should move this up with all the other class variables + private boolean mIsBound = false; + private Intent mTorService = null; + + private boolean autoStartFromIntent = false; SharedPreferences mPrefs; @@ -89,6 +95,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic setLocale(); doLayout(); + + mTorService = new Intent(this, TorService.class); + getApplication().getApplicationContext().startService(mTorService); + } private void doLayout () @@ -800,7 +810,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (torStatus != newTorStatus) { imgStatus.setImageResource(R.drawable.toron); - mViewMain.setBackgroundResource(R.drawable.onionrootonly); + // mViewMain.setBackgroundResource(R.drawable.onionrootonly); + String lblMsg = getString(R.string.status_activated); lblStatus.setText(lblMsg); @@ -842,7 +853,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (torStatus != newTorStatus) { imgStatus.setImageResource(R.drawable.torstarting); - mViewMain.setBackgroundResource(R.drawable.onionrootonlygold); + // mViewMain.setBackgroundResource(R.drawable.onionrootonlygold); if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); @@ -858,7 +869,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else if (torStatus != newTorStatus) { - mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey); + // mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey); imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); @@ -1130,21 +1141,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }; - //should move this up with all the other class variables - boolean mIsBound = false; - //this is where we bind! private void bindService () { - Intent iTorService = new Intent(this, TorService.class); - - getApplication().getApplicationContext().startService(iTorService); - //since its auto create, we prob don't ever need to call startService //also we should again be consistent with using either iTorService.class.getName() //or the variable constant - bindService(iTorService, + bindService(mTorService, mConnection, Context.BIND_AUTO_CREATE); mIsBound = true;

1 0

[orbot/master] bump to 13.0.6-BETA-8
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit 8d73be655e84879e56369546cdefa7c8d84fa4ac Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:13:23 2014 -0400 bump to 13.0.6-BETA-8 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 77a18bf..e537388 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="13.0.6-BETA-7" - android:versionCode="77" + android:versionName="13.0.6-BETA-8" + android:versionCode="78" android:installLocation="auto" >

1 0

[tor/master] Report only the first bootstrap failure from an orconn
by nickm＠torproject.org 09 Apr '14

09 Apr '14

commit b0bbe6b2f1d8f0f2c83565f94d8a7dc5c5f72a91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 15:58:43 2014 -0400 Report only the first bootstrap failure from an orconn Otherwise, when we report "identity mismatch", we then later report DONE when the connection gets closed. Fixes bug 10431; bugfix on 0.2.1.1-alpha. --- changes/bug10431 | 5 +++++ src/or/control.c | 7 ++++++- src/or/control.h | 2 +- src/or/or.h | 4 ++++ src/test/test_extorport.c | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/changes/bug10431 b/changes/bug10431 new file mode 100644 index 0000000..39353a2 --- /dev/null +++ b/changes/bug10431 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Only report the first fatal boostrap error on a given OR + connection. This prevents controllers from declaring that a + connection has failed because of "DONE" or other junk reasons. + Fixes bug 10431; bugfix on 0.2.1.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 23e2054..43c0539 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4884,7 +4884,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress) */ MOCK_IMPL(void, control_event_bootstrap_problem, (const char *warn, int reason, - const or_connection_t *or_conn)) + or_connection_t *or_conn)) { int status = bootstrap_percent; const char *tag, *summary; @@ -4895,6 +4895,11 @@ MOCK_IMPL(void, /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); + if (or_conn->have_noted_bootstrap_problem) + return; + + or_conn->have_noted_bootstrap_problem = 1; + if (bootstrap_percent == 100) return; /* already bootstrapped; nothing to be done here. */ diff --git a/src/or/control.h b/src/or/control.h index ce605a1..988c171 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -94,7 +94,7 @@ void monitor_owning_controller_process(const char *process_spec); void control_event_bootstrap(bootstrap_status_t status, int progress); MOCK_DECL(void, control_event_bootstrap_problem,(const char *warn, int reason, - const or_connection_t *or_conn)); + or_connection_t *or_conn)); void control_event_clients_seen(const char *controller_str); void control_event_transport_launched(const char *mode, diff --git a/src/or/or.h b/src/or/or.h index 38ab176..1ecded9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1481,6 +1481,10 @@ typedef struct or_connection_t { unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; + /** True iff this connection has had its bootstrap failure logged with + * control_event_bootstrap_problem. */ + unsigned int have_noted_bootstrap_problem:1; + uint16_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index b34f5e3..f91ac74 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -364,7 +364,7 @@ test_ext_or_cookie_auth_testvec(void *arg) static void ignore_bootstrap_problem(const char *warn, int reason, - const or_connection_t *conn) + or_connection_t *conn) { (void)warn; (void)reason;

1 0

[tor/master] Merge remote-tracking branch 'public/bug10431'
by nickm＠torproject.org 09 Apr '14

09 Apr '14

commit fa6b80d6e510dd7027cc2dab50622bad4dc90064 Merge: aacbf55 b0bbe6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 9 08:29:21 2014 -0400 Merge remote-tracking branch 'public/bug10431' changes/bug10431 | 5 +++++ src/or/control.c | 7 ++++++- src/or/control.h | 2 +- src/or/or.h | 4 ++++ src/test/test_extorport.c | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --cc src/or/control.c index 7f421a7,43c0539..c917052 mode 100755,100644..100755 --- a/src/or/control.c +++ b/src/or/control.c

1 0

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

09 Apr '14

commit b745ab3c5a08607f0094dcba8fa1178d3ca58438 Merge: 9324923 7ce93df Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 8 22:54:18 2014 -0700 Merge branch 'extension' Conflicts: meek-client/meek-client.go .gitignore | 2 + firefox/chrome.manifest | 5 + firefox/components/main.js | 354 +++++++++++++++++++++++++++++++++++++ firefox/install.rdf | 21 +++ meek-client-torbrowser/Makefile | 18 ++ meek-client-torbrowser/linux.go | 12 ++ meek-client-torbrowser/mac.go | 12 ++ meek-client-torbrowser/main.go | 181 +++++++++++++++++++ meek-client-torbrowser/windows.go | 13 ++ meek-client/helper.go | 104 +++++++++++ meek-client/meek-client.go | 24 ++- meek-client/torrc | 1 + terminateprocess-buffer/main.go | 38 ++++ 13 files changed, 784 insertions(+), 1 deletion(-) diff --cc meek-client/meek-client.go index b361c79,536dd69..1300474 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@@ -219,7 -228,8 +228,8 @@@ func main() 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(&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") flag.Parse()

1 0

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

09 Apr '14

commit 2922b23f1ec5148ef05f8fa959ddb182af3b5516 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 8 01:34:04 2014 -0700 fmt. --- 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 18f165b..b00cc34 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -157,7 +157,7 @@ func main() { go func() { io.Copy(ioutil.Discard, os.Stdin) log.Printf("synthesizing SIGTERM because of stdin close") - sigChan <-syscall.SIGTERM + sigChan <- syscall.SIGTERM }() sig := <-sigChan

1 0

[meek/master] The function is called TerminateProcess, not ProcessTerminate.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 634c6236d9fbc3471d9561e1d534f326308e536f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 8 02:22:58 2014 -0700 The function is called TerminateProcess, not ProcessTerminate. --- .gitignore | 2 +- meek-client-torbrowser/main.go | 2 +- processterminate-buffer/main.go | 38 -------------------------------------- terminateprocess-buffer/main.go | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index d442bd2..d6b0e59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /meek-client/meek-client /meek-client-torbrowser/meek-client-torbrowser /meek-server/meek-server -/processterminate-buffer/processterminate-buffer +/terminateprocess-buffer/terminateprocess-buffer diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go index f7d96f2..ae98328 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -150,7 +150,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 + // terminateprocess-buffer, it is instead terminateprocess-buffer that // is killed, and we can detect that event by that our stdin gets // closed. // https://trac.torproject.org/projects/tor/ticket/9330 diff --git a/processterminate-buffer/main.go b/processterminate-buffer/main.go deleted file mode 100644 index 05d586d..0000000 --- a/processterminate-buffer/main.go +++ /dev/null @@ -1,38 +0,0 @@ -// 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 ( - "io" - "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:]...) - stdin, err := cmd.StdinPipe() - if err != nil { - log.Fatal(err) - } - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - err = cmd.Start() - if err != nil { - log.Fatal(err) - } - io.Copy(stdin, os.Stdin) - err = cmd.Wait() - if err != nil { - log.Fatal(err) - } -} diff --git a/terminateprocess-buffer/main.go b/terminateprocess-buffer/main.go new file mode 100644 index 0000000..16a7297 --- /dev/null +++ b/terminateprocess-buffer/main.go @@ -0,0 +1,38 @@ +// This program is designed to sit between tor and a transport plugin on +// Windows. On Windows, transport plugins are killed with a TerminateProcess, +// 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 ( + "io" + "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:]...) + stdin, err := cmd.StdinPipe() + if err != nil { + log.Fatal(err) + } + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err = cmd.Start() + if err != nil { + log.Fatal(err) + } + io.Copy(stdin, os.Stdin) + err = cmd.Wait() + if err != nil { + log.Fatal(err) + } +}

1 0

[meek/master] Do the exit-on-stdin-EOF trick on Windows only.
by dcf＠torproject.org 09 Apr '14

09 Apr '14

commit 7ce93df22d535a3b2d6bc60df53c3435a002fdee Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 8 12:04:38 2014 -0700 Do the exit-on-stdin-EOF trick on Windows only. It looks like stdin gets closed by tor, so on other platforms without terminateprocess-buffer, the program was exiting immediately. --- meek-client-torbrowser/linux.go | 2 ++ meek-client-torbrowser/mac.go | 2 ++ meek-client-torbrowser/main.go | 24 +++++++++++++----------- meek-client-torbrowser/windows.go | 3 +++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 73e363a..04d17c8 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -5,6 +5,8 @@ package main +var exitOnStdinEOF = false + 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 index 6830da1..8791403 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -5,6 +5,8 @@ package main +var exitOnStdinEOF = false + 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 index ae98328..1d55eff 100644 --- a/meek-client-torbrowser/main.go +++ b/meek-client-torbrowser/main.go @@ -148,17 +148,19 @@ 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 - // terminateprocess-buffer, it is instead terminateprocess-buffer that - // is killed, and we can detect that event by that our stdin 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 - }() + if exitOnStdinEOF { + // 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 + // terminateprocess-buffer, it is instead terminateprocess-buffer that + // is killed, and we can detect that event by that our stdin 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) diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index ed590d8..5e8ea0d 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -5,6 +5,9 @@ package main +// Workaround for process termination on Windows only. +var exitOnStdinEOF = true + var firefoxPath string = "Browser/firefox.exe" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" var meekClientPath = "Tor/PluggableTransports/meek-client.exe"

1 0