June 2015 - tor-commits - lists.torproject.org

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 28 Jun '15

28 Jun '15

commit 6905c006ae4fae8847ff8ffa4ae4ea9d54154f8e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 28 18:15:49 2015 +0000 Update translations for abouttor-homepage --- nn/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd index 0b3d71f..4807a8c 100644 --- a/nn/aboutTor.dtd +++ b/nn/aboutTor.dtd @@ -10,7 +10,7 @@ <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Test Tor nettverk-instillingar"> <!ENTITY aboutTor.success.label "Me gratulerer!"> <!ENTITY aboutTor.success2.label "Denne nettlesaren er sett opp for å bruka Tor."> @@ -37,7 +37,7 @@ <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Du kan hjelpa til!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo3.label "Køyr ein Tor rele-node »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[tor-messenger-build/master] Trim the about dialog to reflect custom branding
by sukhbir＠torproject.org 28 Jun '15

28 Jun '15

commit 2a49c9daf476b33c3fa6e2bc51ebc82dbf4abf16 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Jun 28 07:15:35 2015 -0400 Trim the about dialog to reflect custom branding --- projects/instantbird/branding/about.png | Bin 0 -> 9880 bytes projects/instantbird/branding/credits.patch | 73 +++++++++++++++++++++++++++ projects/instantbird/build | 2 + projects/instantbird/config | 2 + 4 files changed, 77 insertions(+) diff --git a/projects/instantbird/branding/about.png b/projects/instantbird/branding/about.png new file mode 100644 index 0000000..5d7f579 Binary files /dev/null and b/projects/instantbird/branding/about.png differ diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch new file mode 100644 index 0000000..26d09a4 --- /dev/null +++ b/projects/instantbird/branding/credits.patch @@ -0,0 +1,73 @@ +diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul +--- a/im/content/aboutDialog.xul ++++ b/im/content/aboutDialog.xul +@@ -24,7 +24,7 @@ + <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + id="aboutDialog" + windowtype="Messenger:About" +- buttons="accept,extra2" ++ buttons="accept" + onload="onLoad();" + title="&aboutDialog.title;" creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;" + aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;" versionlabel="&aboutVersion;" +@@ -39,36 +39,8 @@ + var gSelectedPage; + + function onLoad() { +- var xai = Components.classes["@mozilla.org/xre/app-info;1"] +- .getService(Components.interfaces.nsIXULAppInfo); +- +- var versionField = document.getElementById("versionField"); +- versionField.value = versionField.value + xai.version +- + ' (' + xai.appBuildID + ')'; +- +- versionField = document.getElementById("geckoVersionField"); +- versionField.value = versionField.value + xai.platformVersion +- + ' (' + xai.platformBuildID + ')'; +- +- versionField = document.getElementById("libpurpleVersionField"); +- if ("@instantbird.org/libpurple/core;1" in Components.classes) { +- var pcs = Components.classes["@instantbird.org/libpurple/core;1"] +- .getService(Components.interfaces.purpleICoreService); +- versionField.value = versionField.value + pcs.version; +- } +- else { +- versionField.hidden = true; +- } +- + versionField = document.getElementById("userAgentField"); + versionField.value = navigator.userAgent; +- +- var button = document.documentElement.getButton("extra2"); +- button.setAttribute("label", document.documentElement.getAttribute("creditslabel")); +- button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey")); +- gSelectedPage = 0; +- button.addEventListener("command", switchPage); +- document.documentElement.getButton("accept").focus(); + } + + function uninit(aEvent) +@@ -106,14 +78,6 @@ + + <deck id="modes" flex="1"> + <vbox flex="1" id="clientBox"> +- <vbox id="versionWrapper" flex="1"> +- <textbox id="versionField" readonly="true" class="plain" tabindex="2" +- value="&aboutVersion; "/> +- <textbox id="geckoVersionField" readonly="true" class="plain" +- tabindex="3" value="&geckoVersion; "/> +- <textbox id="libpurpleVersionField" readonly="true" class="plain" +- tabindex="4" value="&libpurpleVersion; "/> +- </vbox> + <description id="copyright" flex="1">&copyrightText2;</description> + <separator/> + <textbox id="userAgentField" readonly="true" class="plain" +diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +--- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd ++++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +@@ -7,4 +7,4 @@ + <!ENTITY geckoVersion "Gecko"> + <!ENTITY libpurpleVersion "libpurple"> +  +-<!ENTITY copyrightText2 "©2007-&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> ++<!ENTITY copyrightText2 "©&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> diff --git a/projects/instantbird/build b/projects/instantbird/build index 15659ec..a7f9b4a 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -62,6 +62,8 @@ cp ../branding/default.ico im/branding/messenger/windows/ cp ../branding/instantbird.ico im/branding/messenger/ cp ../branding/instantbird.icns im/branding/messenger/ +cp ../branding/about.png im/branding/messenger/content/ + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 5f321d9..1608248 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -101,6 +101,8 @@ input_files: - filename: branding/instantbird.ico - filename: branding/name.patch - filename: branding/instantbird.icns + - filename: branding/credits.patch + - filename: branding/about.png - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch

1 0

[exonerator/master] Switch to using metrics-lib's DescriptorCollector.
by karsten＠torproject.org 28 Jun '15

28 Jun '15

commit fa377c3535e9a0fd4ed6bcd051b89f01ebf30739 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 28 10:36:49 2015 +0200 Switch to using metrics-lib's DescriptorCollector. --- .gitmodules | 3 +++ build.xml | 9 ++++++++- deps/metrics-lib | 1 + run-exonerator.sh | 3 --- .../torproject/exonerator/ExoneraTorDatabaseImporter.java | 13 +++++++++++++ 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c6b6388 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/metrics-lib"] + path = deps/metrics-lib + url = https://git.torproject.org/metrics-lib diff --git a/build.xml b/build.xml index b6a1e53..3064bf8 100644 --- a/build.xml +++ b/build.xml @@ -11,6 +11,9 @@ <property name="warfile" value="exonerator.war"/> <path id="classpath"> <pathelement path="${classes}"/> + <fileset dir="deps/metrics-lib"> + <include name="descriptor.jar"/> + </fileset> <fileset dir="/usr/share/java"> <include name="commons-codec.jar"/> <include name="postgresql-jdbc3.jar"/> @@ -25,8 +28,12 @@ <mkdir dir="${classes}"/> </target> + <target name="metrics-lib"> + <ant dir="deps/metrics-lib"/> + </target> +  - <target name="compile" depends="init"> + <target name="compile" depends="metrics-lib, init"> <javac destdir="${classes}" srcdir="${sources}" source="1.5" diff --git a/deps/metrics-lib b/deps/metrics-lib new file mode 160000 index 0000000..bd18dd0 --- /dev/null +++ b/deps/metrics-lib @@ -0,0 +1 @@ +Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855 diff --git a/run-exonerator.sh b/run-exonerator.sh index 6cd34bf..d090ec9 100755 --- a/run-exonerator.sh +++ b/run-exonerator.sh @@ -1,6 +1,3 @@ #!/bin/bash -rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses exonerator-import/ -rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/server-descriptors exonerator-import/ -rsync -arz --delete metrics.torproject.org::metrics-recent/exit-lists exonerator-import/ ant run | grep "\[java\]" diff --git a/src/org/torproject/exonerator/ExoneraTorDatabaseImporter.java b/src/org/torproject/exonerator/ExoneraTorDatabaseImporter.java index 348c04c..6111888 100644 --- a/src/org/torproject/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/org/torproject/exonerator/ExoneraTorDatabaseImporter.java @@ -32,6 +32,8 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; +import org.torproject.descriptor.DescriptorCollector; +import org.torproject.descriptor.DescriptorSourceFactory; /* Import Tor descriptors into the ExoneraTor database. */ public class ExoneraTorDatabaseImporter { @@ -42,6 +44,7 @@ public class ExoneraTorDatabaseImporter { openDatabaseConnection(); prepareDatabaseStatements(); createLockFile(); + fetchDescriptors(); readImportHistoryToMemory(); parseDescriptors(); writeImportHistoryToDisk(); @@ -150,6 +153,16 @@ public class ExoneraTorDatabaseImporter { } } + /* Fetch recent descriptors from CollecTor. */ + private static void fetchDescriptors() { + DescriptorCollector collector = + DescriptorSourceFactory.createDescriptorCollector(); + collector.collectDescriptors("https://collector.torproject.org", + new String[] { "/recent/relay-descriptors/consensuses/", + "/recent/relay-descriptors/server-descriptors/", + "/recent/exit-lists/" }, 0L, new File(importDirString), true); + } + /* Last and next parse histories containing paths of parsed files and * last modified times. */ private static Map<String, Long>

1 0

[tor/master] fix a windows unused var warning
by nickm＠torproject.org 28 Jun '15

28 Jun '15

commit cc3a791d5509d16bcf7a5a3d2bc1ec06dc56419c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 28 02:18:15 2015 -0400 fix a windows unused var warning --- src/or/connection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/connection.c b/src/or/connection.c index 7089292..0ecf5d1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1085,6 +1085,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, connection_t *conn = NULL; tor_socket_t s = TOR_INVALID_SOCKET; /* the socket we're going to make */ or_options_t const *options = get_options(); + (void) options; /* Windows doesn't use this. */ #if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H) const struct passwd *pw = NULL; #endif

1 0

[websocket/master] Pass nil to ClientSetup and ServerSetup as now documented.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit c5b5f713533771222cf7844a112630989ec6eca5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:55:11 2015 -0700 Pass nil to ClientSetup and ServerSetup as now documented. https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=6… --- pt-websocket-client/pt-websocket-client.go | 2 +- pt-websocket-server/pt-websocket-server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pt-websocket-client/pt-websocket-client.go b/pt-websocket-client/pt-websocket-client.go index 20d12bd..f65a9c9 100644 --- a/pt-websocket-client/pt-websocket-client.go +++ b/pt-websocket-client/pt-websocket-client.go @@ -205,7 +205,7 @@ func main() { } log("starting") - ptInfo, err = pt.ClientSetup([]string{ptMethodName}) + ptInfo, err = pt.ClientSetup(nil) if err != nil { log("error in setup: %s", err) os.Exit(1) diff --git a/pt-websocket-server/pt-websocket-server.go b/pt-websocket-server/pt-websocket-server.go index c393ebc..b14c754 100644 --- a/pt-websocket-server/pt-websocket-server.go +++ b/pt-websocket-server/pt-websocket-server.go @@ -228,7 +228,7 @@ func main() { log("starting") var err error - ptInfo, err = pt.ServerSetup([]string{ptMethodName}) + ptInfo, err = pt.ServerSetup(nil) if err != nil { log("error in setup: %s", err) os.Exit(1)

1 0

[meek/master] Pass nil to ClientSetup and ServerSetup as now documented.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 6b3663aa109b3414972feba1232202520671475e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:53:51 2015 -0700 Pass nil to ClientSetup and ServerSetup as now documented. https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=6… --- meek-client/meek-client.go | 2 +- meek-server/meek-server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 2b8bbaa..a5dea2e 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -394,7 +394,7 @@ func main() { httpTransport = *http.DefaultTransport.(*http.Transport) httpTransport.Proxy = nil - ptInfo, err = pt.ClientSetup([]string{ptMethodName}) + ptInfo, err = pt.ClientSetup(nil) if err != nil { log.Fatalf("error in ClientSetup: %s", err) } diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index ac5aa3e..5b28e79 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -348,7 +348,7 @@ func main() { } var err error - ptInfo, err = pt.ServerSetup([]string{ptMethodName}) + ptInfo, err = pt.ServerSetup(nil) if err != nil { log.Fatalf("error in ServerSetup: %s", err) }

1 0

[goptlib/master] Remove everything having to do with the "*" transport specification.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 65fc8d72eccd82237562744ddc85760d426561d8 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:48:25 2015 -0700 Remove everything having to do with the "*" transport specification. It was never implemented and is no longer part of the specification: https://trac.torproject.org/projects/tor/ticket/15612 The arguments to ClientSetup and ServerSetup that were solely to handle "*" are now documented as unused. --- examples/dummy-client/dummy-client.go | 2 +- examples/dummy-server/dummy-server.go | 2 +- pt.go | 60 +++++++++--------- pt_test.go | 108 +++++++++------------------------ 4 files changed, 61 insertions(+), 111 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 045a8f2..74843fd 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -83,7 +83,7 @@ func acceptLoop(ln *pt.SocksListener) error { func main() { var err error - ptInfo, err = pt.ClientSetup([]string{"dummy"}) + ptInfo, err = pt.ClientSetup(nil) if err != nil { os.Exit(1) } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 70251ea..933630b 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -80,7 +80,7 @@ func acceptLoop(ln net.Listener) error { func main() { var err error - ptInfo, err = pt.ServerSetup([]string{"dummy"}) + ptInfo, err = pt.ServerSetup(nil) if err != nil { os.Exit(1) } diff --git a/pt.go b/pt.go index a8c815e..d2aedca 100644 --- a/pt.go +++ b/pt.go @@ -35,7 +35,7 @@ // ... // func main() { // var err error -// ptInfo, err = pt.ClientSetup([]string{"foo"}) +// ptInfo, err = pt.ClientSetup(nil) // if err != nil { // os.Exit(1) // } @@ -92,7 +92,7 @@ // ... // func main() { // var err error -// ptInfo, err = pt.ServerSetup([]string{"foo"}) +// ptInfo, err = pt.ServerSetup(nil) // if err != nil { // os.Exit(1) // } @@ -377,17 +377,13 @@ func MakeStateDir() (string, error) { return dir, err } -// Get the intersection of the method names offered by Tor and those in -// methodNames. This function reads the environment variable -// TOR_PT_CLIENT_TRANSPORTS. -func getClientTransports(star []string) ([]string, error) { +// Get the list of method names requested by Tor. This function reads the +// environment variable TOR_PT_CLIENT_TRANSPORTS. +func getClientTransports() ([]string, error) { clientTransports, err := getenvRequired("TOR_PT_CLIENT_TRANSPORTS") if err != nil { return nil, err } - if clientTransports == "*" { - return star, nil - } return strings.Split(clientTransports, ","), nil } @@ -436,9 +432,8 @@ type ClientInfo struct { } // Check the client pluggable transports environment, emitting an error message -// and returning a non-nil error if any error is encountered. star is the list -// of method names to use in case "*" is requested by Tor. Returns a ClientInfo -// struct. +// and returning a non-nil error if any error is encountered. Returns a +// ClientInfo struct. // // If your program needs to know whether to call ClientSetup or ServerSetup // (i.e., if the same program can be run as either a client or a server), check @@ -448,14 +443,20 @@ type ClientInfo struct { // } else { // // Server mode; call pt.ServerSetup. // } -func ClientSetup(star []string) (info ClientInfo, err error) { +// +// Always pass nil for the unused single parameter. In the past, the parameter +// was a list of transport names to use in case Tor requested "*". That feature +// was never implemented and has been removed from the pluggable transports +// specification. +// https://trac.torproject.org/projects/tor/ticket/15612 +func ClientSetup(_ []string) (info ClientInfo, err error) { ver, err := getManagedTransportVer() if err != nil { return } line("VERSION", ver) - info.MethodNames, err = getClientTransports(star) + info.MethodNames, err = getClientTransports() if err != nil { return } @@ -537,11 +538,9 @@ func filterBindaddrs(addrs []Bindaddr, methodNames []string) []Bindaddr { } // Return an array of Bindaddrs, being the contents of TOR_PT_SERVER_BINDADDR -// with keys filtered by TOR_PT_SERVER_TRANSPORTS. If TOR_PT_SERVER_TRANSPORTS -// is "*", then keys are filtered by the entries in star instead. -// Transport-specific options from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned -// to the Options member. -func getServerBindaddrs(star []string) ([]Bindaddr, error) { +// with keys filtered by TOR_PT_SERVER_TRANSPORTS. Transport-specific options +// from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned to the Options member. +func getServerBindaddrs() ([]Bindaddr, error) { var result []Bindaddr // Parse the list of server transport options. @@ -578,11 +577,7 @@ func getServerBindaddrs(star []string) ([]Bindaddr, error) { if err != nil { return nil, err } - if serverTransports == "*" { - result = filterBindaddrs(result, star) - } else { - result = filterBindaddrs(result, strings.Split(serverTransports, ",")) - } + result = filterBindaddrs(result, strings.Split(serverTransports, ",")) return result, nil } @@ -634,10 +629,9 @@ type ServerInfo struct { } // Check the server pluggable transports environment, emitting an error message -// and returning a non-nil error if any error is encountered. star is the list -// of method names to use in case "*" is requested by Tor. Resolves the various -// requested bind addresses, the server ORPort and extended ORPort, and reads -// the auth cookie file. Returns a ServerInfo struct. +// and returning a non-nil error if any error is encountered. Resolves the +// various requested bind addresses, the server ORPort and extended ORPort, and +// reads the auth cookie file. Returns a ServerInfo struct. // // If your program needs to know whether to call ClientSetup or ServerSetup // (i.e., if the same program can be run as either a client or a server), check @@ -647,14 +641,20 @@ type ServerInfo struct { // } else { // // Server mode; call pt.ServerSetup. // } -func ServerSetup(star []string) (info ServerInfo, err error) { +// +// Always pass nil for the unused single parameter. In the past, the parameter +// was a list of transport names to use in case Tor requested "*". That feature +// was never implemented and has been removed from the pluggable transports +// specification. +// https://trac.torproject.org/projects/tor/ticket/15612 +func ServerSetup(_ []string) (info ServerInfo, err error) { ver, err := getManagedTransportVer() if err != nil { return } line("VERSION", ver) - info.Bindaddrs, err = getServerBindaddrs(star) + info.Bindaddrs, err = getServerBindaddrs() if err != nil { return } diff --git a/pt_test.go b/pt_test.go index 8470383..93fa491 100644 --- a/pt_test.go +++ b/pt_test.go @@ -139,81 +139,51 @@ func tcpAddrsEqual(a, b *net.TCPAddr) bool { func TestGetClientTransports(t *testing.T) { tests := [...]struct { ptClientTransports string - star []string expected []string }{ { - "*", - []string{}, - []string{}, - }, - { - "*", - []string{"alpha", "beta", "gamma"}, - []string{"alpha", "beta", "gamma"}, - }, - { - "alpha,beta,gamma", - []string{"alpha", "beta", "gamma"}, - []string{"alpha", "beta", "gamma"}, + "alpha", + []string{"alpha"}, }, { "alpha,beta", - []string{"alpha", "beta", "gamma"}, []string{"alpha", "beta"}, }, { - "alpha", - []string{"alpha", "beta", "gamma"}, - []string{"alpha"}, - }, - { "alpha,beta,gamma", - []string{}, []string{"alpha", "beta", "gamma"}, }, + // In the past, "*" meant to return all known transport names. + // But now it has no special meaning. + // https://trac.torproject.org/projects/tor/ticket/15612 { - "alpha,beta", - []string{}, - []string{"alpha", "beta"}, - }, - { - "alpha", - []string{}, - []string{"alpha"}, + "*", + []string{"*"}, }, - // my reading of pt-spec.txt says that "*" has special meaning - // only when it is the entirety of the environment variable. { "alpha,*,gamma", - []string{"alpha", "beta", "gamma"}, []string{"alpha", "*", "gamma"}, }, - { - "alpha", - []string{"beta"}, - []string{"alpha"}, - }, } Stdout = ioutil.Discard os.Clearenv() - _, err := getClientTransports([]string{"alpha", "beta", "gamma"}) + _, err := getClientTransports() if err == nil { t.Errorf("empty environment unexpectedly succeeded") } for _, test := range tests { os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.ptClientTransports) - output, err := getClientTransports(test.star) + output, err := getClientTransports() if err != nil { t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q unexpectedly returned an error: %s", test.ptClientTransports, err) } if !stringSetsEqual(output, test.expected) { - t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q %q → %q (expected %q)", - test.ptClientTransports, test.star, output, test.expected) + t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q → %q (expected %q)", + test.ptClientTransports, output, test.expected) } } } @@ -296,48 +266,41 @@ func TestGetServerBindaddrs(t *testing.T) { ptServerBindaddr string ptServerTransports string ptServerTransportOptions string - star []string }{ // bad TOR_PT_SERVER_BINDADDR { "alpha", "alpha", "", - []string{"alpha", "beta", "gamma"}, }, { "alpha-1.2.3.4", "alpha", "", - []string{"alpha", "beta", "gamma"}, }, // missing TOR_PT_SERVER_TRANSPORTS { "alpha-1.2.3.4:1111", "", "alpha:key=value", - []string{"alpha"}, }, // bad TOR_PT_SERVER_TRANSPORT_OPTIONS { "alpha-1.2.3.4:1111", "alpha", "key=value", - []string{"alpha"}, }, } goodTests := [...]struct { ptServerBindaddr string ptServerTransports string ptServerTransportOptions string - star []string expected []Bindaddr }{ { "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", "alpha,beta,gamma", "alpha:k1=v1,beta:k2=v2,gamma:k3=v3", - []string{"alpha", "beta"}, []Bindaddr{ {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{"k1": []string{"v1"}}}, {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}, Args{"k2": []string{"v2"}}}, @@ -347,33 +310,12 @@ func TestGetServerBindaddrs(t *testing.T) { "alpha-1.2.3.4:1111", "xxx", "", - []string{"alpha", "beta", "gamma"}, []Bindaddr{}, }, { "alpha-1.2.3.4:1111", "alpha,beta,gamma", "", - []string{}, - []Bindaddr{ - {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{}}, - }, - }, - { - "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", - "*", - "", - []string{"alpha", "beta"}, - []Bindaddr{ - {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{}}, - {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}, Args{}}, - }, - }, - { - "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", - "*", - "", - []string{"alpha", "gamma"}, []Bindaddr{ {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{}}, }, @@ -382,18 +324,26 @@ func TestGetServerBindaddrs(t *testing.T) { "trebuchet-127.0.0.1:1984,ballista-127.0.0.1:4891", "trebuchet,ballista", "trebuchet:secret=nou;trebuchet:cache=/tmp/cache;ballista:secret=yes", - []string{"trebuchet", "ballista"}, []Bindaddr{ {"trebuchet", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1984}, Args{"secret": []string{"nou"}, "cache": []string{"/tmp/cache"}}}, {"ballista", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 4891}, Args{"secret": []string{"yes"}}}, }, }, + // In the past, "*" meant to return all known transport names. + // But now it has no special meaning. + // https://trac.torproject.org/projects/tor/ticket/15612 + { + "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", + "*", + "", + []Bindaddr{}, + }, } Stdout = ioutil.Discard os.Clearenv() - _, err := getServerBindaddrs([]string{"alpha", "beta", "gamma"}) + _, err := getServerBindaddrs() if err == nil { t.Errorf("empty environment unexpectedly succeeded") } @@ -402,10 +352,10 @@ func TestGetServerBindaddrs(t *testing.T) { os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) os.Setenv("TOR_PT_SERVER_TRANSPORT_OPTIONS", test.ptServerTransportOptions) - _, err := getServerBindaddrs(test.star) + _, err := getServerBindaddrs() if err == nil { - t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q unexpectedly succeeded", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star) + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q unexpectedly succeeded", + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions) } } @@ -413,14 +363,14 @@ func TestGetServerBindaddrs(t *testing.T) { os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) os.Setenv("TOR_PT_SERVER_TRANSPORT_OPTIONS", test.ptServerTransportOptions) - output, err := getServerBindaddrs(test.star) + output, err := getServerBindaddrs() if err != nil { - t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q unexpectedly returned an error: %s", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star, err) + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q unexpectedly returned an error: %s", + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, err) } if !bindaddrSetsEqual(output, test.expected) { - t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q → %q (expected %q)", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star, output, test.expected) + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q → %q (expected %q)", + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, output, test.expected) } } }

1 0

[goptlib/master] Fix misnamed struct member.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit fb1c7123e1c3daf1453ff474ed32e25c74d58bfb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:43:48 2015 -0700 Fix misnamed struct member. --- pt_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pt_test.go b/pt_test.go index c0540b5..8470383 100644 --- a/pt_test.go +++ b/pt_test.go @@ -138,9 +138,9 @@ func tcpAddrsEqual(a, b *net.TCPAddr) bool { func TestGetClientTransports(t *testing.T) { tests := [...]struct { - ptServerClientTransports string - star []string - expected []string + ptClientTransports string + star []string + expected []string }{ { "*", @@ -205,15 +205,15 @@ func TestGetClientTransports(t *testing.T) { } for _, test := range tests { - os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.ptServerClientTransports) + os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.ptClientTransports) output, err := getClientTransports(test.star) if err != nil { t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q unexpectedly returned an error: %s", - test.ptServerClientTransports, err) + test.ptClientTransports, err) } if !stringSetsEqual(output, test.expected) { t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q %q → %q (expected %q)", - test.ptServerClientTransports, test.star, output, test.expected) + test.ptClientTransports, test.star, output, test.expected) } } }

1 0

[bundle/master] Update gitweb link.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 50f1e8f908927e9856be05c5f5d849a982fbdc14 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:21:13 2015 -0700 Update gitweb link. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 7929644..1c8824b 100644 --- a/README +++ b/README @@ -3,4 +3,4 @@ bundles. It is no longer used since the 3.x series as pluggable transports used the same Gitian-based system as the rest of the bundle. You want -https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gitian/README.build +https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build

1 0

[websocket/master] Use new convention for Temporary errors from AcceptSocks.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 84b1f7529a6dde712d8aab297f247e4baee32d70 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:18:23 2015 -0700 Use new convention for Temporary errors from AcceptSocks. https://trac.torproject.org/projects/tor/ticket/14135 https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=5… --- pt-websocket-client/pt-websocket-client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt-websocket-client/pt-websocket-client.go b/pt-websocket-client/pt-websocket-client.go index fe38c9d..20d12bd 100644 --- a/pt-websocket-client/pt-websocket-client.go +++ b/pt-websocket-client/pt-websocket-client.go @@ -156,10 +156,10 @@ func socksAcceptLoop(ln *pt.SocksListener) error { for { socks, err := ln.AcceptSocks() if err != nil { - if e, ok := err.(*net.OpError); ok && !e.Temporary() { - return err + if e, ok := err.(*net.OpError); ok && e.Temporary() { + continue } - continue + return err } go func() { err := handleConnection(socks)

1 0