- tor-commits - lists.torproject.org

[snowflake/master] Async test for Broker's proxy handler
by arlo＠torproject.org 15 Feb '16

15 Feb '16

commit 032ab6bcb891b76e5e10c232315c1cb02a8db03e Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 14 16:19:20 2016 -0800 Async test for Broker's proxy handler --- broker/broker.go | 20 +++++++++++--------- broker/snowflake-broker_test.go | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index c81392b..d9aa156 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -29,6 +29,7 @@ type BrokerContext struct { // Map keeping track of snowflakeIDs required to match SDP answers from // the second http POST. snowflakeMap map[string]*Snowflake + createChan chan *ProxyRequest } func NewBrokerContext() *BrokerContext { @@ -37,6 +38,7 @@ func NewBrokerContext() *BrokerContext { return &BrokerContext{ snowflakes: snowflakes, snowflakeMap: make(map[string]*Snowflake), + createChan: make(chan *ProxyRequest), } } @@ -54,8 +56,6 @@ type ProxyRequest struct { offerChan chan []byte } -var createChan = make(chan *ProxyRequest) - // Create and add a Snowflake to the heap. func (sc *BrokerContext) AddSnowflake(id string) *Snowflake { snowflake := new(Snowflake) @@ -69,9 +69,11 @@ func (sc *BrokerContext) AddSnowflake(id string) *Snowflake { } // Match proxies to clients. -func (sc *BrokerContext) Broker(proxies <-chan *ProxyRequest) { - for p := range proxies { - snowflake := sc.AddSnowflake(p.id) +// func (ctx *BrokerContext) Broker(proxies <-chan *ProxyRequest) { +func (ctx *BrokerContext) Broker() { + // for p := range proxies { + for p := range ctx.createChan { + snowflake := ctx.AddSnowflake(p.id) // Wait for a client to avail an offer to the snowflake, or timeout // and ask the snowflake to poll later. go func(p *ProxyRequest) { @@ -81,8 +83,8 @@ func (sc *BrokerContext) Broker(proxies <-chan *ProxyRequest) { p.offerChan <- offer case <-time.After(time.Second * ProxyTimeout): // This snowflake is no longer available to serve clients. - heap.Remove(sc.snowflakes, snowflake.index) - delete(sc.snowflakeMap, snowflake.id) + heap.Remove(ctx.snowflakes, snowflake.index) + delete(ctx.snowflakeMap, snowflake.id) p.offerChan <- nil } }(p) @@ -176,7 +178,7 @@ func proxyHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { p := new(ProxyRequest) p.id = id p.offerChan = make(chan []byte) - createChan <- p + ctx.createChan <- p // Wait for a client to avail an offer to the snowflake, or timeout // and ask the snowflake to poll later. @@ -225,7 +227,7 @@ func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { func init() { ctx := NewBrokerContext() - go ctx.Broker(createChan) + go ctx.Broker() http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 7d8f169..1d41a27 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -15,7 +15,6 @@ func TestBroker(t *testing.T) { ctx := NewBrokerContext() Convey("Adds Snowflake", func() { - ctx := NewBrokerContext() So(ctx.snowflakes.Len(), ShouldEqual, 0) So(len(ctx.snowflakeMap), ShouldEqual, 0) ctx.AddSnowflake("foo") @@ -24,7 +23,6 @@ func TestBroker(t *testing.T) { }) Convey("Responds to client offers...", func() { - w := httptest.NewRecorder() data := bytes.NewReader([]byte("test")) r, err := http.NewRequest("POST", "broker.com/client", data) @@ -55,6 +53,9 @@ func TestBroker(t *testing.T) { }) Convey("Times out when no proxy responds.", func() { + if testing.Short() { + return + } done := make(chan bool) snowflake := ctx.AddSnowflake("fake") go func() { @@ -66,7 +67,43 @@ func TestBroker(t *testing.T) { <-done So(w.Code, ShouldEqual, http.StatusGatewayTimeout) }) + }) + + Convey("Responds to proxy polls...", func() { + done := make(chan bool) + w := httptest.NewRecorder() + data := bytes.NewReader([]byte("test")) + r, err := http.NewRequest("POST", "broker.com/proxy", data) + r.Header.Set("X-Session-ID", "test") + So(err, ShouldBeNil) + + Convey("with a client offer if available.", func() { + go func(ctx *BrokerContext) { + proxyHandler(ctx, w, r) + done <- true + }(ctx) + // Pass a fake client offer to this proxy + p := <-ctx.createChan + So(p.id, ShouldEqual, "test") + p.offerChan <- []byte("fake offer") + <-done + So(w.Code, ShouldEqual, http.StatusOK) + So(w.Body.String(), ShouldEqual, "fake offer") + }) + Convey("times out when no client offer is available.", func() { + go func(ctx *BrokerContext) { + proxyHandler(ctx, w, r) + done <- true + }(ctx) + p := <-ctx.createChan + So(p.id, ShouldEqual, "test") + // nil means timeout + p.offerChan <- nil + <-done + So(w.Body.String(), ShouldEqual, "") + So(w.Code, ShouldEqual, http.StatusGatewayTimeout) + }) }) }) }

1 0

[snowflake/master] Second async test for Broker's proxy answer handler
by arlo＠torproject.org 15 Feb '16

15 Feb '16

commit ee5f4558af82365a512e4283625aa2ea6d2722df Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Feb 15 11:31:57 2016 -0800 Second async test for Broker's proxy answer handler --- broker/broker.go | 2 +- broker/snowflake-broker_test.go | 43 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index d9aa156..7c14f63 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -210,7 +210,7 @@ func answerHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { return } body, err := ioutil.ReadAll(r.Body) - if nil != err { + if nil != err || nil == body || len(body) <= 0 { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 1d41a27..06d2316 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -7,6 +7,7 @@ import ( "net/http" "net/http/httptest" "testing" + "fmt" ) func TestBroker(t *testing.T) { @@ -25,7 +26,7 @@ func TestBroker(t *testing.T) { Convey("Responds to client offers...", func() { w := httptest.NewRecorder() data := bytes.NewReader([]byte("test")) - r, err := http.NewRequest("POST", "broker.com/client", data) + r, err := http.NewRequest("POST", "snowflake.broker/client", data) So(err, ShouldBeNil) Convey("with 503 when no snowflakes are available.", func() { @@ -73,7 +74,7 @@ func TestBroker(t *testing.T) { done := make(chan bool) w := httptest.NewRecorder() data := bytes.NewReader([]byte("test")) - r, err := http.NewRequest("POST", "broker.com/proxy", data) + r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) r.Header.Set("X-Session-ID", "test") So(err, ShouldBeNil) @@ -105,6 +106,44 @@ func TestBroker(t *testing.T) { So(w.Code, ShouldEqual, http.StatusGatewayTimeout) }) }) + + Convey("Responds to proxy answers...", func() { + w := httptest.NewRecorder() + data := bytes.NewReader([]byte("fake answer")) + s := ctx.AddSnowflake("test") + + Convey("by passing to the client if valid.", func() { + r, err := http.NewRequest("POST", "snowflake.broker/answer", data) + So(err, ShouldBeNil) + r.Header.Set("X-Session-ID", "test") + go func(ctx *BrokerContext) { + answerHandler(ctx, w, r) + }(ctx) + answer := <- s.answerChannel + So(w.Code, ShouldEqual, http.StatusOK) + So(answer, ShouldResemble, []byte("fake answer")) + }) + + Convey("with error if the proxy is not recognized", func() { + r, err := http.NewRequest("POST", "snowflake.broker/answer", nil) + So(err, ShouldBeNil) + r.Header.Set("X-Session-ID", "invalid") + answerHandler(ctx, w, r) + So(w.Code, ShouldEqual, http.StatusGone) + fmt.Println("omg") + }) + + Convey("with error if the proxy gives invalid answer", func() { + data := bytes.NewReader(nil) + r, err := http.NewRequest("POST", "snowflake.broker/answer", data) + r.Header.Set("X-Session-ID", "test") + So(err, ShouldBeNil) + answerHandler(ctx, w, r) + So(w.Code, ShouldEqual, http.StatusBadRequest) + }) + + }) + }) }

1 0

[snowflake/master] End-to-end Goconvey test for Broker passing SDP messages between concurrent client and proxy
by arlo＠torproject.org 15 Feb '16

15 Feb '16

commit 254223be0f7372669a5d42c6ed1bcf1cc559546b Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Feb 15 12:23:35 2016 -0800 End-to-end Goconvey test for Broker passing SDP messages between concurrent client and proxy request handlers --- broker/broker.go | 16 +++++----- broker/snowflake-broker_test.go | 66 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 16 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 7c14f63..69b8369 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -28,17 +28,17 @@ type BrokerContext struct { snowflakes *SnowflakeHeap // Map keeping track of snowflakeIDs required to match SDP answers from // the second http POST. - snowflakeMap map[string]*Snowflake - createChan chan *ProxyRequest + snowflakeMap map[string]*Snowflake + createChannel chan *ProxyRequest } func NewBrokerContext() *BrokerContext { snowflakes := new(SnowflakeHeap) heap.Init(snowflakes) return &BrokerContext{ - snowflakes: snowflakes, - snowflakeMap: make(map[string]*Snowflake), - createChan: make(chan *ProxyRequest), + snowflakes: snowflakes, + snowflakeMap: make(map[string]*Snowflake), + createChannel: make(chan *ProxyRequest), } } @@ -72,7 +72,7 @@ func (sc *BrokerContext) AddSnowflake(id string) *Snowflake { // func (ctx *BrokerContext) Broker(proxies <-chan *ProxyRequest) { func (ctx *BrokerContext) Broker() { // for p := range proxies { - for p := range ctx.createChan { + for p := range ctx.createChannel { snowflake := ctx.AddSnowflake(p.id) // Wait for a client to avail an offer to the snowflake, or timeout // and ask the snowflake to poll later. @@ -131,7 +131,7 @@ func clientHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Headers", "X-Session-ID") // Find the most available snowflake proxy, and pass the offer to it. - // TODO: Needs improvement - maybe shouldn' + // TODO: Needs improvement - maybe shouldn't immediately fail? if ctx.snowflakes.Len() <= 0 { log.Println("Client: No snowflake proxies available.") w.WriteHeader(http.StatusServiceUnavailable) @@ -178,7 +178,7 @@ func proxyHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { p := new(ProxyRequest) p.id = id p.offerChan = make(chan []byte) - ctx.createChan <- p + ctx.createChannel <- p // Wait for a client to avail an offer to the snowflake, or timeout // and ask the snowflake to poll later. diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 06d2316..ee984b0 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -7,7 +7,6 @@ import ( "net/http" "net/http/httptest" "testing" - "fmt" ) func TestBroker(t *testing.T) { @@ -84,7 +83,7 @@ func TestBroker(t *testing.T) { done <- true }(ctx) // Pass a fake client offer to this proxy - p := <-ctx.createChan + p := <-ctx.createChannel So(p.id, ShouldEqual, "test") p.offerChan <- []byte("fake offer") <-done @@ -97,7 +96,7 @@ func TestBroker(t *testing.T) { proxyHandler(ctx, w, r) done <- true }(ctx) - p := <-ctx.createChan + p := <-ctx.createChannel So(p.id, ShouldEqual, "test") // nil means timeout p.offerChan <- nil @@ -107,10 +106,10 @@ func TestBroker(t *testing.T) { }) }) - Convey("Responds to proxy answers...", func() { + Convey("Responds to proxy answers...", func() { + s := ctx.AddSnowflake("test") w := httptest.NewRecorder() data := bytes.NewReader([]byte("fake answer")) - s := ctx.AddSnowflake("test") Convey("by passing to the client if valid.", func() { r, err := http.NewRequest("POST", "snowflake.broker/answer", data) @@ -119,7 +118,7 @@ func TestBroker(t *testing.T) { go func(ctx *BrokerContext) { answerHandler(ctx, w, r) }(ctx) - answer := <- s.answerChannel + answer := <-s.answerChannel So(w.Code, ShouldEqual, http.StatusOK) So(answer, ShouldResemble, []byte("fake answer")) }) @@ -130,7 +129,6 @@ func TestBroker(t *testing.T) { r.Header.Set("X-Session-ID", "invalid") answerHandler(ctx, w, r) So(w.Code, ShouldEqual, http.StatusGone) - fmt.Println("omg") }) Convey("with error if the proxy gives invalid answer", func() { @@ -141,9 +139,61 @@ func TestBroker(t *testing.T) { answerHandler(ctx, w, r) So(w.Code, ShouldEqual, http.StatusBadRequest) }) - }) + }) + + Convey("End-To-End", t, func() { + done := make(chan bool) + polled := make(chan bool) + ctx := NewBrokerContext() + // Proxy polls with its ID first... + dataP := bytes.NewReader([]byte("test")) + wP := httptest.NewRecorder() + rP, err := http.NewRequest("POST", "snowflake.broker/proxy", dataP) + So(err, ShouldBeNil) + rP.Header.Set("X-Session-ID", "test") + go func() { + proxyHandler(ctx, wP, rP) + polled <- true + }() + + // Manually do the Broker goroutine action here for full control. + p := <-ctx.createChannel + So(p.id, ShouldEqual, "test") + s := ctx.AddSnowflake(p.id) + go func() { + offer := <-s.offerChannel + p.offerChan <- offer + }() + So(ctx.snowflakeMap["test"], ShouldNotBeNil) + + // Client request blocks until proxy answer arrives. + dataC := bytes.NewReader([]byte("fake offer")) + wC := httptest.NewRecorder() + rC, err := http.NewRequest("POST", "snowflake.broker/client", dataC) + So(err, ShouldBeNil) + go func() { + clientHandler(ctx, wC, rC) + done <- true + }() + + <-polled + So(wP.Code, ShouldEqual, http.StatusOK) + So(wP.Body.String(), ShouldResemble, "fake offer") + So(ctx.snowflakeMap["test"], ShouldNotBeNil) + // Follow up with the answer request afterwards + wA := httptest.NewRecorder() + dataA := bytes.NewReader([]byte("fake answer")) + rA, err := http.NewRequest("POST", "snowflake.broker/proxy", dataA) + So(err, ShouldBeNil) + rA.Header.Set("X-Session-ID", "test") + answerHandler(ctx, wA, rA) + So(wA.Code, ShouldEqual, http.StatusOK) + + <-done + So(wC.Code, ShouldEqual, http.StatusOK) + So(wC.Body.String(), ShouldEqual, "fake answer") }) }

1 0

[snowflake/master] Update to go-webrtc HEAD
by arlo＠torproject.org 15 Feb '16

15 Feb '16

commit 9fd471b4c4c081576141925831fa54eac3a34c90 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Feb 15 12:37:52 2016 -0800 Update to go-webrtc HEAD --- client/snowflake.go | 7 +++---- server/snowflake.go | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 486e602..ba1561e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -17,7 +17,6 @@ import ( "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" - "github.com/keroserene/go-webrtc/data" ) var ptInfo pt.ClientInfo @@ -49,7 +48,7 @@ func copyLoop(a, b net.Conn) { type webRTCConn struct { pc *webrtc.PeerConnection - dc *data.Channel + dc *webrtc.DataChannel recvPipe *io.PipeReader } @@ -131,14 +130,14 @@ func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( } // This callback is not expected, as the Client initiates the creation // of the data channel, not the remote peer. - pc.OnDataChannel = func(channel *data.Channel) { + pc.OnDataChannel = func(channel *webrtc.DataChannel) { log.Println("OnDataChannel") panic("OnDataChannel") } pr, pw := io.Pipe() - dc, err := pc.CreateDataChannel("test", data.Init{}) + dc, err := pc.CreateDataChannel("test", webrtc.Init{}) if err != nil { log.Printf("CreateDataChannel: %s", err) return nil, err diff --git a/server/snowflake.go b/server/snowflake.go index 1da419f..9a9c7dc 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -15,7 +15,6 @@ import ( "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" - "github.com/keroserene/go-webrtc/data" ) var ptMethodName = "snowflake" @@ -41,7 +40,7 @@ func copyLoop(a, b net.Conn) { } type webRTCConn struct { - dc *data.Channel + dc *webrtc.DataChannel pc *webrtc.PeerConnection pr *io.PipeReader } @@ -117,7 +116,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. pc.OnIceComplete = func() { answerChan <- struct{}{} } - pc.OnDataChannel = func(dc *data.Channel) { + pc.OnDataChannel = func(dc *webrtc.DataChannel) { log.Println("OnDataChannel") pr, pw := io.Pipe()

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 15 Feb '16

15 Feb '16

commit 68ca602f8431617665c0b5f23a2b2e4b1a25172b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 15 20:45:37 2016 +0000 Update translations for mat-gui_completed --- nl.po | 134 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/nl.po b/nl.po index c17fa81..88152c0 100644 --- a/nl.po +++ b/nl.po @@ -7,13 +7,13 @@ # Nathan Follens, 2015 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Sinkmurderer <syncsnap(a)gmail.com>, 2013 -# Volluta <volluta(a)tutanota.com>, 2015 +# Volluta <volluta(a)tutanota.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 15:03+0100\n" -"PO-Revision-Date: 2015-12-17 18:14+0000\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-15 20:33+0000\n" "Last-Translator: Volluta <volluta(a)tutanota.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -22,171 +22,171 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:64 mat-gui:415 mat-gui:438 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Klaar" -#: mat-gui:133 +#: mat-gui:136 msgid "Choose files" msgstr "Kies bestanden" -#: mat-gui:141 -msgid "All files" -msgstr "Alle bestanden" - -#: mat-gui:147 +#: mat-gui:144 msgid "Supported files" msgstr "Ondersteunde bestanden" -#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436 -#: data/mat.glade:480 +#: mat-gui:151 +msgid "All files" +msgstr "Alle bestanden" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Maak schoon" -#: mat-gui:165 +#: mat-gui:168 msgid "No metadata found" msgstr "Geen metadata gevonden" -#: mat-gui:167 mat-gui:412 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Vuil" -#: mat-gui:172 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "Metadata van %s" -#: mat-gui:183 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Gooi je meta weg, houd je data" -#: mat-gui:188 +#: mat-gui:192 msgid "Website" msgstr "Website" -#: mat-gui:214 +#: mat-gui:219 msgid "Preferences" msgstr "Voorkeuren" -#: mat-gui:227 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Verminder PDF kwaliteit" -#: mat-gui:230 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Verminder de gemaakte PDF grootte en kwaliteit" -#: mat-gui:233 -msgid "Add unsupported file to archives" -msgstr "Voeg niet-ondersteunde bestanden aan archieven toe" +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Verwijder niet-ondersteunde bestanden van archieven" -#: mat-gui:236 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Voeg niet-ondersteunde (en dus niet-geanonimiseerde) bestanden aan archief toe" +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Verwijder niet-ondersteunde (en dus niet-geanonimiseerde) bestanden van het archief" -#: mat-gui:275 +#: mat-gui:280 msgid "Unknown" msgstr "Onbekend" -#: mat-gui:318 +#: mat-gui:325 msgid "Not-supported" msgstr "Niet ondersteund" -#: mat-gui:332 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Onschadelijk bestandsformaat" -#: mat-gui:334 +#: mat-gui:341 msgid "Cant read file" msgstr "Kan bestand niet lezen" -#: mat-gui:336 +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Bestandsformaat niet ondersteund" -#: mat-gui:339 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Deze bestanden kunnen niet verwerkt worden:" -#: mat-gui:344 mat-gui:373 data/mat.glade:519 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Bestandsnaam" -#: mat-gui:346 +#: mat-gui:353 msgid "Reason" msgstr "Reden" -#: mat-gui:358 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Niet-ondersteunde bestanden in archief" -#: mat-gui:372 +#: mat-gui:379 msgid "Include" msgstr "bijvoegen" -#: mat-gui:390 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT kan volgende bestanden, gevonden in het %s archief, niet zuiveren" -#: mat-gui:406 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Bezig met %s controleren..." -#: mat-gui:421 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Bezig met %s opschonen..." -#: data/mat.glade:26 data/mat.glade:196 +#: data/mat.glade:46 +msgid "_File" +msgstr "_Bestand" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Bewerken" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Help" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Voeg toe" + +#: data/mat.glade:256 +msgid "State" +msgstr "Staat" + +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadata" -#: data/mat.glade:85 +#: data/mat.glade:354 msgid "Name" msgstr "Naam" -#: data/mat.glade:99 +#: data/mat.glade:368 msgid "Content" msgstr "Inhoud" -#: data/mat.glade:129 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Ondersteunde formaten" -#: data/mat.glade:185 +#: data/mat.glade:456 msgid "Support" msgstr "Ondersteuning" -#: data/mat.glade:207 +#: data/mat.glade:478 msgid "Method" msgstr "Methode" -#: data/mat.glade:218 +#: data/mat.glade:489 msgid "Remaining" msgstr "Overgebleven" -#: data/mat.glade:247 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Bestandsformaat" - -#: data/mat.glade:326 -msgid "_File" -msgstr "_Bestand" - -#: data/mat.glade:375 -msgid "_Edit" -msgstr "_Bewerken" - -#: data/mat.glade:421 -msgid "_Help" -msgstr "_Help" - -#: data/mat.glade:467 -msgid "Add" -msgstr "Voeg toe" - -#: data/mat.glade:536 -msgid "State" -msgstr "Staat"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 15 Feb '16

15 Feb '16

commit 1e5da31515f99989459b8696633fab3a88d82122 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 15 20:45:32 2016 +0000 Update translations for mat-gui --- nl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl.po b/nl.po index eff6863..88152c0 100644 --- a/nl.po +++ b/nl.po @@ -7,14 +7,14 @@ # Nathan Follens, 2015 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Sinkmurderer <syncsnap(a)gmail.com>, 2013 -# Volluta <volluta(a)tutanota.com>, 2015 +# Volluta <volluta(a)tutanota.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-15 20:33+0000\n" +"Last-Translator: Volluta <volluta(a)tutanota.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,11 @@ msgstr "Verminder de gemaakte PDF grootte en kwaliteit" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Verwijder niet-ondersteunde bestanden van archieven" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Verwijder niet-ondersteunde (en dus niet-geanonimiseerde) bestanden van het archief" #: mat-gui:280 msgid "Unknown"

1 0

[torspec/master] prop250: Mention the hard limit of 255 dirauth
by dgoulet＠torproject.org 15 Feb '16

15 Feb '16

commit 4f15ab616e2870d574c7522c0740ad89972d143e Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Feb 15 15:39:03 2016 -0500 prop250: Mention the hard limit of 255 dirauth Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- proposals/250-commit-reveal-consensus.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proposals/250-commit-reveal-consensus.txt b/proposals/250-commit-reveal-consensus.txt index 262630f..cd19b4c 100644 --- a/proposals/250-commit-reveal-consensus.txt +++ b/proposals/250-commit-reveal-consensus.txt @@ -331,6 +331,9 @@ Supersedes: 225 To maintain consistent ordering in HASHED_REVEALS, all the ID_a | R_a pairs are ordered based on the R_a value in ascending order. + Because the number of reveals (REVEAL_NUM) is using a 1 byte value, it + imposes a hard limit of 255 authorities participating in the protocol. + 3.4. Bootstrapping Procedure As described in [CONS], two shared random values are required for the HSDir

1 0

[gettor/master] Changes made a while ago in getulum (production code)
by ilv＠torproject.org 15 Feb '16

15 Feb '16

commit f3524221026b960fc103761f907da6b3e2c4344a Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Feb 15 17:38:20 2016 -0300 Changes made a while ago in getulum (production code) --- gettor/twitter.py | 20 +++++++++----------- upload/bundles2dropbox.py | 6 +----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gettor/twitter.py b/gettor/twitter.py index f4b934f..7fedffe 100644 --- a/gettor/twitter.py +++ b/gettor/twitter.py @@ -212,33 +212,31 @@ class TwitterBot(object): sender_id = dm['sender']['id_str'] msg = dm['text'].strip().lower() - bogus_request = False - request = None + bogus_req = False + req = None status = '' try: if self._is_blacklisted(str(sender_id)): self.log.info('blacklist; none; none') - bogus_request = True + bogus_req = True - if not bogus_request: + if not bogus_req: self.log.debug("Request seems legit, let's parse it") # let's try to guess what the user is asking - request = self.parse_text(str(msg)) + req = self.parse_text(str(msg)) # possible options: links, mirrors, help - if request['type'] == 'links': + if req['type'] == 'links': self.log.info('links; %s; %s' % (req['os'], req['lc'])) links = self.core.get_links( - 'Twitter', - request['os'], - request['lc'] + 'twitter', req['os'], req['lc'] ) reply = self._get_msg('links', 'en') - reply = reply % (request['os'], request['lc'], links) + reply = reply % (req['os'], req['lc'], links) - elif request['type'] == 'mirrors': + elif req['type'] == 'mirrors': self.log.info('mirrors; none; %s' % req['lc']) reply = self._get_msg('mirrors', 'en') try: diff --git a/upload/bundles2dropbox.py b/upload/bundles2dropbox.py index 40157bc..04e86af 100644 --- a/upload/bundles2dropbox.py +++ b/upload/bundles2dropbox.py @@ -140,11 +140,7 @@ if __name__ == '__main__': elif p3.match(file): osys, arch, lc = get_bundle_info(file, 'osx') - link = "Tor Browser %s-bit:\n%s$Tor Browser's signature %s-bit:"\ - "\n%s$SHA256 checksum of Tor Browser %s-bit (advanced):"\ - "\n%s$" %\ - (arch, link_file[u'url'], arch, link_asc[u'url'], - arch, sha_file) + link = "%s$%s$%s$" % (link_file[u'url'], link_asc[u'url'], sha_file) # note that you should only upload bundles for supported locales core.add_link('Dropbox', osys, lc, link)

1 0

[gettor/master] Prune stale releases
by ilv＠torproject.org 15 Feb '16

15 Feb '16

commit bfbc97fd3b9576fdc77cf7eeb5af9de18b84100d Author: aagbsn <aagbsn(a)extc.org> Date: Fri Feb 5 15:14:12 2016 +0000 Prune stale releases --- upload/latest/TorBrowser-4.0.3-osx32_en.dmg | 1 - upload/latest/TorBrowser-4.0.3-osx32_en.dmg.asc | 1 - upload/latest/sha256sums.txt | 1 - upload/latest/tor-browser-linux32-4.0.3_en.tar.xz | 1 - .../latest/tor-browser-linux32-4.0.3_en.tar.xz.asc | 1 - upload/latest/tor-browser-linux64-4.0.3_en.tar.xz | 1 - .../latest/tor-browser-linux64-4.0.3_en.tar.xz.asc | 1 - upload/latest/torbrowser-install-4.0.3_ar.exe | 1 - upload/latest/torbrowser-install-4.0.3_ar.exe.asc | 1 - upload/tor-browser-linux32-4.0.2_en-US.tar.xz | Bin 42866036 -> 0 bytes 10 files changed, 9 deletions(-) diff --git a/upload/latest/TorBrowser-4.0.3-osx32_en.dmg b/upload/latest/TorBrowser-4.0.3-osx32_en.dmg deleted file mode 100644 index d788456..0000000 --- a/upload/latest/TorBrowser-4.0.3-osx32_en.dmg +++ /dev/null @@ -1 +0,0 @@ -dummy dmg file diff --git a/upload/latest/TorBrowser-4.0.3-osx32_en.dmg.asc b/upload/latest/TorBrowser-4.0.3-osx32_en.dmg.asc deleted file mode 100644 index 5e00057..0000000 --- a/upload/latest/TorBrowser-4.0.3-osx32_en.dmg.asc +++ /dev/null @@ -1 +0,0 @@ -dummy dmg asc file diff --git a/upload/latest/sha256sums.txt b/upload/latest/sha256sums.txt deleted file mode 100644 index 2212b05..0000000 --- a/upload/latest/sha256sums.txt +++ /dev/null @@ -1 +0,0 @@ -dummy sha256 file diff --git a/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz b/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz deleted file mode 100644 index 90272b5..0000000 --- a/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz file diff --git a/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz.asc b/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz.asc deleted file mode 100644 index 3dd3325..0000000 --- a/upload/latest/tor-browser-linux32-4.0.3_en.tar.xz.asc +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz asc file diff --git a/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz b/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz deleted file mode 100644 index 90272b5..0000000 --- a/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz file diff --git a/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz.asc b/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz.asc deleted file mode 100644 index 3dd3325..0000000 --- a/upload/latest/tor-browser-linux64-4.0.3_en.tar.xz.asc +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz asc file diff --git a/upload/latest/torbrowser-install-4.0.3_ar.exe b/upload/latest/torbrowser-install-4.0.3_ar.exe deleted file mode 100644 index 7e61f6d..0000000 --- a/upload/latest/torbrowser-install-4.0.3_ar.exe +++ /dev/null @@ -1 +0,0 @@ -dummy exe file diff --git a/upload/latest/torbrowser-install-4.0.3_ar.exe.asc b/upload/latest/torbrowser-install-4.0.3_ar.exe.asc deleted file mode 100644 index 1ebde25..0000000 --- a/upload/latest/torbrowser-install-4.0.3_ar.exe.asc +++ /dev/null @@ -1 +0,0 @@ -dummy exe asc file diff --git a/upload/tor-browser-linux32-4.0.2_en-US.tar.xz b/upload/tor-browser-linux32-4.0.2_en-US.tar.xz deleted file mode 100644 index b26e26b..0000000 Binary files a/upload/tor-browser-linux32-4.0.2_en-US.tar.xz and /dev/null differ

1 0

[gettor/master] Deduplicate utility methods
by ilv＠torproject.org 15 Feb '16

15 Feb '16

commit 8a99835cfea2d3b594bf3951b8970c5e2117de77 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Feb 5 18:53:36 2016 +0000 Deduplicate utility methods move get_bundle_info, get_file_sha256, valid_format to gettor/utils.py --- gettor/utils.py | 92 ++++++++++++++++++++++++++++++++++++++++++++++ upload/bundles2drive.py | 93 +---------------------------------------------- upload/bundles2dropbox.py | 92 +--------------------------------------------- upload/bundles2github.py | 56 +--------------------------- 4 files changed, 95 insertions(+), 238 deletions(-) diff --git a/gettor/utils.py b/gettor/utils.py index 3f69e08..c684097 100644 --- a/gettor/utils.py +++ b/gettor/utils.py @@ -47,3 +47,95 @@ def get_sha256(string): """ return str(hashlib.sha256(string).hexdigest()) + + +def get_bundle_info(file, osys): + """Get the os, arch and lc from a bundle string. + + :param: file (string) the name of the file. + :param: osys (string) the OS. + + :raise: ValueError if the bundle doesn't have a valid bundle format. + + :return: (list) the os, arch and lc. + + """ + if(osys == 'windows'): + m = re.search( + 'torbrowser-install-\d\.\d\.\d_(\w\w)(-\w\w)?\.exe', + file) + if m: + lc = m.group(1) + return 'windows', '32/64', lc + else: + raise ValueError("Invalid bundle format %s" % file) + elif(osys == 'linux'): + m = re.search( + 'tor-browser-linux(\d\d)-\d\.\d\.\d_(\w\w)(-\w\w)?\.tar\.xz', + file) + if m: + arch = m.group(1) + lc = m.group(2) + return 'linux', arch, lc + else: + raise ValueError("Invalid bundle format %s" % file) + elif(osys == 'osx'): + m = re.search( + 'TorBrowser-\d\.\d\.\d-osx(\d\d)_(\w\w)(-\w\w)?\.dmg', + file) + if m: + os = 'osx' + arch = m.group(1) + lc = m.group(2) + return 'osx', arch, lc + else: + raise ValueError("Invalid bundle format %s" % file) + + +def valid_format(file, osys): + """Check for valid bundle format + + Check if the given file has a valid bundle format + (e.g. tor-browser-linux32-3.6.2_es-ES.tar.xz) + + :param: file (string) the name of the file. + :param: osys (string) the OS. + + :return: (boolean) true if the bundle format is valid, false otherwise. + + """ + if(osys == 'windows'): + m = re.search( + 'torbrowser-install-\d\.\d\.\d_\w\w(-\w\w)?\.exe', + file) + elif(osys == 'linux'): + m = re.search( + 'tor-browser-linux\d\d-\d\.\d\.\d_(\w\w)(-\w\w)?\.tar\.xz', + file) + elif(osys == 'osx'): + m = re.search( + 'TorBrowser-\d\.\d\.\d-osx\d\d_(\w\w)(-\w\w)?\.dmg', + file) + if m: + return True + else: + return False + + +def get_file_sha256(file): + """Get the sha256 of a file. + + :param: file (string) the path of the file. + + :return: (string) the sha256 hash. + + """ + # as seen on the internetz + BLOCKSIZE = 65536 + hasher = hashlib.sha256() + with open(file, 'rb') as afile: + buf = afile.read(BLOCKSIZE) + while len(buf) > 0: + hasher.update(buf) + buf = afile.read(BLOCKSIZE) + return hasher.hexdigest() diff --git a/upload/bundles2drive.py b/upload/bundles2drive.py index bac6fea..e6ad04b 100644 --- a/upload/bundles2drive.py +++ b/upload/bundles2drive.py @@ -20,6 +20,7 @@ import logging import argparse import ConfigParser import gettor.core +from gettor.utils import get_bundle_info, get_file_sha256, valid_format # import google drive libs import httplib2 @@ -31,98 +32,6 @@ from oauth2client.client import OAuth2WebServerFlow from oauth2client.client import Credentials -def valid_format(file, osys): - """Check for valid bundle format - - Check if the given file has a valid bundle format - (e.g. tor-browser-linux32-3.6.2_es-ES.tar.xz) - - :param: file (string) the name of the file. - :param: osys (string) the OS. - - :return: (boolean) true if the bundle format is valid, false otherwise. - - """ - if(osys == 'windows'): - m = re.search( - 'torbrowser-install-\d\.\d\.?\d?_\w\w(-\w\w)?\.exe', - file) - elif(osys == 'linux'): - m = re.search( - 'tor-browser-linux\d\d-\d\.\d\.?\d?_(\w\w)(-\w\w)?\.tar\.xz', - file) - elif(osys == 'osx'): - m = re.search( - 'TorBrowser-\d\.\d\.?\d?-osx\d\d_(\w\w)(-\w\w)?\.dmg', - file) - if m: - return True - else: - return False - - -def get_bundle_info(file, osys): - """Get the os, arch and lc from a bundle string. - - :param: file (string) the name of the file. - :param: osys (string) the OS. - - :raise: ValueError if the bundle doesn't have a valid bundle format. - - :return: (list) the os, arch and lc. - - """ - if(osys == 'windows'): - m = re.search( - 'torbrowser-install-\d\.\d\.?\d?_(\w\w)(-\w\w)?\.exe', - file) - if m: - lc = m.group(1) - return 'windows', '32/64', lc - else: - raise ValueError("Invalid bundle format %s" % file) - elif(osys == 'linux'): - m = re.search( - 'tor-browser-linux(\d\d)-\d\.\d\.?\d?_(\w\w)(-\w\w)?\.tar\.xz', - file) - if m: - arch = m.group(1) - lc = m.group(2) - return 'linux', arch, lc - else: - raise ValueError("Invalid bundle format %s" % file) - elif(osys == 'osx'): - m = re.search( - 'TorBrowser-\d\.\d\.?\d?-osx(\d\d)_(\w\w)(-\w\w)?\.dmg', - file) - if m: - os = 'osx' - arch = m.group(1) - lc = m.group(2) - return 'osx', arch, lc - else: - raise ValueError("Invalid bundle format %s" % file) - - -def get_file_sha256(file): - """Get the sha256 of a file. - - :param: file (string) the path of the file. - - :return: (string) the sha256 hash. - - """ - # as seen on the internetz - BLOCKSIZE = 65536 - hasher = hashlib.sha256() - with open(file, 'rb') as afile: - buf = afile.read(BLOCKSIZE) - while len(buf) > 0: - hasher.update(buf) - buf = afile.read(BLOCKSIZE) - return hasher.hexdigest() - - def upload_files(client, basedir): """Upload files to Google Drive. diff --git a/upload/bundles2dropbox.py b/upload/bundles2dropbox.py index bedeec0..9007410 100644 --- a/upload/bundles2dropbox.py +++ b/upload/bundles2dropbox.py @@ -18,97 +18,7 @@ import ConfigParser import dropbox import gettor.core - -def valid_format(file, osys): - """Check for valid bundle format - - Check if the given file has a valid bundle format - (e.g. tor-browser-linux32-3.6.2_es-ES.tar.xz) - - :param: file (string) the name of the file. - :param: osys (string) the OS. - - :return: (boolean) true if the bundle format is valid, false otherwise. - - """ - if(osys == 'windows'): - m = re.search( - 'torbrowser-install-\d\.\d\.\d_\w\w(-\w\w)?\.exe', - file) - elif(osys == 'linux'): - m = re.search( - 'tor-browser-linux\d\d-\d\.\d\.\d_(\w\w)(-\w\w)?\.tar\.xz', - file) - elif(osys == 'osx'): - m = re.search( - 'TorBrowser-\d\.\d\.\d-osx\d\d_(\w\w)(-\w\w)?\.dmg', - file) - if m: - return True - else: - return False - - -def get_bundle_info(file, osys): - """Get the os, arch and lc from a bundle string. - - :param: file (string) the name of the file. - :param: osys (string) the OS. - - :raise: ValueError if the bundle doesn't have a valid bundle format. - - :return: (list) the os, arch and lc. - - """ - if(osys == 'windows'): - m = re.search( - 'torbrowser-install-\d\.\d\.\d_(\w\w)(-\w\w)?\.exe', - file) - if m: - lc = m.group(1) - return 'windows', '32/64', lc - else: - raise ValueError("Invalid bundle format %s" % file) - elif(osys == 'linux'): - m = re.search( - 'tor-browser-linux(\d\d)-\d\.\d\.\d_(\w\w)(-\w\w)?\.tar\.xz', - file) - if m: - arch = m.group(1) - lc = m.group(2) - return 'linux', arch, lc - else: - raise ValueError("Invalid bundle format %s" % file) - elif(osys == 'osx'): - m = re.search( - 'TorBrowser-\d\.\d\.\d-osx(\d\d)_(\w\w)(-\w\w)?\.dmg', - file) - if m: - os = 'osx' - arch = m.group(1) - lc = m.group(2) - return 'osx', arch, lc - else: - raise ValueError("Invalid bundle format %s" % file) - - -def get_file_sha256(file): - """Get the sha256 of a file. - - :param: file (string) the path of the file. - - :return: (string) the sha256 hash. - - """ - # as seen on the internetz - BLOCKSIZE = 65536 - hasher = hashlib.sha256() - with open(file, 'rb') as afile: - buf = afile.read(BLOCKSIZE) - while len(buf) > 0: - hasher.update(buf) - buf = afile.read(BLOCKSIZE) - return hasher.hexdigest() +from gettor.utils import get_bundle_info, get_file_sha256, valid_format def upload_files(basedir, client): diff --git a/upload/bundles2github.py b/upload/bundles2github.py index ee24edb..a5beea5 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -23,63 +23,9 @@ import argparse from libsaas.services import github import gnupg import gettor.core +from gettor.utils import get_bundle_info, get_file_sha256 -def get_file_sha256(file): - """Get the sha256 of a file. - - :param: file (string) the path of the file. - - :return: (string) the sha256 hash. - - """ - # as seen on the internetz - BLOCKSIZE = 65536 - hasher = hashlib.sha256() - with open(file, 'rb') as afile: - buf = afile.read(BLOCKSIZE) - while len(buf) > 0: - hasher.update(buf) - buf = afile.read(BLOCKSIZE) - return hasher.hexdigest() - - -def get_bundle_info(file, osys): - """Get the os, arch and lc from a bundle string. - - :param: file (string) the name of the file. - :param: osys (string) the OS. - - :raise: ValueError if the bundle doesn't have a valid bundle format. - - :return: (list) the os, arch and lc. - - """ - if(osys == 'windows'): - m = re.search( - 'torbrowser-install-\d\.\d\.\d_(\w\w)(-\w\w)?\.exe', - file) - if m: - lc = m.group(1) - return 'windows', '32/64', lc - elif(osys == 'linux'): - m = re.search( - 'tor-browser-linux(\d\d)-\d\.\d\.\d_(\w\w)(-\w\w)?\.tar\.xz', - file) - if m: - arch = m.group(1) - lc = m.group(2) - return 'linux', arch, lc - elif(osys == 'osx'): - m = re.search( - 'TorBrowser-\d\.\d\.\d-osx(\d\d)_(\w\w)(-\w\w)?\.dmg', - file) - if m: - os = 'osx' - arch = m.group(1) - lc = m.group(2) - return 'osx', arch, lc - if __name__ == '__main__': parser = argparse.ArgumentParser( description='Utility to upload Tor Browser to Github.'

1 0