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

[tor-browser/tor-browser-78.10.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 02 Jun '21

02 Jun '21

commit 0499b287862ad8f69c3fd4363366a149849b3ca5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 2 13:54:53 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index c7bc9373bd54..cc73f75d99e5 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit c7bc9373bd54d9f1d4dafa26a8180ed4b26737a1 +Subproject commit cc73f75d99e5bd1b610e4a96e89b895ced72407b

1 0

[snowflake/main] Encode client-broker messages as json in HTTP body
by cohosh＠torproject.org 02 Jun '21

02 Jun '21

commit 270eb218037ca78c5a09d8e8cae9187a22cee122 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed May 5 15:31:39 2021 -0400 Encode client-broker messages as json in HTTP body Send the client poll request and response in a json-encoded format in the HTTP request body rather than sending the data in HTTP headers. This will pave the way for using domain-fronting alternatives for the Snowflake rendezvous. --- broker/broker.go | 122 ++++++++++++++++--- broker/snowflake-broker_test.go | 130 ++++++++++++++++++--- broker/snowflake-heap.go | 2 +- client/lib/lib_test.go | 22 +--- client/lib/rendezvous.go | 36 ++++-- common/messages/client.go | 107 +++++++++++++++++ .../messages/{proxy_test.go => messages_test.go} | 116 ++++++++++++++++++ 7 files changed, 472 insertions(+), 63 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 8c1159e..906c210 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -6,6 +6,7 @@ SessionDescriptions in order to negotiate a WebRTC connection. package main import ( + "bytes" "container/heap" "crypto/tls" "flag" @@ -39,6 +40,16 @@ const ( NATUnrestricted = "unrestricted" ) +// We support two client message formats. The legacy format is for backwards +// combatability and relies heavily on HTTP headers and status codes to convey +// information. +type clientVersion int + +const ( + v0 clientVersion = iota //legacy version + v1 +) + type BrokerContext struct { snowflakes *SnowflakeHeap restrictedSnowflakes *SnowflakeHeap @@ -90,7 +101,7 @@ type MetricsHandler struct { func (sh SnowflakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Origin", "*") - w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Session-ID, Snowflake-NAT-Type") + w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Session-ID") // Return early if it's CORS preflight. if "OPTIONS" == r.Method { return @@ -170,7 +181,7 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType stri snowflake.proxyType = proxyType snowflake.natType = natType snowflake.offerChannel = make(chan *ClientOffer) - snowflake.answerChannel = make(chan []byte) + snowflake.answerChannel = make(chan string) ctx.snowflakeLock.Lock() if natType == NATUnrestricted { heap.Push(ctx.snowflakes, snowflake) @@ -245,6 +256,20 @@ type ClientOffer struct { sdp []byte } +// Sends an encoded response to the client and an +// HTTP server error if the response encoding fails +func sendClientResponse(resp *messages.ClientPollResponse, w http.ResponseWriter) { + data, err := resp.EncodePollResponse() + if err != nil { + log.Printf("error encoding answer") + w.WriteHeader(http.StatusInternalServerError) + } else { + if _, err := w.Write([]byte(data)); err != nil { + log.Printf("unable to write answer with error: %v", err) + } + } +} + /* Expects a WebRTC SDP offer in the Request to give to an assigned snowflake proxy, which responds with the SDP answer to be sent in @@ -252,19 +277,55 @@ the HTTP response back to the client. */ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { var err error + var version clientVersion startTime := time.Now() - offer := &ClientOffer{} - offer.sdp, err = ioutil.ReadAll(http.MaxBytesReader(w, r.Body, readLimit)) - if nil != err { - log.Println("Invalid data.") - w.WriteHeader(http.StatusBadRequest) + body, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, readLimit)) + if err != nil { + log.Printf("Error reading client request: %s", err.Error()) + w.WriteHeader(http.StatusInternalServerError) return } + if len(body) > 0 && body[0] == '{' { + version = v0 + } else { + parts := bytes.SplitN(body, []byte("\n"), 2) + if len(parts) < 2 { + // no version number found + err := fmt.Errorf("unsupported message version") + sendClientResponse(&messages.ClientPollResponse{Error: err.Error()}, w) + return + } + body = parts[1] + if string(parts[0]) == "1.0" { + version = v1 + + } else { + err := fmt.Errorf("unsupported message version") + sendClientResponse(&messages.ClientPollResponse{Error: err.Error()}, w) + return + } + } - offer.natType = r.Header.Get("Snowflake-NAT-Type") - if offer.natType == "" { - offer.natType = NATUnknown + var offer *ClientOffer + switch version { + case v0: + offer = &ClientOffer{ + natType: r.Header.Get("Snowflake-NAT-Type"), + sdp: body, + } + case v1: + req, err := messages.DecodeClientPollRequest(body) + if err != nil { + sendClientResponse(&messages.ClientPollResponse{Error: err.Error()}, w) + return + } + offer = &ClientOffer{ + natType: req.NAT, + sdp: []byte(req.Offer), + } + default: + panic("unknown version") } // Only hand out known restricted snowflakes to unrestricted clients @@ -289,7 +350,15 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { ctx.metrics.clientRestrictedDeniedCount++ } ctx.metrics.lock.Unlock() - w.WriteHeader(http.StatusServiceUnavailable) + switch version { + case v0: + w.WriteHeader(http.StatusServiceUnavailable) + case v1: + resp := &messages.ClientPollResponse{Error: "no snowflake proxies currently available"} + sendClientResponse(resp, w) + default: + panic("unknown version") + } return } // Otherwise, find the most available snowflake proxy, and pass the offer to it. @@ -306,17 +375,36 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { ctx.metrics.clientProxyMatchCount++ ctx.metrics.promMetrics.ClientPollTotal.With(prometheus.Labels{"nat": offer.natType, "status": "matched"}).Inc() ctx.metrics.lock.Unlock() - if _, err := w.Write(answer); err != nil { - log.Printf("unable to write answer with error: %v", err) + switch version { + case v0: + if _, err := w.Write([]byte(answer)); err != nil { + log.Printf("unable to write answer with error: %v", err) + } + case v1: + resp := &messages.ClientPollResponse{Answer: answer} + sendClientResponse(resp, w) + default: + panic("unknown version") } // Initial tracking of elapsed time. ctx.metrics.clientRoundtripEstimate = time.Since(startTime) / time.Millisecond case <-time.After(time.Second * ClientTimeout): log.Println("Client: Timed out.") - w.WriteHeader(http.StatusGatewayTimeout) - if _, err := w.Write([]byte("timed out waiting for answer!")); err != nil { - log.Printf("unable to write timeout error, failed with error: %v", err) + switch version { + case v0: + w.WriteHeader(http.StatusGatewayTimeout) + if _, err := w.Write( + []byte("timed out waiting for answer!")); err != nil { + log.Printf("unable to write timeout error, failed with error: %v", + err) + } + case v1: + resp := &messages.ClientPollResponse{ + Error: "timed out waiting for answer!"} + sendClientResponse(resp, w) + default: + panic("unknown version") } } @@ -364,7 +452,7 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.Write(b) if success { - snowflake.answerChannel <- []byte(answer) + snowflake.answerChannel <- answer } } diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index b676b04..646fb02 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -70,10 +70,59 @@ func TestBroker(t *testing.T) { Convey("Responds to client offers...", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unknown\"}")) r, err := http.NewRequest("POST", "snowflake.broker/client", data) So(err, ShouldBeNil) + Convey("with error when no snowflakes are available.", func() { + clientOffers(ctx, w, r) + So(w.Code, ShouldEqual, http.StatusOK) + So(w.Body.String(), ShouldEqual, `{"error":"no snowflake proxies currently available"}`) + }) + + Convey("with a proxy answer if available.", func() { + done := make(chan bool) + // Prepare a fake proxy to respond with. + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + go func() { + clientOffers(ctx, w, r) + done <- true + }() + offer := <-snowflake.offerChannel + So(offer.sdp, ShouldResemble, []byte("fake")) + snowflake.answerChannel <- "fake answer" + <-done + So(w.Body.String(), ShouldEqual, `{"answer":"fake answer"}`) + So(w.Code, ShouldEqual, http.StatusOK) + }) + + Convey("Times out when no proxy responds.", func() { + if testing.Short() { + return + } + done := make(chan bool) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + go func() { + clientOffers(ctx, w, r) + // Takes a few seconds here... + done <- true + }() + offer := <-snowflake.offerChannel + So(offer.sdp, ShouldResemble, []byte("fake")) + <-done + So(w.Code, ShouldEqual, http.StatusOK) + So(w.Body.String(), ShouldEqual, `{"error":"timed out waiting for answer!"}`) + }) + }) + + Convey("Responds to legacy client offers...", func() { + w := httptest.NewRecorder() + data := bytes.NewReader([]byte("{test}")) + r, err := http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) + r.Header.Set("Snowflake-NAT-TYPE", "restricted") + Convey("with 503 when no snowflakes are available.", func() { clientOffers(ctx, w, r) So(w.Code, ShouldEqual, http.StatusServiceUnavailable) @@ -89,8 +138,8 @@ func TestBroker(t *testing.T) { done <- true }() offer := <-snowflake.offerChannel - So(offer.sdp, ShouldResemble, []byte("test")) - snowflake.answerChannel <- []byte("fake answer") + So(offer.sdp, ShouldResemble, []byte("{test}")) + snowflake.answerChannel <- "fake answer" <-done So(w.Body.String(), ShouldEqual, "fake answer") So(w.Code, ShouldEqual, http.StatusOK) @@ -108,10 +157,11 @@ func TestBroker(t *testing.T) { done <- true }() offer := <-snowflake.offerChannel - So(offer.sdp, ShouldResemble, []byte("test")) + So(offer.sdp, ShouldResemble, []byte("{test}")) <-done So(w.Code, ShouldEqual, http.StatusGatewayTimeout) }) + }) Convey("Responds to proxy polls...", func() { @@ -163,7 +213,7 @@ func TestBroker(t *testing.T) { }(ctx) answer := <-s.answerChannel So(w.Code, ShouldEqual, http.StatusOK) - So(answer, ShouldResemble, []byte("test")) + So(answer, ShouldResemble, "test") }) Convey("with client gone status if the proxy is not recognized", func() { @@ -272,7 +322,8 @@ func TestBroker(t *testing.T) { So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], ShouldNotBeNil) // Client request blocks until proxy answer arrives. - dataC := bytes.NewReader([]byte("fake offer")) + dataC := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unknown\"}")) wC := httptest.NewRecorder() rC, err := http.NewRequest("POST", "snowflake.broker/client", dataC) So(err, ShouldBeNil) @@ -283,7 +334,7 @@ func TestBroker(t *testing.T) { <-polled So(wP.Code, ShouldEqual, http.StatusOK) - So(wP.Body.String(), ShouldResemble, `{"Status":"client match","Offer":"fake offer","NAT":"unknown"}`) + So(wP.Body.String(), ShouldResemble, `{"Status":"client match","Offer":"fake","NAT":"unknown"}`) So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], ShouldNotBeNil) // Follow up with the answer request afterwards wA := httptest.NewRecorder() @@ -295,7 +346,7 @@ func TestBroker(t *testing.T) { <-done So(wC.Code, ShouldEqual, http.StatusOK) - So(wC.Body.String(), ShouldEqual, "test") + So(wC.Body.String(), ShouldEqual, `{"answer":"test"}`) }) }) } @@ -517,7 +568,8 @@ func TestMetrics(t *testing.T) { //Test addition of client failures Convey("for no proxies available", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unknown\"}")) r, err := http.NewRequest("POST", "snowflake.broker/client", data) So(err, ShouldBeNil) @@ -535,7 +587,8 @@ func TestMetrics(t *testing.T) { //Test addition of client matches Convey("for client-proxy match", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unknown\"}")) r, err := http.NewRequest("POST", "snowflake.broker/client", data) So(err, ShouldBeNil) @@ -546,8 +599,8 @@ func TestMetrics(t *testing.T) { done <- true }() offer := <-snowflake.offerChannel - So(offer.sdp, ShouldResemble, []byte("test")) - snowflake.answerChannel <- []byte("fake answer") + So(offer.sdp, ShouldResemble, []byte("fake")) + snowflake.answerChannel <- "fake answer" <-done ctx.metrics.printMetrics() @@ -556,22 +609,63 @@ func TestMetrics(t *testing.T) { //Test rounding boundary Convey("binning boundary", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) r, err := http.NewRequest("POST", "snowflake.broker/client", data) So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) ctx.metrics.printMetrics() So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 8\nclient-unrestricted-denied-count 0\n") + w = httptest.NewRecorder() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + So(err, ShouldBeNil) clientOffers(ctx, w, r) buf.Reset() ctx.metrics.printMetrics() @@ -648,9 +742,9 @@ func TestMetrics(t *testing.T) { //Test client failures by NAT type Convey("client failures by NAT type", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"restricted\"}")) r, err := http.NewRequest("POST", "snowflake.broker/client", data) - r.Header.Set("Snowflake-NAT-TYPE", "restricted") So(err, ShouldBeNil) clientOffers(ctx, w, r) @@ -661,8 +755,9 @@ func TestMetrics(t *testing.T) { buf.Reset() ctx.metrics.zeroMetrics() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unrestricted\"}")) r, err = http.NewRequest("POST", "snowflake.broker/client", data) - r.Header.Set("Snowflake-NAT-TYPE", "unrestricted") So(err, ShouldBeNil) clientOffers(ctx, w, r) @@ -673,8 +768,9 @@ func TestMetrics(t *testing.T) { buf.Reset() ctx.metrics.zeroMetrics() + data = bytes.NewReader( + []byte("1.0\n{\"offer\": \"fake\", \"nat\": \"unknown\"}")) r, err = http.NewRequest("POST", "snowflake.broker/client", data) - r.Header.Set("Snowflake-NAT-TYPE", "unknown") So(err, ShouldBeNil) clientOffers(ctx, w, r) diff --git a/broker/snowflake-heap.go b/broker/snowflake-heap.go index 16dd264..80c1f57 100644 --- a/broker/snowflake-heap.go +++ b/broker/snowflake-heap.go @@ -13,7 +13,7 @@ type Snowflake struct { proxyType string natType string offerChannel chan *ClientOffer - answerChannel chan []byte + answerChannel chan string clients int index int } diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 6140e0b..e742e06 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -176,7 +176,7 @@ func TestSnowflakeClient(t *testing.T) { Convey("Rendezvous", t, func() { transport := &MockTransport{ http.StatusOK, - []byte(`{"type":"answer","sdp":"fake"}`), + []byte(`{"answer": "{\"type\":\"answer\",\"sdp\":\"fake\"}" }`), } fakeOffer, err := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`) if err != nil { @@ -209,26 +209,25 @@ func TestSnowflakeClient(t *testing.T) { So(answer.SDP, ShouldResemble, "fake") }) - Convey("BrokerChannel.Negotiate fails with 503", func() { + Convey("BrokerChannel.Negotiate fails", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusServiceUnavailable, []byte("\n")}, + &MockTransport{http.StatusOK, []byte(`{"error": "no snowflake proxies currently available"}`)}, false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) So(answer, ShouldBeNil) - So(err.Error(), ShouldResemble, BrokerError503) }) - Convey("BrokerChannel.Negotiate fails with 400", func() { + Convey("BrokerChannel.Negotiate fails with unexpected error", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusBadRequest, []byte("\n")}, + &MockTransport{http.StatusInternalServerError, []byte("\n")}, false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) So(answer, ShouldBeNil) - So(err.Error(), ShouldResemble, BrokerError400) + So(err.Error(), ShouldResemble, BrokerErrorUnexpected) }) Convey("BrokerChannel.Negotiate fails with large read", func() { @@ -242,15 +241,6 @@ func TestSnowflakeClient(t *testing.T) { So(err.Error(), ShouldResemble, "unexpected EOF") }) - Convey("BrokerChannel.Negotiate fails with unexpected error", func() { - b, err := NewBrokerChannel("test.broker", "", - &MockTransport{123, []byte("")}, false) - So(err, ShouldBeNil) - answer, err := b.Negotiate(fakeOffer) - So(err, ShouldNotBeNil) - So(answer, ShouldBeNil) - So(err.Error(), ShouldResemble, BrokerErrorUnexpected) - }) }) } diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 32da081..b89f432 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -19,14 +19,13 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/common/nat" "git.torproject.org/pluggable-transports/snowflake.git/common/util" "github.com/pion/webrtc/v3" ) 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 ) @@ -107,7 +106,20 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if err != nil { return nil, err } - data := bytes.NewReader([]byte(offerSDP)) + + // Encode client poll request + bc.lock.Lock() + req := &messages.ClientPollRequest{ + Offer: offerSDP, + NAT: bc.NATType, + } + body, err := req.EncodePollRequest() + bc.lock.Unlock() + if err != nil { + return nil, err + } + + data := bytes.NewReader([]byte(body)) // Suffix with broker's client registration handler. clientURL := bc.url.ResolveReference(&url.URL{Path: "client"}) request, err := http.NewRequest("POST", clientURL.String(), data) @@ -117,10 +129,6 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if "" != bc.Host { // Set true host if necessary. request.Host = bc.Host } - // include NAT-TYPE - bc.lock.Lock() - request.Header.Set("Snowflake-NAT-TYPE", bc.NATType) - bc.lock.Unlock() resp, err := bc.transport.RoundTrip(request) if nil != err { return nil, err @@ -135,11 +143,15 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( return nil, err } log.Printf("Received answer: %s", string(body)) - return util.DeserializeSessionDescription(string(body)) - case http.StatusServiceUnavailable: - return nil, errors.New(BrokerError503) - case http.StatusBadRequest: - return nil, errors.New(BrokerError400) + + resp, err := messages.DecodeClientPollResponse(body) + if err != nil { + return nil, err + } + if resp.Error != "" { + return nil, errors.New(resp.Error) + } + return util.DeserializeSessionDescription(resp.Answer) default: return nil, errors.New(BrokerErrorUnexpected) } diff --git a/common/messages/client.go b/common/messages/client.go new file mode 100644 index 0000000..1918e34 --- /dev/null +++ b/common/messages/client.go @@ -0,0 +1,107 @@ +//Package for communication with the snowflake broker + +//import "git.torproject.org/pluggable-transports/snowflake.git/common/messages" +package messages + +import ( + "encoding/json" + "fmt" +) + +const ClientVersion = "1.0" + +/* Client--Broker protocol v1.x specification: + +All messages contain the version number +followed by a new line and then the message body +<message> := <version>\n<body> +<version> := <digit>.<digit> +<body> := <poll request>|<poll response> + +There are two different types of body messages, +each encoded in JSON format + +== ClientPollRequest == +<poll request> := +{ + offer: <sdp offer> + [nat: (unknown|restricted|unrestricted)] +} + +The NAT field is optional, and if it is missing a +value of "unknown" will be assumed. + +== ClientPollResponse == +<poll response> := +{ + [answer: <sdp answer>] + [error: <error string>] +} + +If the broker succeeded in matching the client with a proxy, +the answer field MUST contain a valid SDP answer, and the +error field MUST be empty. If the answer field is empty, the +error field MUST contain a string explaining with a reason +for the error. + +*/ + +type ClientPollRequest struct { + Offer string `json:"offer"` + NAT string `json:"nat"` +} + +// Encodes a poll message from a snowflake client +func (req *ClientPollRequest) EncodePollRequest() ([]byte, error) { + body, err := json.Marshal(req) + if err != nil { + return nil, err + } + return append([]byte(ClientVersion+"\n"), body...), nil +} + +// Decodes a poll message from a snowflake client +func DecodeClientPollRequest(data []byte) (*ClientPollRequest, error) { + var message ClientPollRequest + + err := json.Unmarshal(data, &message) + if err != nil { + return nil, err + } + + if message.Offer == "" { + return nil, fmt.Errorf("no supplied offer") + } + + if message.NAT == "" { + message.NAT = "unknown" + } + + return &message, nil +} + +type ClientPollResponse struct { + Answer string `json:"answer,omitempty"` + Error string `json:"error,omitempty"` +} + +// Encodes a poll response for a snowflake client +func (resp *ClientPollResponse) EncodePollResponse() ([]byte, error) { + return json.Marshal(resp) +} + +// Decodes a poll response for a snowflake client +// If the Error field is empty, the Answer should be non-empty +func DecodeClientPollResponse(data []byte) (*ClientPollResponse, error) { + var message ClientPollResponse + + err := json.Unmarshal(data, &message) + if err != nil { + return nil, err + } + if message.Error == "" && message.Answer == "" { + return nil, fmt.Errorf("received empty broker response") + } + + return &message, nil +} diff --git a/common/messages/proxy_test.go b/common/messages/messages_test.go similarity index 71% rename from common/messages/proxy_test.go rename to common/messages/messages_test.go index f4191e1..3962d3b 100644 --- a/common/messages/proxy_test.go +++ b/common/messages/messages_test.go @@ -1,6 +1,7 @@ package messages import ( + "bytes" "encoding/json" "fmt" "testing" @@ -252,3 +253,118 @@ func TestEncodeProxyAnswerResponse(t *testing.T) { So(err, ShouldEqual, nil) }) } + +func TestDecodeClientPollRequest(t *testing.T) { + Convey("Context", t, func() { + for _, test := range []struct { + natType string + offer string + data string + err error + }{ + { + //version 1.0 client message + "unknown", + "fake", + `{"nat":"unknown","offer":"fake"}`, + nil, + }, + { + //version 1.0 client message + "unknown", + "fake", + `{"offer":"fake"}`, + nil, + }, + { + //unknown version + "", + "", + `{"version":"2.0"}`, + fmt.Errorf(""), + }, + { + //no offer + "", + "", + `{"nat":"unknown"}`, + fmt.Errorf(""), + }, + } { + req, err := DecodeClientPollRequest([]byte(test.data)) + if test.err == nil { + So(req.NAT, ShouldResemble, test.natType) + So(req.Offer, ShouldResemble, test.offer) + } + So(err, ShouldHaveSameTypeAs, test.err) + } + + }) +} + +func TestEncodeClientPollRequests(t *testing.T) { + Convey("Context", t, func() { + req1 := &ClientPollRequest{ + NAT: "unknown", + Offer: "fake", + } + b, err := req1.EncodePollRequest() + So(err, ShouldEqual, nil) + fmt.Println(string(b)) + parts := bytes.SplitN(b, []byte("\n"), 2) + So(string(parts[0]), ShouldEqual, "1.0") + b = parts[1] + req2, err := DecodeClientPollRequest(b) + So(err, ShouldEqual, nil) + So(req2, ShouldResemble, req1) + }) +} + +func TestDecodeClientPollResponse(t *testing.T) { + Convey("Context", t, func() { + for _, test := range []struct { + answer string + msg string + data string + }{ + { + "fake answer", + "", + `{"answer":"fake answer"}`, + }, + { + "", + "no snowflakes", + `{"error":"no snowflakes"}`, + }, + } { + resp, err := DecodeClientPollResponse([]byte(test.data)) + So(err, ShouldBeNil) + So(resp.Answer, ShouldResemble, test.answer) + So(resp.Error, ShouldResemble, test.msg) + } + + }) +} + +func TestEncodeClientPollResponse(t *testing.T) { + Convey("Context", t, func() { + resp1 := &ClientPollResponse{ + Answer: "fake answer", + } + b, err := resp1.EncodePollResponse() + So(err, ShouldEqual, nil) + resp2, err := DecodeClientPollResponse(b) + So(err, ShouldEqual, nil) + So(resp1, ShouldResemble, resp2) + + resp1 = &ClientPollResponse{ + Error: "failed", + } + b, err = resp1.EncodePollResponse() + So(err, ShouldEqual, nil) + resp2, err = DecodeClientPollResponse(b) + So(err, ShouldEqual, nil) + So(resp1, ShouldResemble, resp2) + }) +}

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 02 Jun '21

02 Jun '21

commit 0d2c7440c26351aadd702be9e5a4dcbd329545f3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 2 13:46:30 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he.po b/he.po index c697831093..7dc4a30f6a 100644 --- a/he.po +++ b/he.po @@ -11,8 +11,8 @@ # ION, 2017-2020 # Johnny Diralenzo, 2015 # Kunda, 2014 -# Omer I.S. <omeritzicschwartz(a)gmail.com>, 2020-2021 -# Omer I.S. <omeritzicschwartz(a)gmail.com>, 2020 +# Omeritzics Games <omeritzicschwartz(a)gmail.com>, 2020-2021 +# Omeritzics Games <omeritzicschwartz(a)gmail.com>, 2020 # Ruben <drarbib(a)gmail.com>, 2014 msgid "" msgstr ""

1 0

[tor-browser-build/master] Bug 40290: Update components for mozilla89-based Fenix (android-components part)
by sysrqb＠torproject.org 02 Jun '21

02 Jun '21

commit 71e4177fb63217d26572d23871b6cbebf367fe4d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 13 10:41:37 2021 +0200 Bug 40290: Update components for mozilla89-based Fenix (android-components part) --- projects/android-components/config | 10 +++++----- projects/android-components/gradle-dependencies-list.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 1f98428..0d8d88c 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 74.0.13 + android_components_version: 75.0.22 torbrowser_branch: 10.5 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 24 + gradle_dependencies_version: 25 gradle_version: 6.6.1 glean_parser: 2.2.0 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' @@ -58,9 +58,9 @@ input_files: steps: list_toolchain_updates: - git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: v75.0.11 - tag_gpg_id: 0 + #git_url: https://github.com/mozilla-mobile/android-components.git + #git_hash: v75.0.22 + #tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index b9d721e..0623a4d 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -49,7 +49,6 @@ a67c52c9ddfaff2ffb2fd4b97cd94fa382e837ea8a5874d029e0a04fa63e5caf | https://dl.go 78309600ba6fe4473c045976906649b25b3c9a49b14642f8a8a7dcd9e1afe7c8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… 384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0… -76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… dae46132cdcd46b798425f7cb78fd65890869b6d26101ccdcd43461a4f51754c | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… 1c6b6626f15185d8f4bc7caac759412a1ab6e851ecf7526387d9b9fadcabdb63 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… 3ea5d60db139d9fbc5c5f7ac06d779fb75dafe71b0931bc9db863231294bc2d5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… @@ -159,6 +158,8 @@ c3a321133e616b46cf5ad07191aeebf4affdb73abee455851d39f7b4db7acb36 | https://dl.go 8831c06417fab6a9690c25f6e4b347b2e8c03cf6d47337be9c57e75b7fb23e6a | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… f0d2b5a67d0a91ee1b1c73ef2b636a81f3563925ddd15a1d4e1c41ec28de7a4f | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… fe321062a6e4e168b9c2b39a1137564c8784a2e5849402729768d5d7c4d972ef | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… +f68c432db998efac90b9e7f41c1510f097b82220766524d45d04f9b64c6e4d87 | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… +8b3980162e37ea8bd61207e0ba2e74b7c28b4eecd142bb5021d3e4ac27607eaf | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… 2b130dd4a1d3d91b6701ed33096d389f01c4fc1197a7acd6b91724ddc5acfc06 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… b504b252dc8b15a0e8255d4c355363675b0d79aa40b4ccbb5ea58fabb184df81 | https://dl.google.com/dl/android/maven2/androidx/room/room-compiler/2.2.5/r… @@ -344,7 +345,6 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go 24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measur… d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… -e953cbf59b797ceb11ce312e8da19bb8afc013ef548d8946711c116bc2500482 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.30/linux/k… 6d600e6f04708c1393db6a3fb57ee273068fd8e7f95dcc32c184e3c2bb767599 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… ca74e10892b729a0026257b89e953c03e77e44582d1686f65e8796d969ba16fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… 5c40c0df6784f1d6ae1748196945c3c314d626153c81fc626c9dfd9847719bfa | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… @@ -385,12 +385,12 @@ d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven 7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… 0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… -cd7d0e09420351e9e69277083b263c8f0aad75a4bac3153776caf1424efae653 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… -e1913ae393cae4186dd8603fbbf11f7b76720a216ce3132319a13d57d575f558 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… -d622b92149ed8477aca47dabe0fd53de75191a29ff4d79a0cfc718736bb4aa2a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… -8d6bc0c248af8f3d1f4f45abd4e04bf76044fbce518ca3c384ff83fe9acb38b4 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… -72a76c4fa3ae7f124803ec831cf3b9789310bf7db1d79f2f8bf32ae258981292 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210… -5f4bba20be1099c4a1f156099155fe159efcedf796130874315f02a99260bee5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210… +f505022a34ce4fb702b870ad67a9d8e034e01a1aea254639f28bb4ea4c39277f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/89.0.… +fc20b0295ed1842656fb728387a5759ce88853964e762121193662fe14d1c656 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/89.0.… +b72463d7806c54aa4e249fbd67994ad4aa4b60bd9682033f38d6f6baa1f78a7f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/90… +995e64a86fb059b9a03fb9694daf15a0cb45979e7154fc9b3fb518fcc0fae301 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/90… +c35990d69effd8de43596536f1c831a29cd6083e98308942cfb17f6b53afae44 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/89.0.20210… +d6311287b00e2ee57d45ab8d1ba54b781be78e9db36de36b3ba7360cea3314d7 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/89.0.20210… 1eb5321d64bdd07865bd8599b6b981193b54661f25bbb8e3ccdc6f8210c9ae38 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… f62de54f66aa4086100f26884927dbff06a1cbea7fb17010312d10d71cea3f01 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/…

1 0

[tor-browser-build/master] Bug 40290: Update components for mozilla89-based Fenix (GeckoView part)
by sysrqb＠torproject.org 02 Jun '21

02 Jun '21

commit a31f5f9de8511b797bd1e45e96299f60d9f0dff0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 11:11:51 2021 +0200 Bug 40290: Update components for mozilla89-based Fenix (GeckoView part) --- projects/cbindgen/config | 10 ++++++---- projects/geckoview/config | 6 +++--- projects/rust/config | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 43c2fb8..125d0e4 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -8,15 +8,17 @@ var: cbindgen_version: 0.14.1 cbindgen_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 cbindgen_vendor_hash: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc + cbindgen_vendor_people_tpo_user: gk container: use_container: 1 targets: android: var: - cbindgen_version: 0.16.0 - cbindgen_hash: a00b4215a907601680f6e9acaf93df1cbafa8ded - cbindgen_vendor_hash: f470dcf6a60374f07786491fb2971e8b96f9b7ff18956eb24c4e2577e55440d6 + cbindgen_version: 0.19.0 + cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2 + cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b + cbindgen_vendor_people_tpo_user: boklm input_files: - project: container-image @@ -25,7 +27,7 @@ input_files: # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. # Use `make cargo_vendor-cbindgen` or `make cargo_vendor-cbindgen-android` # (for the Android version) to re-generate the vendor tarball - - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + - URL: https://people.torproject.org/~[% c('var/cbindgen_vendor_people_tpo_user') %]/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 sha256sum: '[% c("var/cbindgen_vendor_hash") %]' steps: diff --git a/projects/geckoview/config b/projects/geckoview/config index a48631b..0695277 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 88.0.1 + geckoview_version: 89.0 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git + #git_url: https://github.com/mozilla/gecko-dev.git # 89.0b10 - git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/rust/config b/projects/rust/config index 0095a8a..4060488 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.50.0 - previous_version: 1.49.0 + current_version: 1.51.0 + previous_version: 1.50.0 arch_deps: - libssl-dev - pkg-config

1 0

[tor-browser-build/master] Bug 40290: Update components for mozilla89-based Fenix (fenix part)
by sysrqb＠torproject.org 02 Jun '21

02 Jun '21

1 0

[Git][tpo/applications/fenix][tor-browser-89.1.1-10.5-1] fixup! Modify UI/UX
by Matthew Finkel (＠sysrqb) 02 Jun '21

02 Jun '21

Matthew Finkel pushed to branch tor-browser-89.1.1-10.5-1 at The Tor Project / Applications / fenix Commits: f48f4d47 by Nicolas Vigier at 2021-05-31T17:34:09+02:00 fixup! Modify UI/UX - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt ===================================== @@ -133,7 +133,7 @@ class HomeMenu( ) { onItemTapped.invoke(Item.WhatsNew) } - val experiments = context.components.analytics.experiments + // val experiments = context.components.analytics.experiments val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), R.drawable.ic_bookmark_list, @@ -242,7 +242,7 @@ class HomeMenu( @Suppress("ComplexMethod") private fun newCoreMenuItems(): List<BrowserMenuItem> { - val experiments = context.components.analytics.experiments + // val experiments = context.components.analytics.experiments val settings = context.components.settings val bookmarksItem = BrowserMenuImageText( View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f48f4d47eff99… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f48f4d47eff99… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 02 Jun '21

02 Jun '21

commit 3676e904d712054a3a0a71afd8b3e81fabd87380 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 2 08:46:36 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sq.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq.po b/sq.po index 5317d18dd5..f8bad899e7 100644 --- a/sq.po +++ b/sq.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-02 08:15+0000\n" +"PO-Revision-Date: 2021-06-02 08:24+0000\n" "Last-Translator: Besnik Bleta <besnik(a)programeshqip.org>\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 02 Jun '21

02 Jun '21

commit 4a3887acff1e6f1761cc5c64f8f3a995dfe016ee Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 2 08:45:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sq.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sq.po b/sq.po index e08f58683f..b710abe07d 100644 --- a/sq.po +++ b/sq.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-02 08:15+0000\n" +"PO-Revision-Date: 2021-06-02 08:24+0000\n" "Last-Translator: Besnik Bleta <besnik(a)programeshqip.org>\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -2572,7 +2572,7 @@ msgstr "• Rrjet publik" msgid "" "If you are in a shop, hotel, or airport, you might need to sign in to the " "local network using a captive portal." -msgstr "" +msgstr "Nëse gjendeni në një dyqan, hotel, ose aeroport, mund t’ju duhet të bëni hyrjen te rrjeti vendor duke përdorur një portal “captive”." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461 msgid "Try Signing in to the Network" @@ -2586,11 +2586,11 @@ msgstr "• Ndërmjetës vendor" msgid "" "If you are on a corporate or university network, you might need to configure" " a local proxy." -msgstr "" +msgstr "Nëse gjendeni një rrjet korporate ose universiteti, mund t’ju duhet të formësoni një ndërmjetës vendor." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531 msgid "Configure a Local _Proxy" -msgstr "" +msgstr "Formësoni një _Ndërmjetës Vendor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569 msgid "• Bridges over email" @@ -2602,7 +2602,7 @@ msgid "" "\n" "1. Send an empty email to <tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" "2. Click the Configure a Bridge button to type in the bridges received by email." -msgstr "" +msgstr "Që të mësoni rreth urash të reja Tor, mundeni edhe të:\n\n1. Dërgoni një email të zbrazët te <tt>bridges(a)torproject.org</tt> që nga një adresë email Gmail ose Riseup.\n2. Të klikoni mbi butonin Formësoni një Urë që të shtypni urat e marra me email." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606 msgid "Configure a _Bridge" @@ -2636,14 +2636,14 @@ msgid "" "Tails will try different ways of connecting to Tor until it succeeds.\n" "\n" "Someone monitoring your Internet connection could identify these attempts as coming from a Tails user." -msgstr "" +msgstr "Tails-i do të provojë rrugë të ndryshme për t’u lidhur me Tor-in, deri sa t’ia dalë mbanë.\n\nDikush që vëzhgon lidhjen tuaj Internet mund t’i identifikojë këto përpjekje si të ardhura nga një përdorues i Tails-it." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:848 msgid "" "Tor bridges are secret Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in some countries, public networks, or parental controls.\n" "\n" "Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network." -msgstr "" +msgstr "Urat Tor janë rele Tor të fshehta. Përdorni një urë si relenë tuaj të parë Tor, nëse lidhja me Tor është e bllokuar, për shembull, në disa vende, në disa rrjete publike, ose nën kontrolle prindërore.\n\nZgjidheni këtë mundësi nëse e dini tashmë se ju duhen ura. Përndryshe, Tails-i do të vetëpikasë nëse ju duhen apo jo ura për t’u lidhur me Tor-in prej rrjetit tuaj vendor." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:891 msgid "Hide to my local network that I'm connecting to Tor (safer)" @@ -2662,30 +2662,30 @@ msgid "" "Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n" "\n" "You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere." -msgstr "" +msgstr "Tails-i do të lidhet me Tor-in vetëm pasi të keni formësuar ura Tor. Urat janë rele Tor të fshehta, që fshehin faktin se po lidheni me Tor-in.\n\nEkipi ynë po bën më të mirën e mundshme për t’ju ndihmuar të lidheni me Tor-in duke përdorur llojet e urave Tor që ngjallin më pak dyshime.\n\nDo t’ju duhet të bëni formësim ekstra, nëse nuk dini ende ndonjë urë Tor, nëse lidheni prej një rrjeti Wi-Fi publik, ose nëse gjendeni në Hemisferën Lindore." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1005 msgid "" "<a href=\"doc/anonymous_internet/tor\">Learn more about how Tails connects " "to Tor</a>" -msgstr "" +msgstr "<a href=\"doc/anonymous_internet/tor\">Mësoni më tepër rreth se si lidhet Tails-i me Tor-in</a>" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1091 msgid "Connect to a local network" -msgstr "" +msgstr "Lidhuni me një rrjet vendor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1108 msgid "" "You are not connected to a local network yet. To be able to connect to the " "Tor network, you first need to connect to a Wi-Fi, wire, or mobile network." -msgstr "" +msgstr "S’jeni lidhur ende në një rrjet vendor.\\n\\nPër të qenë në gjendje të lidheni me rrjetin Tor, së pari duhet të lidheni me një rrjet Wi-Fi, me fill, ose celular." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1124 msgid "" "To connect to a Wi-Fi network, open the system menu in the top-right corner " "of the screen, choose Wi-Fi Not Connected and then Select " "Network." -msgstr "" +msgstr "Që të lidheni me një rrjet Wi-Fi, hapni menunë e sistemit në cepin e djathtë sipër të ekranit, zgjidhni Wi-Fi Jo i Lidhur dhe mandej Përzgjidhni Rrjet." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1167 msgid "Testing Internet access…" @@ -2737,7 +2737,7 @@ msgstr "Rikthe Lidhjen Tor te Parazgjedhjet" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1551 msgid "Configure a Local Proxy" -msgstr "" +msgstr "Formësoni një Ndërmjetës Vendor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1577 msgid "Proxy Type" @@ -2777,4 +2777,4 @@ msgstr "Portë" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1747 msgid "_Save Proxy Settings" -msgstr "" +msgstr "_Ruaji Rregullimet e Ndërmjetësit"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 02 Jun '21

02 Jun '21

commit 06b9f9be4a4219d19ef34c4e98a132b41f35d917 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 2 08:16:50 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sq.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sq.po b/sq.po index f6c694fa2f..5317d18dd5 100644 --- a/sq.po +++ b/sq.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-01 12:30+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-06-02 08:15+0000\n" +"Last-Translator: Besnik Bleta <besnik(a)programeshqip.org>\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0