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

[websocket/bug18628] Expose the entire ws request instead of just the URL
by dcf＠torproject.org 01 Aug '17

01 Aug '17

commit 02a8eb6d7a236f8b805dbd086f1c46f5dfb51149 Author: Hooman <hoomanm(a)princeton.edu> Date: Fri Jul 28 17:29:04 2017 -0700 Expose the entire ws request instead of just the URL --- websocket/websocket.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/websocket/websocket.go b/websocket/websocket.go index b74e3ae..fac649b 100644 --- a/websocket/websocket.go +++ b/websocket/websocket.go @@ -43,7 +43,6 @@ import ( "net" "net/http" "strings" - "net/url" ) // Settings for potential WebSocket connections. Subprotocols is a list of @@ -88,9 +87,12 @@ type WebSocket struct { // Buffer for message payloads, which may be interrupted by control // messages. messageBuf bytes.Buffer - // Request URL - ReqURL url.URL + // Request + request http.Request +} +func (ws *WebSocket) Request() http.Request { + return ws.request } func applyMask(payload []byte, maskKey [4]byte) { @@ -338,13 +340,6 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) return } - /* URLs are accepted - if req.URL.Path != "/" { - httpError(w, bufrw, http.StatusNotFound) - return - } - */ - // 2. A |Host| header field containing the server's authority. // We deliberately skip this test. // 3. An |Upgrade| header field containing the value "websocket", @@ -395,7 +390,7 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) ws.Bufrw = bufrw ws.IsClient = false ws.MaxMessageSize = handler.Config.MaxMessageSize - ws.ReqURL = *req.URL + ws.request = *req // See RFC 6455 section 4.2.2, item 5 for these steps.

1 0

[torbirdy/master] Update version to 0.2.3 in install.rdf
by sukhbir＠torproject.org 01 Aug '17

01 Aug '17

commit 090d9b19dc7b7ee246ac2e5e41e353560b6167b7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 31 19:12:28 2017 -0400 Update version to 0.2.3 in install.rdf --- install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.rdf b/install.rdf index 99b3372..fefb89f 100644 --- a/install.rdf +++ b/install.rdf @@ -4,9 +4,10 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.2.2</em:version> + <em:version>0.2.3</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL> + <em:optionsURL>chrome://castironthunderbirdclub/content/preferences.xul</em:optionsURL> <em:targetApplication>  @@ -24,6 +25,5 @@ <em:contributor>Jacob Appelbaum</em:contributor> <em:contributor>tagnaq</em:contributor> <em:homepageURL>https://www.torproject.org/</em:homepageURL> - <em:optionsURL>chrome://castironthunderbirdclub/content/preferences.xul</em:optionsURL> </Description> </RDF>

1 0

[snowflake/master] Make capacity a uint.
by dcf＠torproject.org 01 Aug '17

01 Aug '17

commit 461dbeba80ad43f043d39cddae7e9d0e38fc3dd4 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 1 15:06:53 2017 -0700 Make capacity a uint. This prohibits some nonsense like "./proxy-go -capacity -550", which otherwise results in a panic like: INFO: configuration.go:174: Created Configuration at &{[{[stun:stun.l.google.com:19302] }] All Balanced } panic: makechan: size out of range --- proxy-go/snowflake.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 26e7994..5111e8e 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -26,7 +26,7 @@ const defaultRelayURL = "wss://snowflake.bamsoftware.com/" const defaultSTUNURL = "stun:stun.l.google.com:19302" type snowflakeOptions struct { - capacity int + capacity uint broker string brokerURL *url.URL stun string @@ -296,7 +296,7 @@ func runSession(sid string) { func main() { var logFilename string opt = new(snowflakeOptions) - flag.IntVar(&opt.capacity, "capacity", 10, "maximum concurrent clients") + flag.UintVar(&opt.capacity, "capacity", 10, "maximum concurrent clients") 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") @@ -329,7 +329,7 @@ func main() { config = webrtc.NewConfiguration(webrtc.OptionIceServer(opt.stun)) tokens = make(chan bool, opt.capacity) - for i := 0; i < opt.capacity; i++ { + for i := uint(0); i < opt.capacity; i++ { tokens <- true }

1 0

[snowflake/master] Stop writing to global opt.brokerURL variable.
by dcf＠torproject.org 01 Aug '17

01 Aug '17

commit 1eb5c66428e0e6cce8ffc0ebf7c4ec8e65f56e30 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 1 15:51:34 2017 -0700 Stop writing to global opt.brokerURL variable. This variable was being written to by multiple goroutines, overwriting the Path to either "/proxy" or "/answer" as necessary, which was racy. --- proxy-go/snowflake.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 5111e8e..f1dc1f0 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -28,7 +28,6 @@ const defaultSTUNURL = "stun:stun.l.google.com:19302" type snowflakeOptions struct { capacity uint broker string - brokerURL *url.URL stun string relay string } @@ -102,7 +101,17 @@ func genSessionID() string { return strings.TrimRight(base64.StdEncoding.EncodeToString(buf), "=") } -func pollOffer(sid string, broker *url.URL) *webrtc.SessionDescription { +// Parses a URL with url.Parse and panics on any error. +func mustParseURL(rawurl string) *url.URL { + u, err := url.Parse(rawurl) + if err != nil { + panic(err) + } + return u +} + +func pollOffer(sid string) *webrtc.SessionDescription { + broker := mustParseURL(opt.broker) broker.Path = "/proxy" for { req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer([]byte(sid))) @@ -126,7 +135,8 @@ func pollOffer(sid string, broker *url.URL) *webrtc.SessionDescription { } } -func sendAnswer(sid string, broker *url.URL, pc *webrtc.PeerConnection) error { +func sendAnswer(sid string, pc *webrtc.PeerConnection) error { + broker := mustParseURL(opt.broker) broker.Path = "/answer" body := bytes.NewBuffer([]byte(pc.LocalDescription().Serialize())) req, _ := http.NewRequest("POST", broker.String(), body) @@ -272,7 +282,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. } func runSession(sid string) { - offer := pollOffer(sid, opt.brokerURL) + offer := pollOffer(sid) if offer == nil { log.Printf("bad offer from broker") retToken() @@ -284,7 +294,7 @@ func runSession(sid string) { retToken() return } - err = sendAnswer(sid, opt.brokerURL, pc) + err = sendAnswer(sid, pc) if err != nil { log.Printf("error sending answer to client through broker: %s", err) pc.Close() @@ -314,7 +324,7 @@ func main() { } var err error - opt.brokerURL, err = url.Parse(opt.broker) + _, err = url.Parse(opt.broker) if err != nil { log.Fatalf("invalid broker url: %s", err) }

1 0

[snowflake/master] Deglobalize some flag-controlled variables.
by dcf＠torproject.org 01 Aug '17

01 Aug '17

commit 3e3e4b8dd957c306777a30ae38e4bfdcf10cac70 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 1 15:53:36 2017 -0700 Deglobalize some flag-controlled variables. Remove global opt struct. --- proxy-go/snowflake.go | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index f1dc1f0..33becb3 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -25,12 +25,8 @@ 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 uint - broker string - stun string - relay string -} +var brokerURL string +var relayURL string const ( sessionIDLength = 16 @@ -38,7 +34,6 @@ const ( var ( tokens chan bool - opt *snowflakeOptions config *webrtc.Configuration client http.Client ) @@ -111,7 +106,7 @@ func mustParseURL(rawurl string) *url.URL { } func pollOffer(sid string) *webrtc.SessionDescription { - broker := mustParseURL(opt.broker) + broker := mustParseURL(brokerURL) broker.Path = "/proxy" for { req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer([]byte(sid))) @@ -136,7 +131,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { } func sendAnswer(sid string, pc *webrtc.PeerConnection) error { - broker := mustParseURL(opt.broker) + broker := mustParseURL(brokerURL) broker.Path = "/answer" body := bytes.NewBuffer([]byte(pc.LocalDescription().Serialize())) req, _ := http.NewRequest("POST", broker.String(), body) @@ -190,7 +185,7 @@ func datachannelHandler(conn *webRTCConn) { defer conn.Close() defer retToken() - wsConn, err := websocket.Dial(opt.relay, "", opt.relay) + wsConn, err := websocket.Dial(relayURL, "", relayURL) if err != nil { log.Printf("error dialing relay: %s", err) return @@ -304,12 +299,14 @@ func runSession(sid string) { } func main() { + var capacity uint + var stunURL string var logFilename string - opt = new(snowflakeOptions) - flag.UintVar(&opt.capacity, "capacity", 10, "maximum concurrent clients") - 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.UintVar(&capacity, "capacity", 10, "maximum concurrent clients") + flag.StringVar(&brokerURL, "broker", defaultBrokerURL, "broker URL") + flag.StringVar(&relayURL, "relay", defaultRelayURL, "websocket relay URL") + flag.StringVar(&stunURL, "stun", defaultSTUNURL, "stun URL") flag.StringVar(&logFilename, "log", "", "log filename") flag.Parse() @@ -324,22 +321,22 @@ func main() { } var err error - _, err = url.Parse(opt.broker) + _, err = url.Parse(brokerURL) if err != nil { log.Fatalf("invalid broker url: %s", err) } - _, err = url.Parse(opt.stun) + _, err = url.Parse(stunURL) if err != nil { log.Fatalf("invalid stun url: %s", err) } - _, err = url.Parse(opt.relay) + _, err = url.Parse(relayURL) if err != nil { log.Fatalf("invalid relay url: %s", err) } - config = webrtc.NewConfiguration(webrtc.OptionIceServer(opt.stun)) - tokens = make(chan bool, opt.capacity) - for i := uint(0); i < opt.capacity; i++ { + config = webrtc.NewConfiguration(webrtc.OptionIceServer(stunURL)) + tokens = make(chan bool, capacity) + for i := uint(0); i < capacity; i++ { tokens <- true }

1 0

[tor-browser-build/master] Update rbm
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit 7a31404747c4bda63dc9640513ed2a35e5601ba2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 22:52:16 2017 +0200 Update rbm Update rbm, fixing a 'git checkout --detach' error due to the lack of master branch on tor-browser.git. --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 106e9b0..ff4299f 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 106e9b05aeff6309e241a3c9bae1781e0d551e7a +Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f

1 0

[rbm/master] Only run 'git checkout --detach' when necessary
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 22:40:16 2017 +0200 Only run 'git checkout --detach' when necessary Before updating local branches, we need to detach HEAD to be able to update the current branch. However, we only need to do that if we are on a branch, and when this branch exists. This avoids an error when the repository we have cloned does not have a master branch: in that case we are in a branch that does not exist, which cause an error when running 'git checkout --detach'. --- lib/RBM.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 6825050..888c3e1 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -390,8 +390,12 @@ sub git_clone_fetch_chdir { if (git_need_fetch($project, $options)) { system('git', 'remote', 'set-url', 'origin', $git_url) == 0 || exit_error "Error setting git remote"; - system('git', 'checkout', '-q', '--detach') == 0 + my ($ref, undef, $success) = capture_exec('git', 'symbolic-ref', 'HEAD'); + chomp $ref; + if ($success && -e ".git/$ref") { + system('git', 'checkout', '-q', '--detach') == 0 || exit_error "Error running git checkout --detach"; + } system('git', 'fetch', @fetch_submod, 'origin', '+refs/heads/*:refs/heads/*') == 0 || exit_error "Error fetching git repository";

1 0

[sandboxed-tor-browser/master] Bump the version to 0.0.13-dev.
by yawning＠torproject.org 01 Aug '17

01 Aug '17

commit f2633e33d1fd65368bc5362ff392ee49187d4c47 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Aug 1 20:32:14 2017 +0000 Bump the version to 0.0.13-dev. --- ChangeLog | 2 ++ data/version | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 29c1f27..274f4e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 0.0.13 - UNRELEASED: + Changes in version 0.0.12 - 2017-08-01: * Bug 22969: Disable the addon blocklist. * Bug 22984: Force IDNs to be displayed as punycode to thwart homograph diff --git a/data/version b/data/version index 8cbf02c..a4eb7ef 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.12 +0.0.13-dev

1 0

[sandboxed-tor-browser/master] Do the release ritual for sandboxed-tor-browser-0.0.12.
by yawning＠torproject.org 01 Aug '17

01 Aug '17

commit ed53c14d02c28e445ef069b2a0da67d66e2fec23 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Aug 1 20:30:15 2017 +0000 Do the release ritual for sandboxed-tor-browser-0.0.12. --- ChangeLog | 2 +- data/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 832f019..29c1f27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.12 - UNRELEASED: +Changes in version 0.0.12 - 2017-08-01: * Bug 22969: Disable the addon blocklist. * Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks. diff --git a/data/version b/data/version index 2f80b8d..8cbf02c 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.12-dev +0.0.12

1 0

[tor-messenger-build/esr52] Update README.md (borrowed from TBB b80b64e)
by sukhbir＠torproject.org 01 Aug '17

01 Aug '17

commit 386fa9abeff7dfb3bcd63f824ac14c44a5dddba9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 1 09:59:24 2017 -0400 Update README.md (borrowed from TBB b80b64e) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 341cffd..e2e6cd3 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Installing build dependencies ----------------------------- To build Tor Messenger, you need a Linux distribution that has support for -runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). On Debian jessie, the runc package is available in backports. On Debian stretch, the runc package is available in the main repository.

1 0