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

[snowflake/master] Move some default config into constants at the stop.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit b0dbf4747368192978db5f6927e71139ef441cd4 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 16:11:03 2017 -0700 Move some default config into constants at the stop. --- proxy-go/snowflake.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 801be6e..1b7d593 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -21,6 +21,10 @@ import ( "golang.org/x/net/websocket" ) +const defaultBrokerURL = "https://snowflake-reg.appspot.com/" +const defaultRelayURL = "wss://snowflake.bamsoftware.com/" +const defaultSTUNURL = "stun:stun.l.google.com:19302" + type snowflakeOptions struct { capacity int broker string @@ -295,9 +299,9 @@ func main() { var logFilename string opt = new(snowflakeOptions) flag.IntVar(&opt.capacity, "capacity", 10, "maximum concurrent clients") - flag.StringVar(&opt.broker, "broker", "https://snowflake-reg.appspot.com/", "broker URL") - flag.StringVar(&opt.relay, "relay", "wss://snowflake.bamsoftware.com/", "websocket relay URL") - flag.StringVar(&opt.stun, "stun", "stun:stun.l.google.com:19302", "stun URL") + flag.StringVar(&opt.broker, "broker", defaultBrokerURL, "broker URL") + flag.StringVar(&opt.relay, "relay", defaultRelayURL, "websocket relay URL") + flag.StringVar(&opt.stun, "stun", defaultSTUNURL, "stun URL") flag.StringVar(&logFilename, "log", "", "log filename") flag.Parse()

1 0

[snowflake/master] Make logging optional and controlled by a -log option.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit 12922a232ba63bd8d94c92ced32e23aa2fb055ed Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 15:34:17 2017 -0700 Make logging optional and controlled by a -log option. --- client/snowflake.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index f632e5e..d85505e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -10,7 +10,6 @@ import ( "net" "os" "os/signal" - "path" "sync" "syscall" "time" @@ -122,29 +121,28 @@ func copyLoop(a, b io.ReadWriter) { } func main() { - webrtc.SetLoggingVerbosity(1) - stateDir, err := pt.MakeStateDir() - if err != nil { - log.Fatal(err) - } - logFile, err := os.OpenFile(path.Join(stateDir, "snowflake.log"), - os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) - if err != nil { - log.Fatal(err) - } - defer logFile.Close() - log.SetOutput(logFile) - var iceServers IceServerList - log.Println("\n\n\n --- Starting Snowflake Client ---") - flag.Var(&iceServers, "ice", "comma-separated list of ICE servers") brokerURL := flag.String("url", "", "URL of signaling broker") frontDomain := flag.String("front", "", "front domain") + logFilename := flag.String("log", "", "name of log file") max := flag.Int("max", DefaultSnowflakeCapacity, "capacity for number of multiplexed WebRTC peers") flag.Parse() + webrtc.SetLoggingVerbosity(1) + if *logFilename != "" { + logFile, err := os.OpenFile(*logFilename, + os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) + if err != nil { + log.Fatal(err) + } + defer logFile.Close() + log.SetOutput(logFile) + } + + log.Println("\n\n\n --- Starting Snowflake Client ---") + // Prepare to collect remote WebRTC peers. snowflakes := NewPeers(*max) if "" != *brokerURL {

1 0

[snowflake/master] Add -log option to proxy-go.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit c3f87281be36076d61a454b18e1f13ad9e4ad4d4 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 15:11:14 2017 -0700 Add -log option to proxy-go. --- proxy-go/snowflake.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index c7ee24a..5342ab1 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -12,6 +12,7 @@ import ( "net" "net/http" "net/url" + "os" "strings" "sync" "time" @@ -291,13 +292,24 @@ func runSession(sid string) { } func main() { + var logFilename string opt = new(snowflakeOptions) flag.IntVar(&opt.capacity, "capacity", 10, "maximum concurrent clients") flag.StringVar(&opt.broker, "broker", "https://snowflake-reg.appspot.com/", "broker URL") flag.StringVar(&opt.relay, "relay", "wss://snowflake.bamsoftware.com/", "websocket relay URL") flag.StringVar(&opt.stun, "stun", "stun:stun.l.google.com:19302", "stun URL") + flag.StringVar(&logFilename, "log", "", "log filename") flag.Parse() + if logFilename != "" { + f, err := os.OpenFile(logFilename, os.O_WRONLY | os.O_APPEND, 0600) + if err != nil { + log.Fatal(err) + } + defer f.Close() + log.SetOutput(io.MultiWriter(os.Stderr, f)) + } + var err error opt.brokerURL, err = url.Parse(opt.broker) if err != nil {

1 0

[snowflake/master] Improve some error messages.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit af8a0269915b71d4c1b9d2c6dbb9a8b7963a377d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 15:59:07 2017 -0700 Improve some error messages. --- proxy-go/snowflake.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 5342ab1..079dcdc 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -107,7 +107,7 @@ func pollOffer(sid string, broker *url.URL) *webrtc.SessionDescription { req.Header.Set("X-Session-ID", sid) resp, err := client.Do(req) if err != nil { - log.Printf("error to poll broker: %s", err) + log.Printf("error polling broker: %s", err) } else { defer resp.Body.Close() if resp.StatusCode != http.StatusOK { @@ -115,7 +115,7 @@ func pollOffer(sid string, broker *url.URL) *webrtc.SessionDescription { } else { body, err := ioutil.ReadAll(resp.Body) if err != nil { - log.Printf("error to read broker responses: %s", err) + log.Printf("error reading broker response: %s", err) } else { return webrtc.DeserializeSessionDescription(string(body)) } @@ -180,7 +180,7 @@ func datachannelHandler(conn *webRTCConn) { wsConn, err := websocket.Dial(opt.relay, "", opt.relay) if err != nil { - log.Printf("error to dial relay: %s", err) + log.Printf("error dialing relay: %s", err) return } log.Printf("connected to relay") @@ -278,13 +278,13 @@ func runSession(sid string) { } pc, err := makePeerConnectionFromOffer(offer, config) if err != nil { - log.Printf("error to make WebRTC connection: %s", err) + log.Printf("error making WebRTC connection: %s", err) retToken() return } err = sendAnswer(sid, opt.brokerURL, pc) if err != nil { - log.Printf("error to send answer to client through broker: %s", err) + log.Printf("error sending answer to client through broker: %s", err) pc.Close() retToken() return

1 0

[snowflake/master] Handle TOR_PT_EXIT_ON_STDIN_CLOSE.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit f418ec7a8591227c7c735450db9024bbf4751ef4 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 15:23:40 2017 -0700 Handle TOR_PT_EXIT_ON_STDIN_CLOSE. --- client/snowflake.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/client/snowflake.go b/client/snowflake.go index ad29aea..f632e5e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -5,6 +5,7 @@ import ( "errors" "flag" "io" + "io/ioutil" "log" "net" "os" @@ -200,6 +201,16 @@ func main() { sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGTERM) + if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { + // This environment variable means we should treat EOF on stdin + // just like SIGTERM: https://bugs.torproject.org/15435. + go func() { + io.Copy(ioutil.Discard, os.Stdin) + log.Printf("synthesizing SIGTERM because of stdin close") + sigChan <- syscall.SIGTERM + }() + } + // keep track of handlers and wait for a signal sig = nil for sig == nil {

1 0

[snowflake/master] Use crypto/rand, not math/rand, to generate session IDs.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit faeb8da8c910a1a29fe47264396bee7c18ad4bfc Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 16:00:29 2017 -0700 Use crypto/rand, not math/rand, to generate session IDs. math/rand always uses a deterministic seed. The sequence of session IDs was therefore always the same: Uv38ByGCZU8WP18PmmIdcg lWbHTRDYaB0NhtHpHgAWeQ ... Multiple copies of this program would have had session ID collisions. I don't know what the consequences of that would be. --- proxy-go/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 079dcdc..27c4ab9 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -8,7 +8,7 @@ import ( "io" "io/ioutil" "log" - "math/rand" + "crypto/rand" "net" "net/http" "net/url"

1 0

[snowflake/master] Remove SIGINT handling (no longer part of pt-spec).
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit 1fa9bc051c387b0c9bbcc16a447daaf54dfefea6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 15:20:54 2017 -0700 Remove SIGINT handling (no longer part of pt-spec). --- client/snowflake.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index b1c3975..ad29aea 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -198,9 +198,9 @@ func main() { var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) - // wait for first signal + // keep track of handlers and wait for a signal sig = nil for sig == nil { select { @@ -209,17 +209,16 @@ func main() { case sig = <-sigChan: } } + + // signal received, shut down for _, ln := range listeners { ln.Close() } snowflakes.End() - // wait for second signal or no more handlers - sig = nil - for sig == nil && numHandlers != 0 { - select { - case n := <-handlerChan: - numHandlers += n - case sig = <-sigChan: + for n := range handlerChan { + numHandlers += n + if numHandlers == 0 { + break } } log.Println("snowflake is done.")

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.2
by boklm＠torproject.org 29 Jun '17

29 Jun '17

commit 3b5c0fdc4061d9b8568002d829f03c0e8a01d742 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 30 00:55:43 2017 +0200 Release preparations for 7.0.2 Version bumps, changelog update, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 4 ++-- tools/update-responses/config.yml | 9 ++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d0c95b2..c7cb8c2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.0.2 -- July 3 2017 + * All Platforms + * Update Tor to 0.3.0.9, fixing bug #22753 + * Update HTTPS-Everywhere to 5.2.19 + Tor Browser 7.0.1 -- June 13 2017 * All Platforms * Update Firefox to 52.2.0esr diff --git a/gitian/versions b/gitian/versions index ae21121..b8670f5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,10 +15,10 @@ FIREFOX_VERSION=52.2.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.8 +TOR_TAG=tor-0.3.0.9 TORLAUNCHER_TAG=0.2.12.2 TORBUTTON_TAG=1.9.7.4 -HTTPSE_TAG=5.2.18 +HTTPSE_TAG=5.2.19 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d5151bc..9ff92ce 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.1 + release: 7.0.2 versions: - 7.0.1: + 7.0.2: platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-701-released + detailsURL: https://blog.torproject.org/blog/tor-browser-702-released incremental_from: - - 6.5.2 - - 7.0 + - 7.0.1 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor/maint-0.3.1] bump to 0.3.0.9-dev
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit d9427c00dfcda58d1a2561b37c1c6217d2ff692a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 18:44:43 2017 -0400 bump to 0.3.0.9-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6c6eb6c..f67e0dc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.9]) +AC_INIT([tor],[0.3.0.9-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 57821bc..3b375c8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.9" +!define VERSION "0.3.0.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 96d16bd..ba6818f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.9" +#define VERSION "0.3.0.9-dev"

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 6f2657dbcf81c8f78acb49d487075e66ec9be3c2 Merge: a535735 d9427c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 18:44:53 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

1 0