tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[torbutton/master] use correct function name
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit c16e185af35ea05b0612e1453541fb6cadd5111b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 17:44:51 2015 -0700 use correct function name --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 44f62aa..ffa214f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2221,7 +2221,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); } - pref("security.enable_tls_session_tickets", !mode); + m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode); // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"]

1 0

[torbutton/master] Bug 15562: Bind SharedWorkers to thirdparty pref
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit d8d7f2a0d36407d1461666487238b2321e506db4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 17:47:05 2015 -0700 Bug 15562: Bind SharedWorkers to thirdparty pref --- src/chrome/content/torbutton.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ffa214f..c071ec3 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2221,6 +2221,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); } + m_tb_prefs.setBoolPref("dom.workers.sharedWorkers.enabled", !mode); m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode); // Force prefs to be synced to disk

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit ff924f41b59068793d0785229619c33a2baa10ff Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 15:14:37 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0198b98..13bcf8e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -95,6 +95,7 @@ pref("network.http.spdy.enabled", false); // Stores state and may have keepalive pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation +pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562 // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Apr '15

05 Apr '15

commit e0894360cdb10bc6550a64da6b1f8c3f29f1c309 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 5 22:45:34 2015 +0000 Update translations for tails-misc --- ro.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ro.po b/ro.po index ee0c2b3..f4211a7 100644 --- a/ro.po +++ b/ro.po @@ -4,6 +4,7 @@ # # Translators: # Andrei Draga, 2013 +# axel_89 <axel_rap(a)yahoo.com>, 2015 # Draga Bianca - Madalina <dragabianca(a)yahoo.com>, 2014 # Nicola Radu <estonyte(a)yahoo.com>, 2014 # Paul Ionut Anton, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 11:56+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-03-30 16:51+0200\n" +"PO-Revision-Date: 2015-04-05 22:41+0000\n" +"Last-Translator: axel_89 <axel_rap(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" msgstr "Tor este pregătit" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." msgstr "Acum puteți accesa Internetul." @@ -47,7 +48,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "" +msgstr "<h1>Ajutaține sa reparăm greșelilel!</h1>\n\n<p>Citește<a href=\"%s\">instrutia de raportare a greșelilor</a>.</p>\n\n<p><strong>Nu includeți mai multa informație personală\n\ndecît este necesar!</strong></p>\n\n<h2>Despre trimiterea nouă a email-ului personal</h2>\n\n<p>\n\nTrimiterea proprului email ne permite sa vă contactăm pentru a clarifica problema.Asta\n\ne necesar pentru majoritatea raporturilor pe care le primim,altfel fară date de contact\n\ninformația raportata e nefolositoare.Pe de alta parte ea tot permite de a recepționa\n\nca folosiți Tails.\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Apr '15

05 Apr '15

commit cb78cbcdda662c19e918cbeced04cc3e9f8a0200 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 5 22:15:04 2015 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index 348d01b..effa86c 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # Adda.17 <adrianatrifoi(a)gmail.com>, 2013 +# axel_89 <axel_rap(a)yahoo.com>, 2015 # Isus Satanescu <isus(a)openmailbox.org>, 2014 # laura berindei <lauraagavriloae(a)yahoo.com>, 2014 # clopotel <yo_sergiu05(a)yahoo.com>, 2014 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-05 22:11+0000\n" +"Last-Translator: axel_89 <axel_rap(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +280,7 @@ msgstr "Selectare totală" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "Arată QRcod-ul" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" @@ -296,7 +297,7 @@ msgstr "O, spagettios!" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Se pare ca sa produs o eroare cind sa introdus QRcod-ul dumneavoastra." #: lib/bridgedb/templates/bridges.html:121 msgid ""

1 0

[tor-messenger-build/master] Remove part of instantbird/fix-mingw-build.patch
by boklm＠torproject.org 05 Apr '15

05 Apr '15

commit d31e65ca54ccbbb7ead5b2701922d5ec183d7b2e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 5 23:20:09 2015 +0200 Remove part of instantbird/fix-mingw-build.patch This change have been applied upstream. --- projects/instantbird/fix-mingw-build.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch index 8c7ca7c..26359f4 100644 --- a/projects/instantbird/fix-mingw-build.patch +++ b/projects/instantbird/fix-mingw-build.patch @@ -2,15 +2,6 @@ diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index 0376e05c74a5..70c1a6ada34c 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in -@@ -52,7 +52,7 @@ - @RESPATH@/searchplugins/* - @RESPATH@/dictionaries/* - @RESPATH@/hyphenation/* --#ifdef XP_WIN32 -+#ifdef MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER @@ -123,6 +123,8 @@ #endif

1 0

[obfs4/master] Move logging wrappers into common/log, and add a DEBUG log level.
by yawning＠torproject.org 05 Apr '15

05 Apr '15

commit df4265707999b08d220374c08e82711f264247bf Author: Yawning Angel <yawning(a)torproject.org> Date: Fri Apr 3 14:21:31 2015 +0000 Move logging wrappers into common/log, and add a DEBUG log level. Implements feature #15576. --- ChangeLog | 3 + common/log/log.go | 179 ++++++++++++++++++++++++++++++++++++++++++++++ doc/obfs4proxy.1 | 6 +- obfs4proxy/log.go | 88 ----------------------- obfs4proxy/obfs4proxy.go | 142 ++++++++++-------------------------- obfs4proxy/termmon.go | 6 +- 6 files changed, 227 insertions(+), 197 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce868b8..50a2f49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ Changes in version 0.0.5 - UNRELEASED: - Changed the go.net import path to the new location (golang.org/x/net). - Added limited support for detecting if the parent process crashes. - Support for tor feature #15335 (stdin based termination notification). + - Moved the leveled logging wrappers into common/log so they are usable + in transport implementations. + - Added a DEBUG log level. Changes in version 0.0.4 - 2015-02-17 - Improve the runtime performance of the obfs4 handshake tests. diff --git a/common/log/log.go b/common/log/log.go new file mode 100644 index 0000000..5d0a146 --- /dev/null +++ b/common/log/log.go @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +// Package log implements a simple set of leveled logging wrappers around the +// standard log package. +package log + +import ( + "fmt" + "io/ioutil" + "log" + "net" + "os" + "strings" +) + +const ( + elidedAddr = "[scrubbed]" + + levelError = iota + levelWarn + levelInfo + levelDebug +) + +var logLevel = levelInfo +var enableLogging bool +var unsafeLogging bool + +// Init initializes logging with the given path, and log safety options. +func Init(enable bool, logFilePath string, unsafe bool) error { + if enable { + f, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) + if err != nil { + return err + } + log.SetOutput(f) + } else { + log.SetOutput(ioutil.Discard) + } + enableLogging = enable + return nil +} + +// SetLogLevel sets the log level to the value indicated by the given string +// (case-insensitive). +func SetLogLevel(logLevelStr string) error { + switch strings.ToUpper(logLevelStr) { + case "ERROR": + logLevel = levelError + case "WARN": + logLevel = levelWarn + case "INFO": + logLevel = levelInfo + case "DEBUG": + logLevel = levelDebug + default: + return fmt.Errorf("invalid log level '%s'", logLevelStr) + } + return nil +} + +// Noticef logs the given format string/arguments at the NOTICE log level. +func Noticef(format string, a ...interface{}) { + if enableLogging { + msg := fmt.Sprintf(format, a...) + log.Print("[NOTICE]: " + msg) + } +} + +// Errorf logs the given format string/arguments at the ERROR log level. +func Errorf(format string, a ...interface{}) { + if enableLogging && logLevel >= levelError { + msg := fmt.Sprintf(format, a...) + log.Print("[ERROR]: " + msg) + } +} + +// Warnf logs the given format string/arguments at the WARN log level. +func Warnf(format string, a ...interface{}) { + if enableLogging && logLevel >= levelWarn { + msg := fmt.Sprintf(format, a...) + log.Print("[WARN]: " + msg) + } +} + +// Infof logs the given format string/arguments at the INFO log level. +func Infof(format string, a ...interface{}) { + if enableLogging && logLevel >= levelInfo { + msg := fmt.Sprintf(format, a...) + log.Print("[INFO]: " + msg) + } +} + +// Debugf logs the given format string/arguments at the INFO log level. +func Debugf(format string, a ...interface{}) { + if enableLogging && logLevel >= levelDebug { + msg := fmt.Sprintf(format, a...) + log.Print("[DEBUG]: " + msg) + } +} + +// ElideError transforms the string representation of the provided error +// based on the unsafeLogging setting. Callers that wish to log errors +// returned from Go's net package should use ElideError to sanitize the +// contents first. +func ElideError(err error) string { + // Go's net package is somewhat rude and includes IP address and port + // information in the string representation of net.Errors. Figure out if + // this is the case here, and sanitize the error messages as needed. + if unsafeLogging { + return err.Error() + } + + // If err is not a net.Error, just return the string representation, + // presumably transport authors know what they are doing. + netErr, ok := err.(net.Error) + if !ok { + return err.Error() + } + + switch t := netErr.(type) { + case *net.AddrError: + return t.Err + " " + elidedAddr + case *net.DNSError: + return "lookup " + elidedAddr + " on " + elidedAddr + ": " + t.Err + case *net.InvalidAddrError: + return "invalid address error" + case *net.UnknownNetworkError: + return "unknown network " + elidedAddr + case *net.OpError: + return t.Op + ": " + t.Err.Error() + default: + // For unknown error types, do the conservative thing and only log the + // type of the error instead of assuming that the string representation + // does not contain sensitive information. + return fmt.Sprintf("network error: <%T>", t) + } +} + +// ElideAddr transforms the string representation of the provided address based +// on the unsafeLogging setting. Callers that wish to log IP addreses should +// use ElideAddr to sanitize the contents first. +func ElideAddr(addrStr string) string { + if unsafeLogging { + return addrStr + } + + // Only scrub off the address so that it's easier to track connections + // in logs by looking at the port. + if _, port, err := net.SplitHostPort(addrStr); err == nil { + return elidedAddr + ":" + port + } + return elidedAddr +} diff --git a/doc/obfs4proxy.1 b/doc/obfs4proxy.1 index a9c6257..9fb5f28 100644 --- a/doc/obfs4proxy.1 +++ b/doc/obfs4proxy.1 @@ -1,4 +1,4 @@ -.TH OBFS4PROXY 1 "2015-01-20" +.TH OBFS4PROXY 1 "2015-04-03" .SH NAME obfs4proxy \- pluggable transport proxy for Tor, implementing obfs4 .SH SYNOPSIS @@ -28,8 +28,8 @@ Display version information and exit. Enable logging. .TP \fB\-\-logLevel\fR=\fIlevel\fR -Specify the maximum log severity to log out of "\fBERROR\fR", "\fBWARN\fR", and -"\fBINFO\fR". +Specify the maximum log severity to log out of "\fBERROR\fR", "\fBWARN\fR", +"\fBINFO\fR", and "\fBDEBUG\fR". .TP \fB\-\-unsafeLogging\fR Disable the IP address scrubber when logging, storing personally identifiable diff --git a/obfs4proxy/log.go b/obfs4proxy/log.go deleted file mode 100644 index 5440596..0000000 --- a/obfs4proxy/log.go +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -package main - -import ( - "fmt" - "log" - "strings" -) - -const ( - levelError = iota - levelWarn - levelInfo -) - -var logLevel = levelInfo - -func noticef(format string, a ...interface{}) { - if enableLogging { - msg := fmt.Sprintf(format, a...) - log.Print("[NOTICE]: " + msg) - } -} - -func errorf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelError { - msg := fmt.Sprintf(format, a...) - log.Print("[ERROR]: " + msg) - } -} - -func warnf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelWarn { - msg := fmt.Sprintf(format, a...) - log.Print("[WARN]: " + msg) - } -} - -func infof(format string, a ...interface{}) { - if enableLogging && logLevel >= levelInfo { - msg := fmt.Sprintf(format, a...) - log.Print("[INFO]: " + msg) - } -} - -func setLogLevel(logLevelStr string) error { - switch strings.ToUpper(logLevelStr) { - case "ERROR": - logLevel = levelError - - case "WARN": - logLevel = levelWarn - - case "INFO": - logLevel = levelInfo - - default: - return fmt.Errorf("invalid log level '%s'", logLevelStr) - } - - return nil -} diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 9b452ac..608dd55 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> + * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,7 @@ import ( "flag" "fmt" "io" - "io/ioutil" - "log" + golog "log" "net" "net/url" "os" @@ -45,6 +44,7 @@ import ( "golang.org/x/net/proxy" "git.torproject.org/pluggable-transports/goptlib.git" + "git.torproject.org/pluggable-transports/obfs4.git/common/log" "git.torproject.org/pluggable-transports/obfs4.git/transports" "git.torproject.org/pluggable-transports/obfs4.git/transports/base" ) @@ -53,11 +53,8 @@ const ( obfs4proxyVersion = "0.0.4" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" - elidedAddr = "[scrubbed]" ) -var enableLogging bool -var unsafeLogging bool var stateDir string var termMon *termMonitor @@ -65,63 +62,15 @@ var termMon *termMonitor // interface. type DialFn func(string, string) (net.Conn, error) -func elideAddr(addrStr string) string { - if unsafeLogging { - return addrStr - } - - if addr, err := resolveAddrStr(addrStr); err == nil { - // Only scrub off the address so that it's slightly easier to follow - // the logs by looking at the port. - return fmt.Sprintf("%s:%d", elidedAddr, addr.Port) - } - - return elidedAddr -} - -func elideError(err error) string { - // Go's net package is somewhat rude and includes IP address and port - // information in the string representation of net.Errors. Figure out if - // this is the case here, and sanitize the error messages as needed. - if unsafeLogging { - return err.Error() - } - - // If err is not a net.Error, just return the string representation, - // presumably transport authors know what they are doing. - netErr, ok := err.(net.Error) - if !ok { - return err.Error() - } - - switch t := netErr.(type) { - case *net.AddrError: - return t.Err + " " + elidedAddr - case *net.DNSError: - return "lookup " + elidedAddr + " on " + elidedAddr + ": " + t.Err - case *net.InvalidAddrError: - return "invalid address error" - case *net.UnknownNetworkError: - return "unknown network " + elidedAddr - case *net.OpError: - return t.Op + ": " + t.Err.Error() - default: - // For unknown error types, do the conservative thing and only log the - // type of the error instead of assuming that the string representation - // does not contain sensitive information. - return fmt.Sprintf("network error: <%T>", t) - } -} - func clientSetup() (launched bool, listeners []net.Listener) { ptClientInfo, err := pt.ClientSetup(transports.Transports()) if err != nil { - log.Fatal(err) + golog.Fatal(err) } ptClientProxy, err := ptGetProxy() if err != nil { - log.Fatal(err) + golog.Fatal(err) } else if ptClientProxy != nil { ptProxyDone() } @@ -149,7 +98,7 @@ func clientSetup() (launched bool, listeners []net.Listener) { go clientAcceptLoop(f, ln, ptClientProxy) pt.Cmethod(name, ln.Version(), ln.Addr()) - infof("%s - registered listener: %s", name, ln.Addr()) + log.Infof("%s - registered listener: %s", name, ln.Addr()) listeners = append(listeners, ln) launched = true @@ -179,13 +128,13 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) defer termMon.onHandlerFinish() name := f.Transport().Name() - addrStr := elideAddr(conn.Req.Target) - infof("%s(%s) - new connection", name, addrStr) + addrStr := log.ElideAddr(conn.Req.Target) + log.Infof("%s(%s) - new connection", name, addrStr) // Deal with arguments. args, err := f.ParseArgs(&conn.Req.Args) if err != nil { - errorf("%s(%s) - invalid arguments: %s", name, addrStr, err) + log.Errorf("%s(%s) - invalid arguments: %s", name, addrStr, err) conn.Reject() return } @@ -199,7 +148,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // the configuration phase. dialer, err := proxy.FromURL(proxyURI, proxy.Direct) if err != nil { - errorf("%s(%s) - failed to obtain proxy dialer: %s", name, addrStr, elideError(err)) + log.Errorf("%s(%s) - failed to obtain proxy dialer: %s", name, addrStr, log.ElideError(err)) conn.Reject() return } @@ -207,7 +156,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) } remoteConn, err := dialFn("tcp", conn.Req.Target) // XXX: Allow UDP? if err != nil { - errorf("%s(%s) - outgoing connection failed: %s", name, addrStr, elideError(err)) + log.Errorf("%s(%s) - outgoing connection failed: %s", name, addrStr, log.ElideError(err)) conn.Reject() return } @@ -217,20 +166,20 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // bytes back and forth. remote, err := f.WrapConn(remoteConn, args) if err != nil { - errorf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) + log.Errorf("%s(%s) - handshake failed: %s", name, addrStr, log.ElideError(err)) conn.Reject() return } err = conn.Grant(remoteConn.RemoteAddr().(*net.TCPAddr)) if err != nil { - errorf("%s(%s) - SOCKS grant failed: %s", name, addrStr, elideError(err)) + log.Errorf("%s(%s) - SOCKS grant failed: %s", name, addrStr, log.ElideError(err)) return } if err = copyLoop(conn, remote); err != nil { - warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) + log.Warnf("%s(%s) - closed connection: %s", name, addrStr, log.ElideError(err)) } else { - infof("%s(%s) - closed connection", name, addrStr) + log.Infof("%s(%s) - closed connection", name, addrStr) } return @@ -239,7 +188,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) func serverSetup() (launched bool, listeners []net.Listener) { ptServerInfo, err := pt.ServerSetup(transports.Transports()) if err != nil { - log.Fatal(err) + golog.Fatal(err) } for _, bindaddr := range ptServerInfo.Bindaddrs { @@ -269,7 +218,7 @@ func serverSetup() (launched bool, listeners []net.Listener) { pt.SmethodArgs(name, ln.Addr(), nil) } - infof("%s - registered listener: %s", name, elideAddr(ln.Addr().String())) + log.Infof("%s - registered listener: %s", name, log.ElideAddr(ln.Addr().String())) listeners = append(listeners, ln) launched = true @@ -299,28 +248,28 @@ func serverHandler(f base.ServerFactory, conn net.Conn, info *pt.ServerInfo) { defer termMon.onHandlerFinish() name := f.Transport().Name() - addrStr := elideAddr(conn.RemoteAddr().String()) - infof("%s(%s) - new connection", name, addrStr) + addrStr := log.ElideAddr(conn.RemoteAddr().String()) + log.Infof("%s(%s) - new connection", name, addrStr) // Instantiate the server transport method and handshake. remote, err := f.WrapConn(conn) if err != nil { - warnf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) + log.Warnf("%s(%s) - handshake failed: %s", name, addrStr, log.ElideError(err)) return } // Connect to the orport. orConn, err := pt.DialOr(info, conn.RemoteAddr().String(), name) if err != nil { - errorf("%s(%s) - failed to connect to ORPort: %s", name, addrStr, elideError(err)) + log.Errorf("%s(%s) - failed to connect to ORPort: %s", name, addrStr, log.ElideError(err)) return } defer orConn.Close() if err = copyLoop(orConn, remote); err != nil { - warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) + log.Warnf("%s(%s) - closed connection: %s", name, addrStr, log.ElideError(err)) } else { - infof("%s(%s) - closed connection", name, addrStr) + log.Infof("%s(%s) - closed connection", name, addrStr) } return @@ -360,22 +309,6 @@ func copyLoop(a net.Conn, b net.Conn) error { return nil } -func ptInitializeLogging(enable bool) error { - if enable { - // While we could just exit, log an ENV-ERROR so it will propagate to - // the tor log. - f, err := os.OpenFile(path.Join(stateDir, obfs4proxyLogFile), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) - if err != nil { - return ptEnvError(fmt.Sprintf("failed to open log file: %s\n", err)) - } - log.SetOutput(f) - } else { - log.SetOutput(ioutil.Discard) - } - - return nil -} - func getVersion() string { return fmt.Sprintf("obfs4proxy-%s", obfs4proxyVersion) } @@ -387,17 +320,17 @@ func main() { // Handle the command line arguments. _, execName := path.Split(os.Args[0]) showVer := flag.Bool("version", false, "Print version and exit") - logLevelStr := flag.String("logLevel", "ERROR", "Log level (ERROR/WARN/INFO)") - flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) - flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber") + logLevelStr := flag.String("logLevel", "ERROR", "Log level (ERROR/WARN/INFO/DEBUG)") + enableLogging := flag.Bool("enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) + unsafeLogging := flag.Bool("unsafeLogging", false, "Disable the address scrubber") flag.Parse() if *showVer { fmt.Printf("%s\n", getVersion()) os.Exit(0) } - if err := setLogLevel(*logLevelStr); err != nil { - log.Fatalf("[ERROR]: failed to set log level: %s", err) + if err := log.SetLogLevel(*logLevelStr); err != nil { + golog.Fatalf("[ERROR]: %s - failed to set log level: %s", execName, err) } // Determine if this is a client or server, initialize the common state. @@ -405,22 +338,23 @@ func main() { launched := false isClient, err := ptIsClient() if err != nil { - log.Fatalf("[ERROR]: %s - must be run as a managed transport", execName) + golog.Fatalf("[ERROR]: %s - must be run as a managed transport", execName) } if stateDir, err = pt.MakeStateDir(); err != nil { - log.Fatalf("[ERROR]: %s - No state directory: %s", execName, err) + golog.Fatalf("[ERROR]: %s - No state directory: %s", execName, err) } - if err = ptInitializeLogging(enableLogging); err != nil { - log.Fatalf("[ERROR]: %s - failed to initialize logging", execName) + if err = log.Init(*enableLogging, path.Join(stateDir, obfs4proxyLogFile), *unsafeLogging); err != nil { + golog.Fatalf("[ERROR]: %s - failed to initialize logging", execName) } - noticef("%s - launched", getVersion()) + + log.Noticef("%s - launched", getVersion()) // Do the managed pluggable transport protocol configuration. if isClient { - infof("%s - initializing client transport listeners", execName) + log.Infof("%s - initializing client transport listeners", execName) launched, ptListeners = clientSetup() } else { - infof("%s - initializing server transport listeners", execName) + log.Infof("%s - initializing server transport listeners", execName) launched, ptListeners = serverSetup() } if !launched { @@ -429,9 +363,9 @@ func main() { os.Exit(-1) } - infof("%s - accepting connections", execName) + log.Infof("%s - accepting connections", execName) defer func() { - noticef("%s - terminated", execName) + log.Noticef("%s - terminated", execName) }() // At this point, the pt config protocol is finished, and incoming diff --git a/obfs4proxy/termmon.go b/obfs4proxy/termmon.go index 186293c..86db190 100644 --- a/obfs4proxy/termmon.go +++ b/obfs4proxy/termmon.go @@ -35,6 +35,8 @@ import ( "runtime" "syscall" "time" + + "git.torproject.org/pluggable-transports/obfs4.git/common/log" ) var termMonitorOSInit func(*termMonitor) error @@ -77,7 +79,7 @@ func (m *termMonitor) termOnStdinClose() { // expected behavior. No matter what, if this unblocks, assume // that stdin is closed, and treat that as having received a // SIGTERM. - noticef("Stdin is closed or unreadable: %v", err) + log.Noticef("Stdin is closed or unreadable: %v", err) m.sigChan <- syscall.SIGTERM } @@ -97,7 +99,7 @@ func (m *termMonitor) termOnPPIDChange(ppid int) { // Treat the parent PID changing as the same as having received // a SIGTERM. - noticef("Parent pid changed: %d (was %d)", os.Getppid(), ppid) + log.Noticef("Parent pid changed: %d (was %d)", os.Getppid(), ppid) m.sigChan <- syscall.SIGTERM }

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 05 Apr '15

05 Apr '15

commit 7e38edf0e921daa03372b5e709562aae719217e3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 5 15:15:37 2015 +0000 Update translations for tor-launcher-network-settings_completed --- bg/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index f011cd1..6b1c255 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> -<!ENTITY torSettings.proxyQuestion "Нуждае ли се този компютър от прокси за свързване към Интернет?"> +<!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  <!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "Този компютър се нуждае от прокси за да се свърже към Интернет."> +<!ENTITY torsettings.useProxy.checkbox "Необходимо е използването на локален прокси сървър за достъп до Интернет"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Apr '15

05 Apr '15

commit f0e245fc731cf9fcfdc48469ed66421bee670022 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 5 15:15:33 2015 +0000 Update translations for tor-launcher-network-settings --- bg/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index e3dc878..6b1c255 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> @@ -17,7 +17,7 @@ <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна.">

1 0

[webwml/master] Updating faq bandwidth metric
by atagar＠torproject.org 05 Apr '15

05 Apr '15

commit fe2dac49e4ef455140bab8a81b7709063bbd88ba Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 4 17:48:28 2015 -0700 Updating faq bandwidth metric Revising the metric as per Roger's request. --- docs/en/faq.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 58c5a67..bc1fa0e 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -741,7 +741,7 @@ with more funding?</a></h3> href="https://metrics.torproject.org/network.html#networksize">several thousand</a> relays push <a href="https://metrics.torproject.org/network.html#bandwidth">over - 1GB per second on average</a>. We have <a + 7.5GB per second on average</a>. We have <a href="https://metrics.torproject.org/users.html#direct-users">millions of daily users</a>. But the Tor network is not yet

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015