May 2019 - tor-commits - lists.torproject.org

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 28 May '19

28 May '19

commit cb8c6721db69ef07ed30095d473d100c8699d207 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:21:14 2019 +0000 Update translations for support-portal --- contents+fr.po | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b8aef3cb6..5937a0ec9 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1481,8 +1481,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" -"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for le " -"Navigateur Tor Update\">" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Vérification de " +"mise à jour du Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1496,7 +1496,9 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image5.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1506,7 +1508,9 @@ msgstr "Le Navigateur Tor installera les mises à jour." #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image3.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -1634,8 +1638,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"le " -"Navigateur Tor Menu\">" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Menu du " +"Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1685,8 +1689,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" -"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " -"Circuit for this Site\">" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"Nouveau" +" circuit pour ce site\">" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.title) @@ -3972,7 +3976,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Icône d’oignon\">" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -3989,8 +3993,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" -"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " -"with a padlock\">" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Oignon vert " +"avec un cadenas\">" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.title)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 7fd057a9ad784355bf4d1fcce1b960af07e20652 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:18:07 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b4c142fde..72f9e50cb 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -105,9 +105,9 @@ msgid "" "explicitly identify yourself." msgstr "" "* Les opérateurs des sites Web et des services que vous utilisez, et " -"quiconque les surveille, relèveront une connexion en provenance du réseau " -"Tor au lieu de votre adresse internet (IP) réelle, et ne saurons pas qui " -"vous êtes à moins que vous vous identifiiez explicitement." +"quiconque les surveille, verront une connexion en provenance du réseau Tor " +"au lieu de votre adresse (IP) réelle, et ne sauront pas qui vous êtes, sauf " +"si vous vous identifiez explicitement." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -146,10 +146,11 @@ msgid "" "public Internet." msgstr "" "Tor est un réseau de tunnels virtuels qui vous permet d’améliorer la " -"protection de vos données personnelles et votre sécurité sur Internet. Tor " -"fonctionne en acheminant votre trafic par trois serveurs aléatoires (aussi " -"appelés *relais*) dans le réseau Tor. Le dernier relais du circuit (le « " -"relais de sortie ») envoie ensuite le trafic vers l’Internet public." +"confidentialité, la protection de vos données personnelles et votre sécurité" +" sur Internet. Tor fonctionne en acheminant votre trafic par trois serveurs " +"aléatoires (aussi appelés *relais*) dans le réseau Tor. Le dernier relais du" +" circuit (le « relais de sortie ») envoie ensuite le trafic vers l’Internet " +"public." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -157,8 +158,8 @@ msgid "" "<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor " "Browser works\">" msgstr "" -"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How le " -"Navigateur Tor works\">" +"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"Comment " +"fonctionne le Navigateur Tor\">" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 28 May '19

28 May '19

commit 90efb7976a8a862cb01694832d602741549bcb0d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:18:00 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b4c142fde..72f9e50cb 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -105,9 +105,9 @@ msgid "" "explicitly identify yourself." msgstr "" "* Les opérateurs des sites Web et des services que vous utilisez, et " -"quiconque les surveille, relèveront une connexion en provenance du réseau " -"Tor au lieu de votre adresse internet (IP) réelle, et ne saurons pas qui " -"vous êtes à moins que vous vous identifiiez explicitement." +"quiconque les surveille, verront une connexion en provenance du réseau Tor " +"au lieu de votre adresse (IP) réelle, et ne sauront pas qui vous êtes, sauf " +"si vous vous identifiez explicitement." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -146,10 +146,11 @@ msgid "" "public Internet." msgstr "" "Tor est un réseau de tunnels virtuels qui vous permet d’améliorer la " -"protection de vos données personnelles et votre sécurité sur Internet. Tor " -"fonctionne en acheminant votre trafic par trois serveurs aléatoires (aussi " -"appelés *relais*) dans le réseau Tor. Le dernier relais du circuit (le « " -"relais de sortie ») envoie ensuite le trafic vers l’Internet public." +"confidentialité, la protection de vos données personnelles et votre sécurité" +" sur Internet. Tor fonctionne en acheminant votre trafic par trois serveurs " +"aléatoires (aussi appelés *relais*) dans le réseau Tor. Le dernier relais du" +" circuit (le « relais de sortie ») envoie ensuite le trafic vers l’Internet " +"public." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -157,8 +158,8 @@ msgid "" "<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor " "Browser works\">" msgstr "" -"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How le " -"Navigateur Tor works\">" +"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"Comment " +"fonctionne le Navigateur Tor\">" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body)

1 0

[snowflake/master] Guard against large reads
by cohosh＠torproject.org 28 May '19

28 May '19

commit ce3101d0169f6a0f483a72a8cf18d7da8359b6d5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 10 15:36:04 2019 -0400 Guard against large reads This is a fix for #26348 --- broker/broker.go | 6 +++--- client/lib/rendezvous.go | 2 +- proxy-go/snowflake.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index ae27a47..a0ef38a 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -136,7 +136,7 @@ For snowflake proxies to request a client from the Broker. */ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { id := r.Header.Get("X-Session-ID") - body, err := ioutil.ReadAll(r.Body) + body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) if nil != err { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) @@ -166,7 +166,7 @@ the HTTP response back to the client. */ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { startTime := time.Now() - offer, err := ioutil.ReadAll(r.Body) + offer, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) if nil != err { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) @@ -213,7 +213,7 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusGone) return } - body, err := ioutil.ReadAll(r.Body) + body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) if nil != err || nil == body || len(body) <= 0 { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index d04b0b1..e53c51e 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -91,7 +91,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( switch resp.StatusCode { case http.StatusOK: - body, err := ioutil.ReadAll(resp.Body) + body, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, 100000)) if nil != err { return nil, err } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 858320b..ebab790 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -162,7 +162,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { if resp.StatusCode != http.StatusOK { log.Printf("broker returns: %d", resp.StatusCode) } else { - body, err := ioutil.ReadAll(resp.Body) + body, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, 100000)) if err != nil { log.Printf("error reading broker response: %s", err) } else {

1 0

[snowflake/master] Simplified limitedReader by reading one extra byte
by cohosh＠torproject.org 28 May '19

28 May '19

commit 254e6b9a3d404d1f2bde5e12a2e6d1cf7a08dc80 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue May 28 13:14:18 2019 -0400 Simplified limitedReader by reading one extra byte --- client/lib/rendezvous.go | 13 +++---------- proxy-go/snowflake.go | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 7f03d13..cd26f6e 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -67,18 +67,11 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper) } func limitedRead(r io.Reader, limit int64) ([]byte, error) { - p, err := ioutil.ReadAll(&io.LimitedReader{r, limit}) + p, err := ioutil.ReadAll(&io.LimitedReader{r, limit + 1}) if err != nil { return p, err - } - - //Check to see if limit was exceeded - var tmp [1]byte - _, err = io.ReadFull(r, tmp[:]) - if err == io.EOF { - err = nil - } else if err == nil { - err = io.ErrUnexpectedEOF + } else if int64(len(p)) == limit+1 { + return p[0:limit], io.ErrUnexpectedEOF } return p, err } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index ececda3..27eb9a3 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -140,18 +140,11 @@ func genSessionID() string { } func limitedRead(r io.Reader, limit int64) ([]byte, error) { - p, err := ioutil.ReadAll(&io.LimitedReader{r, limit}) + p, err := ioutil.ReadAll(&io.LimitedReader{r, limit + 1}) if err != nil { return p, err - } - - //Check to see if limit was exceeded - var tmp [1]byte - _, err = io.ReadFull(r, tmp[:]) - if err == io.EOF { - err = nil - } else if err == nil { - err = io.ErrUnexpectedEOF + } else if int64(len(p)) == limit+1 { + return p[0:limit], io.ErrUnexpectedEOF } return p, err }

1 0

[snowflake/master] Added tests to check large read guards
by cohosh＠torproject.org 28 May '19

28 May '19

commit 0842dad38e6cfd464166f16ed8088b02055714e3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 10 15:39:05 2019 -0400 Added tests to check large read guards --- broker/snowflake-broker_test.go | 10 ++++++++++ client/lib/lib_test.go | 28 +++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 0d50035..03aa2b4 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -178,6 +178,16 @@ func TestBroker(t *testing.T) { proxyAnswers(ctx, w, r) So(w.Code, ShouldEqual, http.StatusBadRequest) }) + + Convey("with error if the proxy writes too much data", func() { + data := bytes.NewReader(make([]byte, 100001, 100001)) + r, err := http.NewRequest("POST", "snowflake.broker/answer", data) + r.Header.Set("X-Session-ID", "test") + So(err, ShouldBeNil) + proxyAnswers(ctx, w, r) + So(w.Code, ShouldEqual, http.StatusBadRequest) + }) + }) }) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 5a9a2e5..4f74cb3 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -6,7 +6,6 @@ import ( "io/ioutil" "net" "net/http" - "strings" "testing" "github.com/keroserene/go-webrtc" @@ -33,11 +32,14 @@ func (m *MockResponse) Read(p []byte) (int, error) { } func (m *MockResponse) Close() error { return nil } -type MockTransport struct{ statusOverride int } +type MockTransport struct { + statusOverride int + body []byte +} // Just returns a response with fake SDP answer. func (m *MockTransport) RoundTrip(req *http.Request) (*http.Response, error) { - s := ioutil.NopCloser(strings.NewReader(`{"type":"answer","sdp":"fake"}`)) + s := ioutil.NopCloser(bytes.NewReader(m.body)) r := &http.Response{ StatusCode: m.statusOverride, Body: s, @@ -263,7 +265,10 @@ func TestSnowflakeClient(t *testing.T) { Convey("Rendezvous", t, func() { webrtc.SetLoggingVerbosity(0) - transport := &MockTransport{http.StatusOK} + transport := &MockTransport{ + http.StatusOK, + []byte(`{"type":"answer","sdp":"fake"}`), + } fakeOffer := webrtc.DeserializeSessionDescription("test") Convey("Construct BrokerChannel with no front domain", func() { @@ -291,7 +296,7 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with 503", func() { b := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusServiceUnavailable}) + &MockTransport{http.StatusServiceUnavailable, []byte("\n")}) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) So(answer, ShouldBeNil) @@ -300,16 +305,25 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with 400", func() { b := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusBadRequest}) + &MockTransport{http.StatusBadRequest, []byte("\n")}) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) So(answer, ShouldBeNil) So(err.Error(), ShouldResemble, BrokerError400) }) + Convey("BrokerChannel.Negotiate fails with large read", func() { + b := NewBrokerChannel("test.broker", "", + &MockTransport{http.StatusOK, make([]byte, 100001, 100001)}) + answer, err := b.Negotiate(fakeOffer) + So(err, ShouldNotBeNil) + So(answer, ShouldBeNil) + So(err.Error(), ShouldResemble, "unexpected EOF") + }) + Convey("BrokerChannel.Negotiate fails with unexpected error", func() { b := NewBrokerChannel("test.broker", "", - &MockTransport{123}) + &MockTransport{123, []byte("")}) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) So(answer, ShouldBeNil)

1 0

[snowflake/master] Keyed composite literal to avoid go vet warning
by cohosh＠torproject.org 28 May '19

28 May '19

commit cd650fa0097f948b15dddd889ad2e6908b58bd66 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue May 28 13:58:16 2019 -0400 Keyed composite literal to avoid go vet warning --- client/lib/rendezvous.go | 2 +- proxy-go/snowflake.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index cd26f6e..54ce459 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -67,7 +67,7 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper) } func limitedRead(r io.Reader, limit int64) ([]byte, error) { - p, err := ioutil.ReadAll(&io.LimitedReader{r, limit + 1}) + p, err := ioutil.ReadAll(&io.LimitedReader{R: r, N: limit + 1}) if err != nil { return p, err } else if int64(len(p)) == limit+1 { diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 27eb9a3..b3c863a 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -140,7 +140,7 @@ func genSessionID() string { } func limitedRead(r io.Reader, limit int64) ([]byte, error) { - p, err := ioutil.ReadAll(&io.LimitedReader{r, limit + 1}) + p, err := ioutil.ReadAll(&io.LimitedReader{R: r, N: limit + 1}) if err != nil { return p, err } else if int64(len(p)) == limit+1 {

1 0

[snowflake/master] Implement limitedRead function for client side
by cohosh＠torproject.org 28 May '19

28 May '19

commit 1d76d3ca2e581bbb345b09444dd1d25dd985673c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 10 17:16:35 2019 -0400 Implement limitedRead function for client side MaxBytesReader is only documented for server side reads, so we're using a local limitedRead function instead that uses an io.LimitedReader. Declared limits in a commented constant --- broker/broker.go | 7 ++++--- client/lib/rendezvous.go | 21 ++++++++++++++++++++- proxy-go/snowflake.go | 21 ++++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index a0ef38a..274d87c 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -28,6 +28,7 @@ import ( const ( ClientTimeout = 10 ProxyTimeout = 10 + readLimit = 100000 //Maximum number of bytes to be read from an HTTP request ) type BrokerContext struct { @@ -136,7 +137,7 @@ For snowflake proxies to request a client from the Broker. */ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { id := r.Header.Get("X-Session-ID") - body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) + body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, readLimit)) if nil != err { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) @@ -166,7 +167,7 @@ the HTTP response back to the client. */ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { startTime := time.Now() - offer, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) + offer, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, readLimit)) if nil != err { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) @@ -213,7 +214,7 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusGone) return } - body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, 100000)) + body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, readLimit)) if nil != err || nil == body || len(body) <= 0 { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index e53c51e..7f03d13 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -11,6 +11,7 @@ package lib import ( "bytes" "errors" + "io" "io/ioutil" "log" "net/http" @@ -23,6 +24,7 @@ const ( BrokerError503 string = "No snowflake proxies currently available." BrokerError400 string = "You sent an invalid offer in the request." BrokerErrorUnexpected string = "Unexpected error, no answer." + readLimit = 100000 //Maximum number of bytes to be read from an HTTP response ) // Signalling Channel to the Broker. @@ -64,6 +66,23 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper) return bc } +func limitedRead(r io.Reader, limit int64) ([]byte, error) { + p, err := ioutil.ReadAll(&io.LimitedReader{r, limit}) + if err != nil { + return p, err + } + + //Check to see if limit was exceeded + var tmp [1]byte + _, err = io.ReadFull(r, tmp[:]) + if err == io.EOF { + err = nil + } else if err == nil { + err = io.ErrUnexpectedEOF + } + return p, err +} + // Roundtrip HTTP POST using WebRTC SessionDescriptions. // // Send an SDP offer to the broker, which assigns a proxy and responds @@ -91,7 +110,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( switch resp.StatusCode { case http.StatusOK: - body, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, 100000)) + body, err := limitedRead(resp.Body, readLimit) if nil != err { return nil, err } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index ebab790..ececda3 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -32,6 +32,8 @@ const pollInterval = 5 * time.Second //client is not going to connect const dataChannelTimeout = 20 * time.Second +const readLimit = 100000 //Maximum number of bytes to be read from an HTTP request + var brokerURL *url.URL var relayURL string @@ -137,6 +139,23 @@ func genSessionID() string { return strings.TrimRight(base64.StdEncoding.EncodeToString(buf), "=") } +func limitedRead(r io.Reader, limit int64) ([]byte, error) { + p, err := ioutil.ReadAll(&io.LimitedReader{r, limit}) + if err != nil { + return p, err + } + + //Check to see if limit was exceeded + var tmp [1]byte + _, err = io.ReadFull(r, tmp[:]) + if err == io.EOF { + err = nil + } else if err == nil { + err = io.ErrUnexpectedEOF + } + return p, err +} + func pollOffer(sid string) *webrtc.SessionDescription { broker := brokerURL.ResolveReference(&url.URL{Path: "proxy"}) timeOfNextPoll := time.Now() @@ -162,7 +181,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { if resp.StatusCode != http.StatusOK { log.Printf("broker returns: %d", resp.StatusCode) } else { - body, err := ioutil.ReadAll(http.MaxBytesReader(nil, resp.Body, 100000)) + body, err := limitedRead(resp.Body, readLimit) if err != nil { log.Printf("error reading broker response: %s", err) } else {

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 27135953c1e03f454d18d983691db948c14d7338 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 17:51:05 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 1349d26cd..b8aef3cb6 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5833,7 +5833,7 @@ msgid "" msgstr "" "Les opérateurs des sites Web et des services que vous utilisez, et quiconque" " les surveille, verront une connexion en provenance du réseau Tor au lieu de" -" votre [(adresse (IP))(#adresse IP)] réelle, et ne sauront pas qui vous " +" votre [(adresse (IP))](#adresse IP) réelle, et ne sauront pas qui vous " "êtes, sauf si vous vous identifiez explicitement." #: https//support.torproject.org/misc/glossary/

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 28 May '19

28 May '19

commit 81c7bdae99d9dccc5573636ee7de1c7174c45607 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 17:50:56 2019 +0000 Update translations for support-portal --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 1349d26cd..b8aef3cb6 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5833,7 +5833,7 @@ msgid "" msgstr "" "Les opérateurs des sites Web et des services que vous utilisez, et quiconque" " les surveille, verront une connexion en provenance du réseau Tor au lieu de" -" votre [(adresse (IP))(#adresse IP)] réelle, et ne sauront pas qui vous " +" votre [(adresse (IP))](#adresse IP) réelle, et ne sauront pas qui vous " "êtes, sauf si vous vous identifiez explicitement." #: https//support.torproject.org/misc/glossary/

1 0