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

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 11 Apr '14

11 Apr '14

commit 6b76ab93cc66699fb4cdccbbb2429a886d78fa01 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 11 17:45:27 2014 +0000 Update translations for tails-greeter_completed --- cs/cs.po | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 18 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index a0f6a59..4c99828 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -4,14 +4,16 @@ # # Translators: # FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2013 -# Radog <bensch.radek(a)gmail.com>, 2013 +# FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2014 +# Pivoj, 2014 +# Radog <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-10-26 10:40+0000\n" -"Last-Translator: Radog <bensch.radek(a)gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-11 17:30+0000\n" +"Last-Translator: FHRFHRFHRFHR <fhr(a)fhrnet.eu>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,26 +38,30 @@ msgid "Use persistence?" msgstr "Použít trvale?" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentace</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "Ano" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "Ne" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "Heslo:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "Jenom pro čtení?" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "Špatné heslo. Zkuste to prosím znovu." -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "Více možností" @@ -65,36 +71,96 @@ msgstr "Administrační heslo" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentace</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "Vložte administrační heslo v případě, že chcete provádět administrační úlohy.\nJinak budou adminstrační úlohy vypnuty pro vyšší bezpečnosti." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "Heslo." -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "Potvrďte heslo:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "Hesla se neshodují" -#: ../glade/optionswindow.glade.h:9 -msgid "Windows Camouflage" -msgstr "Windows Kamufláž" - #: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" +msgstr "Windows kamufláž" + +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentace</a>" + +#: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." msgstr "Toto nastavení změní vzhled Tails na vzhled Microsoft Windows XP. Nastavení se používá na veřejných místech, pro vyhnutí se zbytečné pozornosti okolí." -#: ../glade/optionswindow.glade.h:11 +#: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" msgstr "Aktivovat Micro$oft Windows XP Kamufláž" +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "Spoofing MAC adresy" + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentace</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "Podvrhování MAC adresy schovává sériové číslo vašich síťových karet lokálním sítím. Toto může pomoci schovat vaši geografickou polohu." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "Je celkově bezpečnější schovat MAC adresy, ale také to může vznést podezření nebo způsobit problémy s připojením k síti." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Spoofovat všechny MAC adresy" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Konfigurace sítě" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentace</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "Internetové připojení tohoto počítače nemá v cestě překážky. Budete se chtít připojit přímo do sítě Tor." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "Internetové připojení tohoto počítače je cenzurované, filtrované, nebo je použito proxy. Potřebujete nastavit most, firewall nebo proxy." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 11 Apr '14

11 Apr '14

commit b99947f225f3c0bfff13c586f7fb0ddf3722ac05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 11 17:45:24 2014 +0000 Update translations for tails-greeter --- cs/cs.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 28c25ee..4c99828 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -4,15 +4,16 @@ # # Translators: # FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2013 +# FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2014 # Pivoj, 2014 -# Radog <bensch.radek(a)gmail.com>, 2013 +# Radog <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-17 07:20+0000\n" -"Last-Translator: Pivoj\n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-11 17:30+0000\n" +"Last-Translator: FHRFHRFHRFHR <fhr(a)fhrnet.eu>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgstr "Hesla se neshodují" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Windows kamufláž" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -126,13 +127,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumen msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "Podvrhování MAC adresy schovává sériové číslo vašich síťových karet lokálním sítím. Toto může pomoci schovat vaši geografickou polohu." #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "Je celkově bezpečnější schovat MAC adresy, ale také to může vznést podezření nebo způsobit problémy s připojením k síti." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -152,13 +153,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\ msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "Internetové připojení tohoto počítače nemá v cestě překážky. Budete se chtít připojit přímo do sítě Tor." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "Internetové připojení tohoto počítače je cenzurované, filtrované, nebo je použito proxy. Potřebujete nastavit most, firewall nebo proxy." #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[meek/master] Reflow comment.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit b85de1f97612890110a497c3f84158104f8026aa Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 09:20:17 2014 -0700 Reflow comment. --- meek-client-torbrowser/meek-client-torbrowser.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 74852d3..6ddcf2f 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -169,11 +169,11 @@ func main() { defer logKill(meekClientCmd.Process) 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. + // 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)

1 0

[meek/master] Add --exit-on-stdin-eof option.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit c7478a4fcaa3b0c06c51caf3ba627400865dd5d6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 09:14:35 2014 -0700 Add --exit-on-stdin-eof option. Now it's not hardcoded to happen only on Windows. --- meek-client-torbrowser/linux.go | 2 -- meek-client-torbrowser/mac.go | 2 -- meek-client-torbrowser/meek-client-torbrowser.go | 2 ++ meek-client-torbrowser/windows.go | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index c04d098..a5634b2 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -5,7 +5,5 @@ package main -var exitOnStdinEOF = false - var firefoxPath = "Browser/firefox" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 7d1f0c3..9588512 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -5,7 +5,5 @@ package main -var exitOnStdinEOF = false - var firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" var firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 0fd66ea..74852d3 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -118,10 +118,12 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec } func main() { + var exitOnStdinEOF bool var logFilename string var err error flag.Usage = usage + flag.BoolVar(&exitOnStdinEOF, "exit-on-stdin-eof", false, "exit when stdin is closed (use with terminateprocess-buffer)") flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse() diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 150223b..4dbdb47 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -5,8 +5,5 @@ 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"

1 0

[meek/master] Put command-line usage in --help output.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit 8a55f452226ce038127e2c00d6c4f64a89363fb2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 09:11:36 2014 -0700 Put command-line usage in --help output. --- meek-client-torbrowser/meek-client-torbrowser.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 5309e02..0fd66ea 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -12,6 +12,7 @@ package main import ( "bufio" "flag" + "fmt" "io" "io/ioutil" "log" @@ -25,6 +26,11 @@ import ( var helperAddrPattern *regexp.Regexp +func usage() { + fmt.Fprintf(os.Stderr, "Usage: %s [meek-client-torbrowser args] -- meek-client [meek-client args]\n", os.Args[0]) + flag.PrintDefaults() +} + // Log a call to os.Process.Kill. func logKill(p *os.Process) error { log.Printf("killing PID %d", p.Pid) @@ -115,6 +121,7 @@ func main() { var logFilename string var err error + flag.Usage = usage flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse()

1 0

[meek/master] Disable read/write deadlines when done reading or writing.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit 7c84d72e5b92e710ef560f493d836d722a65e4bb Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 12:01:01 2014 -0700 Disable read/write deadlines when done reading or writing. I was getting long hangs during bootstrapping on Windows 8 in a VM. It seemed to happen most often right after receiving a payload of maximum size, which mostly happens only during bootstrapping. Increasing the timeout to 10 s made it go away. Even though we reset the timeout before every read and write operation, my guess is there's some implicit read or write that was reusing the timeout of the most recent operation. When payloads were big, they took a little more time to process, and failed. --- firefox/components/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index cff6ef0..2890b37 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -184,6 +184,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { output.write32(data.length); MeekHTTPHelper.refreshDeadline(this.transport, deadline); output.writeByteArray(data, data.length); + MeekHTTPHelper.refreshDeadline(this.transport, null); } finally { output.close(); } @@ -301,6 +302,7 @@ MeekHTTPHelper.RequestReader.prototype = { converter.charset = "UTF-8"; var s = converter.convertFromByteArray(this.buf, this.buf.length); var req = JSON.parse(s); + MeekHTTPHelper.refreshDeadline(this.transport, null); this.callback(req); }, };

1 0

[meek/master] Make the path to meek-client be provided on the command line.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit d18de77e227d262bf95632b3948c053ae258e32f Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 09:01:19 2014 -0700 Make the path to meek-client be provided on the command line. It's nicer and more transparent if you can change this in torrc, rather than needing to recompile something. --- meek-client-torbrowser/linux.go | 1 - meek-client-torbrowser/mac.go | 1 - meek-client-torbrowser/meek-client-torbrowser.go | 6 ++++-- meek-client-torbrowser/windows.go | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 04d17c8..c04d098 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -9,4 +9,3 @@ 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 8791403..7d1f0c3 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -9,4 +9,3 @@ 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/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 1ac2f93..9367b2b 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -1,5 +1,5 @@ // Usage: -// meek-client-torbrowser -- --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +// meek-client-torbrowser -- meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log // // 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 @@ -95,7 +95,9 @@ func grepHelperAddr(r io.Reader) (string, error) { } // Run meek-client and return its exec.Cmd. -func runMeekClient(helperAddr string, args []string) (cmd *exec.Cmd, err error) { +func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec.Cmd, err error) { + meekClientPath := meekClientCommandLine[0] + args := meekClientCommandLine[1:] args = append(args, []string{"--helper", helperAddr}...) cmd = exec.Command(meekClientPath, args...) cmd.Stdout = os.Stdout diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 5e8ea0d..150223b 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -10,4 +10,3 @@ 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

[meek/master] Use the flag package in meek-client-torbrowser.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit f7e684cc2f317ee8c2e8b0479c450d219b1afc24 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 08:55:20 2014 -0700 Use the flag package in meek-client-torbrowser. I want to be able to give separate arguments to meek-client-torbrowser (like a log file). You can separate meek-client-torbrowser's options from meek-client's with a "--". --- meek-client-torbrowser/meek-client-torbrowser.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 1d55eff..1ac2f93 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -1,3 +1,6 @@ +// Usage: +// meek-client-torbrowser -- --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +// // 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. @@ -8,6 +11,7 @@ package main import ( "bufio" + "flag" "io" "io/ioutil" "log" @@ -91,8 +95,7 @@ func grepHelperAddr(r io.Reader) (string, error) { } // Run meek-client and return its exec.Cmd. -func runMeekClient(helperAddr string) (cmd *exec.Cmd, err error) { - args := os.Args[1:] +func runMeekClient(helperAddr string, args []string) (cmd *exec.Cmd, err error) { args = append(args, []string{"--helper", helperAddr}...) cmd = exec.Command(meekClientPath, args...) cmd.Stdout = os.Stdout @@ -109,6 +112,8 @@ func runMeekClient(helperAddr string) (cmd *exec.Cmd, err error) { func main() { var err error + flag.Parse() + f, err := os.OpenFile("meek-client-torbrowser.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatal(err) @@ -141,7 +146,7 @@ func main() { } // Start meek-client with the helper address. - meekClientCmd, err := runMeekClient(helperAddr) + meekClientCmd, err := runMeekClient(helperAddr, flag.Args()) if err != nil { log.Print(err) return

1 0

[meek/master] Add --log option to meek-client-torbrowser.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit 66cb42ccd4057e88d6d4a5e58c6fe041f5d39d57 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 09:07:36 2014 -0700 Add --log option to meek-client-torbrowser. --- meek-client-torbrowser/meek-client-torbrowser.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 9367b2b..5309e02 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -1,5 +1,5 @@ // Usage: -// meek-client-torbrowser -- meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +// meek-client-torbrowser --log meek-client-torbrowser.log -- meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log // // 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 @@ -112,16 +112,20 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec } func main() { + var logFilename string var err error + flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse() - f, err := os.OpenFile("meek-client-torbrowser.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) - if err != nil { - log.Fatal(err) + if logFilename != "" { + 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) } - defer f.Close() - log.SetOutput(f) sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

1 0

[meek/master] Move a couple programs to be named after themselves.
by dcf＠torproject.org 11 Apr '14

11 Apr '14

commit 0f40b62cba0aa8581432b37f867d197ba2c32fba Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 08:41:12 2014 -0700 Move a couple programs to be named after themselves. --- meek-client-torbrowser/main.go | 181 -------------------- meek-client-torbrowser/meek-client-torbrowser.go | 181 ++++++++++++++++++++ terminateprocess-buffer/main.go | 38 ---- terminateprocess-buffer/terminateprocess-buffer.go | 38 ++++ 4 files changed, 219 insertions(+), 219 deletions(-) diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go deleted file mode 100644 index 1d55eff..0000000 --- a/meek-client-torbrowser/main.go +++ /dev/null @@ -1,181 +0,0 @@ -// 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 - - 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) - - // 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) - - 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) - 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/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go new file mode 100644 index 0000000..1d55eff --- /dev/null +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -0,0 +1,181 @@ +// 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 + + 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) + + // 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) + + 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) + 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/terminateprocess-buffer/main.go b/terminateprocess-buffer/main.go deleted file mode 100644 index 16a7297..0000000 --- a/terminateprocess-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 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) - } -} diff --git a/terminateprocess-buffer/terminateprocess-buffer.go b/terminateprocess-buffer/terminateprocess-buffer.go new file mode 100644 index 0000000..16a7297 --- /dev/null +++ b/terminateprocess-buffer/terminateprocess-buffer.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