December 2013 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 15 Dec '13

15 Dec '13

commit d9a81e3e77dbce645fba4e8c2a1da78b3eb89841 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 15 17:15:55 2013 +0000 Update translations for torcheck_completed --- es_AR/torcheck.po | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/es_AR/torcheck.po b/es_AR/torcheck.po index b2b1f0e..2274d63 100644 --- a/es_AR/torcheck.po +++ b/es_AR/torcheck.po @@ -1,14 +1,15 @@ # TorCheck gettext template -# Copyright (C) 2008-2013 The Tor Project, Inc +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# TorUserSpanishHelp, 2013 # maximusr <ocoolmax(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-04 05:10+0000\n" -"Last-Translator: maximusr <ocoolmax(a)gmail.com>\n" +"PO-Revision-Date: 2013-12-15 17:00+0000\n" +"Last-Translator: TorUserSpanishHelp\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,8 +18,8 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "Congratulations. This browser is configured to use Tor." -msgstr "Felicitaciones. Este navegador está configurado para usar Tor." +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "Felicitaciones. Su navegador está configurado para usar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -54,12 +55,3 @@ msgstr "Una falla temporal de servicio evitó que determinemos si tu dirección msgid "Your IP address appears to be: " msgstr "Tu dirección IP aparentemente es:" - -msgid "Are you using Tor?" -msgstr "Estás usando Tor?" - -msgid "This page is also available in the following languages:" -msgstr "Esta página está también disponible en los siguientes idiomas:" - -msgid "For more information about this exit relay, see:" -msgstr "Para mas información sobre este relé de salida vea:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 15 Dec '13

15 Dec '13

commit 77a608b5b96bf096dad7aa555296b82f15564094 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 15 17:15:51 2013 +0000 Update translations for torcheck --- es_AR/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es_AR/torcheck.po b/es_AR/torcheck.po index b538f1e..2274d63 100644 --- a/es_AR/torcheck.po +++ b/es_AR/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# TorUserSpanishHelp, 2013 # maximusr <ocoolmax(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 08:58+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-12-15 17:00+0000\n" +"Last-Translator: TorUserSpanishHelp\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "" +msgstr "Felicitaciones. Su navegador está configurado para usar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> "

1 0

[torbirdy/master] Update translations in chrome.manifest
by sukhbir＠torproject.org 15 Dec '13

15 Dec '13

commit 3b05601f5acc20ffa825e30ca8a8521d9b6a2a0a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Dec 15 01:21:22 2013 -0500 Update translations in chrome.manifest --- chrome.manifest | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chrome.manifest b/chrome.manifest index d0aaef6..20e4975 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -18,11 +18,14 @@ locale castironthunderbirdclub eu chrome/locale/eu/ locale castironthunderbirdclub fr chrome/locale/fr/ locale castironthunderbirdclub he chrome/locale/he/ locale castironthunderbirdclub it chrome/locale/it/ +locale castironthunderbirdclub ja chrome/locale/ja/ locale castironthunderbirdclub lv chrome/locale/lv/ +locale castironthunderbirdclub ms-MY chrome/locale/ms-MY/ locale castironthunderbirdclub nl chrome/locale/nl/ locale castironthunderbirdclub pa chrome/locale/pa/ locale castironthunderbirdclub pl chrome/locale/pl/ locale castironthunderbirdclub pt-BR chrome/locale/pt-BR/ +locale castironthunderbirdclub ru chrome/locale/ru/ locale castironthunderbirdclub sv chrome/locale/sv/ locale castironthunderbirdclub tr chrome/locale/tr/ locale castironthunderbirdclub zh-CN chrome/locale/zh-CN/

1 0

[torbirdy/master] Add Russian translation
by sukhbir＠torproject.org 15 Dec '13

15 Dec '13

commit 7007aff63b3347f21457279fcb23b488adf35d35 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Dec 15 01:17:59 2013 -0500 Add Russian translation --- ChangeLog | 2 +- chrome/locale/ru/torbirdy.dtd | 63 ++++++++++++++++++++++++++++++++++ chrome/locale/ru/torbirdy.properties | 19 ++++++++++ import-translations.sh | 2 +- 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f68a26e..2ec8146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ The default keyserver (hidden service) has been updated: hkp://qdigse2yzvuglcix.onion New translations: - Japanese, Malay + Japanese, Malay, Russian Show the Sender header in message pane (closes #10226) 0.1.2, 04 Nov 2013 diff --git a/chrome/locale/ru/torbirdy.dtd b/chrome/locale/ru/torbirdy.dtd new file mode 100644 index 0000000..8c90aa2 --- /dev/null +++ b/chrome/locale/ru/torbirdy.dtd @@ -0,0 +1,63 @@ +<!ENTITY torbirdy.accountprefs.title "Конфигурация аккаунта"> +<!ENTITY torbirdy.accountprefs.startup.label "Проверять наличие новых сообщений при запуске"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Проверять наличие новых сообщений каждые"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "протокол"> +<!ENTITY torbirdy.accountprefs.cancel.button "Отмена"> +<!ENTITY torbirdy.accountprefs.save.button "Сохранить"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "Предпочтения TorBirdy "> +<!ENTITY torbirdy.prefs.save.button "Сохранить"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Отмена"> +<!ENTITY torbirdy.prefs.extra2.button "Восстановить значения по умолчанию"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "Проверить настройки прокси"> +<!ENTITY torbirdy.prefs.testproxy.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Прокси"> +<!ENTITY torbirdy.prefs.privacy.label "Приватность"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Безопасность"> +<!ENTITY torbirdy.prefs.recommended.text "Использовать рекомендуемые параметры прокси-сервера для TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Выберите сервис анонимизации"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Использовать параметры прокси:"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS хост: "> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Порт:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Сквозная тарификация (Внимание: требуется специальный transproxy или Tor маршрутизатор)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Глобальные"> +<!ENTITY torbirdy.prefs.imap.label "Активировать поддержку email push для IMAP аккаунтов [по умолчанию: отключено]"> +<!ENTITY torbirdy.prefs.imap.key "p"> +<!ENTITY torbirdy.prefs.startup_folder.label "Выбор последней почтовой папки, к которой осуществлялся доступ, при запуске [по умолчанию: отключено]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Не устанавливать часовой пояс Thunderbird по Гринвичу [по умолчанию: установить по Гринвичу]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не помещать идентификаторы ключей получателей в зашифрованные сообщения [по умолчанию: отключено]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.confirmemail.label "Запрашивать активацию Enigmail перед отправкой письма [по умолчанию: не запрашивать]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "Активировать автоматический мастер настройки почты Thunderbird [по умолчанию: не активирован]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "Автоматически проверять новые сообщения для всех новых аккаунтов [по умолчанию: отключено]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.renegotiation.label "Разрешить соединения с серверами не поддерживающими SSL/TLS с безопасным согласованием [по умолчанию: запретить]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> +<!ENTITY torbirdy.prefs.account_specific "Определяемые учетной записью"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Выберите аккаунт:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Сервер(ы) ключей для использования:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Использовать маршрутизатор Tor Onion"> +<!ENTITY torbirdy.panel.usejondo.label "Использовать JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Использовать Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Открыть предпочтения TorBirdy"> + +<!ENTITY torbirdy.firstrun.title "Первый запуск TorBirdy"> diff --git a/chrome/locale/ru/torbirdy.properties b/chrome/locale/ru/torbirdy.properties new file mode 100644 index 0000000..d326adf --- /dev/null +++ b/chrome/locale/ru/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy доступно: Tor +torbirdy.enabled.jondo=TorBirdy Включен: JonDo +torbirdy.enabled.custom=TorBirdy доступно: Пользовательский Прокси +torbirdy.enabled.torification=TorBirdy Включен: Прозрачная Tor-ификация +torbirdy.enabled.whonix=TorBirdy Включен: Whonix +torbirdy.disabled=TorBirdy: Отключено! + +torbirdy.email.prompt=TorBirdy отключил помощник авто-конфигурации Thunderbird что бы защитить вашу анонимность.\nДля %S были установлены рекомендуемые настройки безопасности.\nТеперь вы можете настроить другие параметры учетной записи вручную. + +torbirdy.email.advanced=Пожалуйста, обратите внимание, что изменение расширенных настроек из TorBirdy не рекомендуется. ⏎ ⏎ Вы должны только продолжать, если вы уверены, что вы делаете. +torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз +torbirdy.email.advanced.title=TorBirdy расширенные настройки + +torbirdy.restart=Thunderbird необходимо перезапустить, чтобы настройки часового пояса вступили в силу. + +torbirdy.firstrun=Вы запустили TorBirdy.\nЧто бы помочь защитить вашу анонимность, TorBirdy будет контролировать настройки Thunderbird, которые он установил, предотвращая их изменение Вами или любым дополнением. Есть несколько настроек, которые могут быть изменены и они доступны в окне настроек TorBirdy. В случае удаления или отключения TorBirdy, все настройки которые он контролировал сбросятся к своим значениям по-умолчанию (значениям которые были до установки TorBirdy).\nЕсли Вы новый пользователь, рекомендуем Вам ознакомиться с сайтом TorBirdy что бы понять что мы пытаемся сделать посредством TorBirdy для наших пользователей. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/import-translations.sh b/import-translations.sh index 39ee9dc..57c7d76 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -2,7 +2,7 @@ # Script to fetch and update translations. Modified from tor-launcher. -BUNDLE_LOCALES="ar da eu he lv pa pt-BR tr cs de es fr it nl pl sv zh-CN ms-MY ja" +BUNDLE_LOCALES="ar da eu he lv pa pt-BR tr cs de es fr it nl pl sv zh-CN ms-MY ja ru" if [ -d translation ]; then

1 0

[websocket/master] Check the type of accept errors and close listeners explicitly.
by dcf＠torproject.org 15 Dec '13

15 Dec '13

commit a656ff02d15ebc8c1cf937d94c1a6ad9bbdcb038 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 21:53:32 2013 -0800 Check the type of accept errors and close listeners explicitly. --- websocket-client/websocket-client.go | 6 +++++- websocket-server/websocket-server.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/websocket-client/websocket-client.go b/websocket-client/websocket-client.go index d1d6dcc..228cb1c 100644 --- a/websocket-client/websocket-client.go +++ b/websocket-client/websocket-client.go @@ -152,10 +152,14 @@ func handleConnection(conn *pt.SocksConn) error { } func socksAcceptLoop(ln *pt.SocksListener) error { + defer ln.Close() for { socks, err := ln.AcceptSocks() if err != nil { - return err + if e, ok := err.(*net.OpError); ok && !e.Temporary() { + return err + } + continue } go func() { err := handleConnection(socks) diff --git a/websocket-server/websocket-server.go b/websocket-server/websocket-server.go index 84b5e5c..64ae7b4 100644 --- a/websocket-server/websocket-server.go +++ b/websocket-server/websocket-server.go @@ -192,6 +192,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { return nil, err } go func() { + defer ln.Close() var config websocket.Config config.Subprotocols = []string{"base64"} config.MaxMessageSize = maxMessageSize

1 0

[goptlib/master] Close listeners after acceptLoop.
by dcf＠torproject.org 15 Dec '13

15 Dec '13

commit b0a20051b814cc9115926f32f5d1b11bb081cd18 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 21:15:41 2013 -0800 Close listeners after acceptLoop. --- examples/dummy-client/dummy-client.go | 1 + examples/dummy-server/dummy-server.go | 1 + pt.go | 2 ++ 3 files changed, 4 insertions(+) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 01d843b..e1cede5 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -67,6 +67,7 @@ func handler(conn *pt.SocksConn) error { } func acceptLoop(ln *pt.SocksListener) error { + defer ln.Close() for { conn, err := ln.AcceptSocks() if err != nil { diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index d9fd5f8..94b7bb6 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -64,6 +64,7 @@ func handler(conn net.Conn) error { } func acceptLoop(ln net.Listener) error { + defer ln.Close() for { conn, err := ln.Accept() if err != nil { diff --git a/pt.go b/pt.go index f58edbc..391b1f5 100644 --- a/pt.go +++ b/pt.go @@ -19,6 +19,7 @@ // return nil // } // func acceptLoop(ln *pt.SocksListener) error { +// defer ln.Close() // for { // conn, err := ln.AcceptSocks() // if err != nil { @@ -64,6 +65,7 @@ // return nil // } // func acceptLoop(ln net.Listener) error { +// defer ln.Close() // for { // conn, err := ln.Accept() // if err != nil {

1 0

[goptlib/master] Use net.Error to distinguish temporary Accept errors.
by dcf＠torproject.org 15 Dec '13

15 Dec '13

commit 3030f080eecf72b0e896236fca5fabd245c00bdb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 21:06:07 2013 -0800 Use net.Error to distinguish temporary Accept errors. The underlying net.Listener.Accept that SocksListener.AcceptSocks depends on may return different kinds of errors. AcceptSocks adds its own special errors on top. For some of these errors, we want to try the accept again, for instance if there was an EOF or timeout while reading the SOCKS request. For others, we want to stop accepting altogher, in particular when the underlying listener is closed. (It is very important to give up in that case, or else you enter a tight loop with Accept always failing immediately). The permanent errors we care about are of type net.OpError, which provides a Temporary method. http://golang.org/pkg/net/#Error With a type assertion, we can see if an error is of this type and whether it is temporary. Compare with this commit in net.http: https://code.google.com/p/go/source/detail?name=95448425041c and net.Error is mentioned in this blog post: http://blog.golang.org/error-handling-and-go I ran into this while trying to interact with a pluggable transport using socat. socat -v - SOCKS4A:127.0.0.1:X.X.X.X:YYYY,socksport=3128 socat sets the userid to your username ("david"), which tails to be parsed as a key=value string. This was causing the accept loop to terminate as if the listening socket had been closed. --- examples/dummy-client/dummy-client.go | 5 ++++- examples/dummy-server/dummy-server.go | 5 ++++- pt.go | 10 ++++++++-- socks.go | 25 ++++++++++++++++++++++++- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 876fc87..01d843b 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -70,7 +70,10 @@ func acceptLoop(ln *pt.SocksListener) error { for { conn, err := ln.AcceptSocks() if err != nil { - return err + if e, ok := err.(net.Error); ok && !e.Temporary() { + return err + } + continue } go handler(conn) } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index dd8dff7..d9fd5f8 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -67,7 +67,10 @@ func acceptLoop(ln net.Listener) error { for { conn, err := ln.Accept() if err != nil { - return err + if e, ok := err.(net.Error); ok && !e.Temporary() { + return err + } + continue } go handler(conn) } diff --git a/pt.go b/pt.go index 4b2220a..f58edbc 100644 --- a/pt.go +++ b/pt.go @@ -22,7 +22,10 @@ // for { // conn, err := ln.AcceptSocks() // if err != nil { -// return err +// if e, ok := err.(net.Error); ok && !e.Temporary() { +// return err +// } +// continue // } // go handler(conn) // } @@ -64,7 +67,10 @@ // for { // conn, err := ln.Accept() // if err != nil { -// return err +// if e, ok := err.(net.Error); ok && !e.Temporary() { +// return err +// } +// continue // } // go handler(conn) // } diff --git a/socks.go b/socks.go index 7a2b1c8..f34f78f 100644 --- a/socks.go +++ b/socks.go @@ -73,7 +73,11 @@ func (conn *SocksConn) Reject() error { // for { // conn, err := ln.AcceptSocks() // if err != nil { -// break +// log.Printf("accept error: %s", err) +// if e, ok := err.(net.Error); ok && !e.Temporary() { +// break +// } +// continue // } // go handleConn(conn) // } @@ -105,6 +109,25 @@ func (ln *SocksListener) Accept() (net.Conn, error) { // Call Accept on the wrapped net.Listener, do SOCKS negotiation, and return a // SocksConn. After accepting, you must call either conn.Grant or conn.Reject // (presumably after trying to connect to conn.Req.Target). +// +// Errors returned by AcceptSocks may be temporary (for example, EOF while +// reading the request, or a badly formatted userid string), or permanent (e.g., +// the underlying socket is closed). You can determine whether an error is +// temporary and take appropriate action with a type conversion to net.Error. +// For example: +// +// for { +// conn, err := ln.AcceptSocks() +// if err != nil { +// if e, ok := err.(net.Error); ok && !e.Temporary() { +// log.Printf("permanent accept error; giving up: %s", err) +// break +// } +// log.Printf("temporary accept error; trying again: %s", err) +// continue +// } +// go handleConn(conn) +// } func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { c, err := ln.Listener.Accept() if err != nil {

1 0

[websocket/master] Update DialOr call to match goptlib API change.
by dcf＠torproject.org 14 Dec '13

14 Dec '13

commit baace4fec5b67036c4e75de0934062fbf080cc10 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 16:49:18 2013 -0800 Update DialOr call to match goptlib API change. https://gitweb.torproject.org/pluggable-transports/goptlib.git/commitdiff/b… --- websocket-server/websocket-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/websocket-server/websocket-server.go b/websocket-server/websocket-server.go index 28bcf35..84b5e5c 100644 --- a/websocket-server/websocket-server.go +++ b/websocket-server/websocket-server.go @@ -176,7 +176,7 @@ func webSocketHandler(ws *websocket.WebSocket) { handlerChan <- -1 }() - or, err := pt.DialOr(&ptInfo, ws.Conn.RemoteAddr(), ptMethodName) + or, err := pt.DialOr(&ptInfo, ws.Conn.RemoteAddr().String(), ptMethodName) if err != nil { log("Failed to connect to ORPort: " + err.Error()) return

1 0

[goptlib/master] Omit USERADDR and TRANSPORT if the corresponding argument is empty.
by dcf＠torproject.org 14 Dec '13

14 Dec '13

commit cabc0101ab6e99decf5da82864c114308200f796 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 17:36:13 2013 -0800 Omit USERADDR and TRANSPORT if the corresponding argument is empty. --- pt.go | 25 +++++++++++++++++-------- pt_test.go | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/pt.go b/pt.go index 1c3d77e..4b2220a 100644 --- a/pt.go +++ b/pt.go @@ -738,18 +738,23 @@ func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) { } // Send USERADDR and TRANSPORT commands followed by a DONE command. Wait for an -// OKAY or DENY response command from the server. Returns nil if and only if -// OKAY is received. +// OKAY or DENY response command from the server. If addr or methodName is "", +// the corresponding command is not sent. Returns nil if and only if OKAY is +// received. func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { var err error - err = extOrPortSendUserAddr(s, addr) - if err != nil { - return err + if addr != "" { + err = extOrPortSendUserAddr(s, addr) + if err != nil { + return err + } } - err = extOrPortSendTransport(s, methodName) - if err != nil { - return err + if methodName != "" { + err = extOrPortSendTransport(s, methodName) + if err != nil { + return err + } } err = extOrPortSendDone(s) if err != nil { @@ -772,6 +777,10 @@ func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { // *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. +// +// The addr and methodName arguments are put in USERADDR and TRANSPORT ExtOrPort +// commands, respectively. If either is "", the corresponding command is not +// sent. func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { if info.ExtendedOrAddr == nil || info.AuthCookie == nil { return net.DialTCP("tcp", nil, info.OrAddr) diff --git a/pt_test.go b/pt_test.go index aa629c9..a6b7a02 100644 --- a/pt_test.go +++ b/pt_test.go @@ -625,3 +625,59 @@ func TestExtOrPortRecvCommand(t *testing.T) { } } } + +// set up so that extOrPortSetup can write to one buffer and read from another. +type MockSetupBuf struct { + bytes.Buffer + ReadBuf bytes.Buffer +} + +func (buf *MockSetupBuf) Read(p []byte) (int, error) { + n, err := buf.ReadBuf.Read(p) + return n, err +} + +func testExtOrPortSetupIndividual(t *testing.T, addr, methodName string) { + var err error + var buf MockSetupBuf + // fake an OKAY response. + err = extOrPortSendCommand(&buf.ReadBuf, extOrCmdOkay, []byte{}) + if err != nil { + t.Fatal() + } + err = extOrPortSetup(&buf, addr, methodName) + if err != nil { + t.Fatalf("error in extOrPortSetup: %s", err) + } + for { + cmd, body, err := extOrPortRecvCommand(&buf.Buffer) + if err != nil { + t.Fatalf("error in extOrPortRecvCommand: %s", err) + } + if cmd == extOrCmdDone { + break + } + if addr != "" && cmd == extOrCmdUserAddr { + if string(body) != addr { + t.Errorf("addr=%q methodName=%q got USERADDR with body %q (expected %q)", addr, methodName, body, addr) + } + continue + } + if methodName != "" && cmd == extOrCmdTransport { + if string(body) != methodName { + t.Errorf("addr=%q methodName=%q got TRANSPORT with body %q (expected %q)", addr, methodName, body, methodName) + } + continue + } + t.Errorf("addr=%q methodName=%q got unknown cmd %d body %q", addr, methodName, cmd, body) + } +} + +func TestExtOrPortSetup(t *testing.T) { + const addr = "127.0.0.1:40000" + const methodName = "alpha" + testExtOrPortSetupIndividual(t, "", "") + testExtOrPortSetupIndividual(t, addr, "") + testExtOrPortSetupIndividual(t, "", methodName) + testExtOrPortSetupIndividual(t, addr, methodName) +}

1 0

[goptlib/master] Have DialOr take a string for USERADDR.
by dcf＠torproject.org 14 Dec '13

14 Dec '13

commit b0a3458e272e8f54bb94d7ae346a3362ba018862 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 14 16:42:07 2013 -0800 Have DialOr take a string for USERADDR. All we did was immediately convert the address to a string anyway. With an http.Request, for example, we have only RemoteAddr, which is a string. You would have to parse the address only for it to be turned into a string again. --- examples/dummy-server/dummy-server.go | 2 +- pt.go | 10 +++++----- pt_test.go | 22 +++++++++++++--------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index c01876e..dd8dff7 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -52,7 +52,7 @@ func handler(conn net.Conn) error { handlerChan <- -1 }() - or, err := pt.DialOr(&ptInfo, conn.RemoteAddr(), "dummy") + or, err := pt.DialOr(&ptInfo, conn.RemoteAddr().String(), "dummy") if err != nil { return err } diff --git a/pt.go b/pt.go index 1e60d6c..1c3d77e 100644 --- a/pt.go +++ b/pt.go @@ -52,7 +52,7 @@ // ... // func handler(conn net.Conn) error { // defer conn.Close() -// or, err := pt.DialOr(&ptInfo, conn.RemoteAddr(), "foo") +// or, err := pt.DialOr(&ptInfo, conn.RemoteAddr().String(), "foo") // if err != nil { // return // } @@ -696,8 +696,8 @@ func extOrPortSendCommand(s io.Writer, cmd uint16, body []byte) error { // Send a USERADDR command on s. See section 3.1.2.1 of // 196-transport-control-ports.txt. -func extOrPortSendUserAddr(s io.Writer, addr net.Addr) error { - return extOrPortSendCommand(s, extOrCmdUserAddr, []byte(addr.String())) +func extOrPortSendUserAddr(s io.Writer, addr string) error { + return extOrPortSendCommand(s, extOrCmdUserAddr, []byte(addr)) } // Send a TRANSPORT command on s. See section 3.1.2.2 of @@ -740,7 +740,7 @@ func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) { // Send USERADDR and TRANSPORT commands followed by a DONE command. Wait for an // OKAY or DENY response command from the server. Returns nil if and only if // OKAY is received. -func extOrPortSetup(s io.ReadWriter, addr net.Addr, methodName string) error { +func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { var err error err = extOrPortSendUserAddr(s, addr) @@ -772,7 +772,7 @@ func extOrPortSetup(s io.ReadWriter, addr net.Addr, methodName string) error { // *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. -func DialOr(info *ServerInfo, addr net.Addr, methodName string) (*net.TCPConn, error) { +func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { if info.ExtendedOrAddr == nil || info.AuthCookie == nil { return net.DialTCP("tcp", nil, info.OrAddr) } diff --git a/pt_test.go b/pt_test.go index 856b23c..aa629c9 100644 --- a/pt_test.go +++ b/pt_test.go @@ -469,17 +469,17 @@ func TestExtOrSendCommand(t *testing.T) { } func TestExtOrSendUserAddr(t *testing.T) { - addrs := [...]net.TCPAddr{ - net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0}, - net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 9999}, - net.TCPAddr{IP: net.ParseIP("255.255.255.255"), Port: 65535}, - net.TCPAddr{IP: net.ParseIP("::"), Port: 0}, - net.TCPAddr{IP: net.ParseIP("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"), Port: 65535}, + addrs := [...]string{ + "0.0.0.0:0", + "1.2.3.4:9999", + "255.255.255.255:65535", + "[::]:0", + "[ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]:63335", } for _, addr := range addrs { var buf bytes.Buffer - err := extOrPortSendUserAddr(&buf, &addr) + err := extOrPortSendUserAddr(&buf, addr) if err != nil { t.Errorf("%s unexpectedly returned an error: %s", addr, err) } @@ -495,12 +495,16 @@ func TestExtOrSendUserAddr(t *testing.T) { t.Errorf("%s said length %d but had at least %d", addr, length, n) } // test that parsing the address gives something equivalent to - // the original. + // parsing the original. + inputAddr, err := resolveAddr(addr) + if err != nil { + t.Fatal(err) + } outputAddr, err := resolveAddr(string(p[:n])) if err != nil { t.Fatal(err) } - if !tcpAddrsEqual(&addr, outputAddr) { + if !tcpAddrsEqual(inputAddr, outputAddr) { t.Errorf("%s → %s", addr, outputAddr) } }

1 0