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

[goptlib/master] Use strconv.ParseUint to parse port numbers, not net.LookupPort.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 137783244c6fbab7792e13fdbcc5efb174bbbdfa Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 11:41:22 2013 -0800 Use strconv.ParseUint to parse port numbers, not net.LookupPort. --- pt.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pt.go b/pt.go index f926ee9..d415480 100644 --- a/pt.go +++ b/pt.go @@ -116,6 +116,7 @@ import ( "io" "net" "os" + "strconv" "strings" "time" ) @@ -344,6 +345,11 @@ type Bindaddr struct { Options Args } +func parsePort(portStr string) (int, error) { + port, err := strconv.ParseUint(portStr, 10, 16) + return int(port), err +} + // Resolve an address string into a net.TCPAddr. We are a bit more strict than // net.ResolveTCPAddr; we don't allow an empty host or port, and the host part // must be a literal IP address. @@ -373,7 +379,7 @@ func resolveAddr(addrStr string) (*net.TCPAddr, error) { if ip == nil { return nil, net.InvalidAddrError(fmt.Sprintf("not an IP string: %q", ipStr)) } - port, err := net.LookupPort("tcp", portStr) + port, err := parsePort(portStr) if err != nil { return nil, err }

1 0

[goptlib/master] Add an example of using SmethodArgs.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit f39e775a2933f965d7fc9a673309b502a2420595 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 18:28:54 2013 -0800 Add an example of using SmethodArgs. --- pt.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pt.go b/pt.go index d415480..39e7471 100644 --- a/pt.go +++ b/pt.go @@ -262,6 +262,19 @@ func Smethod(name string, addr net.Addr) { // Emit an SMETHOD line with an ARGS option. args is a name–value mapping that // will be added to the server's extrainfo document. +// +// This is an example of how to check for a required option: +// args := pt.Args{} +// secret, ok := bindaddr.Options.Get("shared-secret") +// if !ok { +// pt.SmethodError(bindaddr.MethodName, "need a shared-secret option") +// continue +// } +// args.Add("shared-secret", secret) +// pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) +// Or, if you just want to echo back the options provided by Tor from the +// TransportServerOptions configuration, +// pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), bindaddr.Options) func SmethodArgs(name string, addr net.Addr, args Args) { line("SMETHOD", name, addr.String(), "ARGS:"+encodeSmethodArgs(args)) }

1 0

[goptlib/master] fmt
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 6705184f0988bf54eeb0118b2022587b7a9c7015 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 4 23:21:56 2013 -0800 fmt --- pt_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_test.go b/pt_test.go index 6dc8845..6da0322 100644 --- a/pt_test.go +++ b/pt_test.go @@ -475,7 +475,7 @@ func TestExtOrSendUserAddr(t *testing.T) { func TestExtOrPortSendTransport(t *testing.T) { tests := [...]struct { methodName string - expected []byte + expected []byte }{ {"", []byte("\x00\x02\x00\x00")}, {"a", []byte("\x00\x02\x00\x01a")}, @@ -529,9 +529,9 @@ func TestExtOrPortRecvCommand(t *testing.T) { []byte("\x12\x34\x00\x01"), } goodTests := [...]struct { - input []byte - cmd uint16 - body []byte + input []byte + cmd uint16 + body []byte leftover []byte }{ {

1 0

[goptlib/master] No need for a bufio Reader in extOrPortAuthenticate.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 6e6cc5c70c9f11f9016e892e751212d3c20c8b51 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 2 08:52:05 2013 -0800 No need for a bufio Reader in extOrPortAuthenticate. --- pt.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pt.go b/pt.go index c2a5d8c..f858c2a 100644 --- a/pt.go +++ b/pt.go @@ -51,7 +51,6 @@ package pt import ( - "bufio" "bytes" "crypto/hmac" "crypto/rand" @@ -490,16 +489,16 @@ func computeClientHash(authCookie, clientNonce, serverNonce []byte) []byte { } func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { - r := bufio.NewReader(s) - // Read auth types. 217-ext-orport-auth.txt section 4.1. var authTypes [256]bool var count int for count = 0; count < 256; count++ { - b, err := r.ReadByte() + buf := make([]byte, 1) + _, err := io.ReadFull(s, buf) if err != nil { return err } + b := buf[0] if b == 0 { break } @@ -532,11 +531,11 @@ func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { return err } - _, err = io.ReadFull(r, serverHash) + _, err = io.ReadFull(s, serverHash) if err != nil { return err } - _, err = io.ReadFull(r, serverNonce) + _, err = io.ReadFull(s, serverNonce) if err != nil { return err } @@ -553,7 +552,7 @@ func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { } status := make([]byte, 1) - _, err = io.ReadFull(r, status) + _, err = io.ReadFull(s, status) if err != nil { return err } @@ -561,10 +560,6 @@ func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { return errors.New(fmt.Sprintf("server rejected authentication")) } - if r.Buffered() != 0 { - return errors.New(fmt.Sprintf("%d bytes left after extended OR port authentication", r.Buffered())) - } - return nil }

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 242b8dd764314951338568ebd0cf97817ef82e1b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 21:16:13 2013 +0000 Update translations for mat-gui --- fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil.po b/fil.po index f26b144..a62c0f4 100644 --- a/fil.po +++ b/fil.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-12-08 20:42+0000\n" +"PO-Revision-Date: 2013-12-08 20:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 65e7ceff25fc21e01ce28376e622554e6f94ecf9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 21:16:07 2013 +0000 Update translations for tails-greeter --- fil/fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/fil.po b/fil/fil.po index dcc1cdf..5bd54f7 100644 --- a/fil/fil.po +++ b/fil/fil.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-22 13:49+0100\n" -"PO-Revision-Date: 2013-12-08 20:42+0000\n" +"PO-Revision-Date: 2013-12-08 20:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 7afb020078a5db7eb3508a619471bd84cbddc9f4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 21:15:49 2013 +0000 Update translations for vidalia_installer --- fil/vidalia_fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/vidalia_fil.po b/fil/vidalia_fil.po index 0dde52f..feb5be3 100755 --- a/fil/vidalia_fil.po +++ b/fil/vidalia_fil.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2013-12-08 20:41+0000\n" +"PO-Revision-Date: 2013-12-08 20:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 2c6a196ba2fec276d47f7c6efa12af60e970b925 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 21:15:19 2013 +0000 Update translations for vidalia_alpha --- fil/vidalia_fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/vidalia_fil.po b/fil/vidalia_fil.po index 4913067..eca59ea 100644 --- a/fil/vidalia_fil.po +++ b/fil/vidalia_fil.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-12-08 20:41+0000\n" +"PO-Revision-Date: 2013-12-08 20:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 6f4ccf8335081050dc2d8d642e2e1cfdd526f323 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 21:15:13 2013 +0000 Update translations for vidalia --- fil/vidalia_fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/vidalia_fil.po b/fil/vidalia_fil.po index 590fa00..197cce8 100644 --- a/fil/vidalia_fil.po +++ b/fil/vidalia_fil.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-12-08 20:41+0000\n" +"PO-Revision-Date: 2013-12-08 20:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 08 Dec '13

08 Dec '13

commit 51f1645bbdfc37025bda76b2edd2fdbed233baf4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 8 20:46:30 2013 +0000 Update translations for tor-launcher-network-settings --- fil/network-settings.dtd | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/fil/network-settings.dtd b/fil/network-settings.dtd index 723a055..eda3cdd 100644 --- a/fil/network-settings.dtd +++ b/fil/network-settings.dtd @@ -1,55 +1,55 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes ""> -<!ENTITY torSettings.no ""> +<!ENTITY torSettings.yes "Oo"> +<!ENTITY torSettings.no "Wala"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> +<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles."> +<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!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 proxy."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> +<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">  -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.restart "Restart"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> -<!ENTITY torsettings.useProxy.address ""> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> -<!ENTITY torsettings.firewall.checkbox ""> -<!ENTITY torsettings.firewall.allowedPorts ""> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> + +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org.">

1 0