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

[dev/master] Update lego
by hiro＠torproject.org 13 Nov '19

13 Nov '19

commit 84d2b0af8cc838f469978ced9489cc0b735d632a Author: hiro <hiro(a)torproject.org> Date: Wed Nov 13 16:55:12 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 6a550fa..bbf8108 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 6a550faea39a534af47923a01bd29d138365819f +Subproject commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f

1 0

[community/master] Update lego
by hiro＠torproject.org 13 Nov '19

13 Nov '19

commit 88842f60c9a784262c2f01a63313e3cae534680f Author: hiro <hiro(a)torproject.org> Date: Wed Nov 13 16:55:05 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 6a550fa..bbf8108 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 6a550faea39a534af47923a01bd29d138365819f +Subproject commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f

1 0

[snowflake/master] Implemented new broker messages for browser proxy
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit b4b538a17fde49708b291d5f8cb7c444d06c47b2 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 25 11:29:42 2019 -0400 Implemented new broker messages for browser proxy --- common/messages/proxy.go | 2 +- proxy/broker.js | 38 ++++++++++++++++++++++++-------------- proxy/spec/broker.spec.js | 16 ++++++++-------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/common/messages/proxy.go b/common/messages/proxy.go index 141fbda..042caf9 … [View More]100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -33,7 +33,7 @@ HTTP 200 OK HTTP 200 OK { - Status: "no proxies" + Status: "no match" } 3) If the request is malformed: diff --git a/proxy/broker.js b/proxy/broker.js index 7b5b7e4..551110b 100644 --- a/proxy/broker.js +++ b/proxy/broker.js @@ -46,10 +46,16 @@ class Broker { return; } switch (xhr.status) { - case Broker.STATUS.OK: - return fulfill(xhr.responseText); // Should contain offer. - case Broker.STATUS.GATEWAY_TIMEOUT: - return reject(Broker.MESSAGE.TIMEOUT); + case Broker.CODE.OK: + var response = JSON.parse(xhr.responseText); + if (response.Status == Broker.STATUS.MATCH) { + return fulfill(response.Offer); // Should contain offer. + } else if (response.Status == Broker.STATUS.TIMEOUT) { + return reject(Broker.MESSAGE.TIMEOUT); + } else { + log('Broker ERROR: Unexpected ' + response.Status); + return reject(Broker.MESSAGE.UNEXPECTED); + } default: log('Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText); snowflake.ui.setStatus(' failure. Please refresh.'); @@ -57,7 +63,8 @@ class Broker { } }; this._xhr = xhr; // Used by spec to fake async Broker interaction - return this._postRequest(id, xhr, 'proxy', id); + var data = {"Version": "1.0", "Sid": id} + return this._postRequest(xhr, 'proxy', JSON.stringify(data)); }); } @@ -73,26 +80,24 @@ class Broker { return; } switch (xhr.status) { - case Broker.STATUS.OK: + case Broker.CODE.OK: dbg('Broker: Successfully replied with answer.'); return dbg(xhr.responseText); - case Broker.STATUS.GONE: - return dbg('Broker: No longer valid to reply with answer.'); default: dbg('Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText); return snowflake.ui.setStatus(' failure. Please refresh.'); } }; - return this._postRequest(id, xhr, 'answer', JSON.stringify(answer)); + var data = {"Version": "1.0", "Sid": id, "Answer": JSON.stringify(answer)}; + return this._postRequest(xhr, 'answer', JSON.stringify(data)); } // urlSuffix for the broker is different depending on what action // is desired. - _postRequest(id, xhr, urlSuffix, payload) { + _postRequest(xhr, urlSuffix, payload) { var err; try { xhr.open('POST', this.url + urlSuffix); - xhr.setRequestHeader('X-Session-ID', id); } catch (error) { err = error; /* @@ -109,10 +114,15 @@ class Broker { } -Broker.STATUS = { +Broker.CODE = { OK: 200, - GONE: 410, - GATEWAY_TIMEOUT: 504 + BAD_REQUEST: 400, + INTERNAL_SERVER_ERROR: 500 +}; + +Broker.STATUS = { + MATCH: "client match", + TIMEOUT: "no match" }; Broker.MESSAGE = { diff --git a/proxy/spec/broker.spec.js b/proxy/spec/broker.spec.js index 4eb3029..6ab9691 100644 --- a/proxy/spec/broker.spec.js +++ b/proxy/spec/broker.spec.js @@ -35,8 +35,8 @@ describe('Broker', function() { // fake successful request and response from broker. spyOn(b, '_postRequest').and.callFake(function() { b._xhr.readyState = b._xhr.DONE; - b._xhr.status = Broker.STATUS.OK; - b._xhr.responseText = 'fake offer'; + b._xhr.status = Broker.CODE.OK; + b._xhr.responseText = '{"Status":"client match","Offer":"fake offer"}'; return b._xhr.onreadystatechange(); }); poll = b.getClientOffer(); @@ -46,7 +46,7 @@ describe('Broker', function() { expect(desc).toEqual('fake offer'); return done(); }).catch(function() { - fail('should not reject on Broker.STATUS.OK'); + fail('should not reject on Broker.CODE.OK'); return done(); }); }); @@ -57,14 +57,15 @@ describe('Broker', function() { // fake timed-out request from broker spyOn(b, '_postRequest').and.callFake(function() { b._xhr.readyState = b._xhr.DONE; - b._xhr.status = Broker.STATUS.GATEWAY_TIMEOUT; + b._xhr.status = Broker.CODE.OK; + b._xhr.responseText = '{"Status":"no match"}'; return b._xhr.onreadystatechange(); }); poll = b.getClientOffer(); expect(poll).not.toBeNull(); expect(b._postRequest).toHaveBeenCalled(); return poll.then(function(desc) { - fail('should not fulfill on Broker.STATUS.GATEWAY_TIMEOUT'); + fail('should not fulfill with "Status: no match"'); return done(); }, function(err) { expect(err).toBe(Broker.MESSAGE.TIMEOUT); @@ -101,7 +102,7 @@ describe('Broker', function() { var b = new Broker('fake'); spyOn(b, '_postRequest'); b.sendAnswer('fake id', 123); - expect(b._postRequest).toHaveBeenCalledWith('fake id', jasmine.any(Object), 'answer', '123'); + expect(b._postRequest).toHaveBeenCalledWith(jasmine.any(Object), 'answer', '{"Version":"1.0","Sid":"fake id","Answer":"123"}'); }); it('POST XMLHttpRequests to the broker', function() { @@ -110,9 +111,8 @@ describe('Broker', function() { spyOn(b._xhr, 'open'); spyOn(b._xhr, 'setRequestHeader'); spyOn(b._xhr, 'send'); - b._postRequest(0, b._xhr, 'test', 'data'); + b._postRequest(b._xhr, 'test', 'data'); expect(b._xhr.open).toHaveBeenCalled(); - expect(b._xhr.setRequestHeader).toHaveBeenCalled(); expect(b._xhr.send).toHaveBeenCalled(); }); [View Less]

1 0

[snowflake/master] Redo protocol for proxy--broker messages
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit c4ae64905b69512e50587c1ee749cddfc0937a4c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Oct 7 14:02:01 2019 -0400 Redo protocol for proxy--broker messages Switch to containing all communication between the proxy and the broker in the HTTP response body. This will make things easier if we ever use something other than HTTP communicate between different actors in the snowflake system. Other changes to the protocol are as follows: … [View More]- requests are accompanied by a version number so the broker can be backwards compatable if desired in the future - all responses are 200 OK unless the request was badly formatted --- broker/broker.go | 64 +++++++++--- broker/snowflake-broker_test.go | 58 ++++++----- common/messages/proxy.go | 214 ++++++++++++++++++++++++++++++++++++++++ common/messages/proxy_test.go | 161 ++++++++++++++++++++++++++++++ proxy-go/snowflake.go | 41 +++++++- proxy/translation | 2 +- 6 files changed, 488 insertions(+), 52 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 2a253b0..4343de8 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -21,6 +21,7 @@ import ( "syscall" "time" + "git.torproject.org/pluggable-transports/snowflake.git/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" "golang.org/x/crypto/acme/autocert" ) @@ -151,15 +152,16 @@ func (ctx *BrokerContext) AddSnowflake(id string) *Snowflake { 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, readLimit)) - if nil != err { + if err != nil { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return } - if string(body) != id { - log.Println("Mismatched IDs!") + + sid, err := messages.DecodePollRequest(body) + if err != nil { + log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return } @@ -173,14 +175,26 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { } // Wait for a client to avail an offer to the snowflake, or timeout if nil. - offer := ctx.RequestOffer(id) + offer := ctx.RequestOffer(sid) + var b []byte if nil == offer { ctx.metrics.proxyIdleCount++ - w.WriteHeader(http.StatusGatewayTimeout) + + b, err = messages.EncodePollResponse("", false) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + return + } + + w.Write(b) + return + } + b, err = messages.EncodePollResponse(string(offer), true) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) return } - log.Println("Passing client offer to snowflake.") - if _, err := w.Write(offer); err != nil { + if _, err := w.Write(b); err != nil { log.Printf("proxyPolls unable to write offer with error: %v", err) } } @@ -235,22 +249,40 @@ an offer from proxyHandler to respond with an answer in an HTTP POST, which the broker will pass back to the original client. */ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { - id := r.Header.Get("X-Session-ID") + + 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) + return + } + + answer, id, err := messages.DecodeAnswerRequest(body) + if err != nil || answer == "" { + log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) + return + } + + var success = true snowflake, ok := ctx.idToSnowflake[id] if !ok || nil == snowflake { // The snowflake took too long to respond with an answer, so its client // disappeared / the snowflake is no longer recognized by the Broker. - w.WriteHeader(http.StatusGone) - return + success = false } - 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) + b, err := messages.EncodeAnswerResponse(success) + if err != nil { + log.Printf("Error encoding answer: %s", err.Error()) + w.WriteHeader(http.StatusInternalServerError) return } + w.Write(b) + + if success { + snowflake.answerChannel <- []byte(answer) + } - snowflake.answerChannel <- body } func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 4c78ecd..c35c1d6 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -113,9 +113,8 @@ func TestBroker(t *testing.T) { Convey("Responds to proxy polls...", func() { done := make(chan bool) w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`)) r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) - r.Header.Set("X-Session-ID", "test") So(err, ShouldBeNil) Convey("with a client offer if available.", func() { @@ -125,57 +124,59 @@ func TestBroker(t *testing.T) { }(ctx) // Pass a fake client offer to this proxy p := <-ctx.proxyPolls - So(p.id, ShouldEqual, "test") + So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") p.offerChannel <- []byte("fake offer") <-done So(w.Code, ShouldEqual, http.StatusOK) - So(w.Body.String(), ShouldEqual, "fake offer") + So(w.Body.String(), ShouldEqual, `{"Status":"client match","Offer":"fake offer"}`) }) - Convey("times out when no client offer is available.", func() { + Convey("return empty 200 OK when no client offer is available.", func() { go func(ctx *BrokerContext) { proxyPolls(ctx, w, r) done <- true }(ctx) p := <-ctx.proxyPolls - So(p.id, ShouldEqual, "test") + So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") // nil means timeout p.offerChannel <- nil <-done - So(w.Body.String(), ShouldEqual, "") - So(w.Code, ShouldEqual, http.StatusGatewayTimeout) + So(w.Body.String(), ShouldEqual, `{"Status":"no match","Offer":""}`) + So(w.Code, ShouldEqual, http.StatusOK) }) }) Convey("Responds to proxy answers...", func() { s := ctx.AddSnowflake("test") w := httptest.NewRecorder() - data := bytes.NewReader([]byte("fake answer")) + data := bytes.NewReader([]byte(`{"Version":"1.0","Sid":"test","Answer":"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) { proxyAnswers(ctx, w, r) }(ctx) answer := <-s.answerChannel So(w.Code, ShouldEqual, http.StatusOK) - So(answer, ShouldResemble, []byte("fake answer")) + So(answer, ShouldResemble, []byte("test")) }) - Convey("with error if the proxy is not recognized", func() { - r, err := http.NewRequest("POST", "snowflake.broker/answer", nil) + Convey("with client gone status if the proxy is not recognized", func() { + data = bytes.NewReader([]byte(`{"Version":"1.0","Sid":"invalid","Answer":"test"}`)) + r, err := http.NewRequest("POST", "snowflake.broker/answer", data) So(err, ShouldBeNil) - r.Header.Set("X-Session-ID", "invalid") proxyAnswers(ctx, w, r) - So(w.Code, ShouldEqual, http.StatusGone) + So(w.Code, ShouldEqual, http.StatusOK) + b, err := ioutil.ReadAll(w.Body) + So(err, ShouldBeNil) + So(b, ShouldResemble, []byte(`{"Status":"client gone"}`)) + }) 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) proxyAnswers(ctx, w, r) So(w.Code, ShouldEqual, http.StatusBadRequest) @@ -184,7 +185,6 @@ func TestBroker(t *testing.T) { Convey("with error if the proxy writes too much data", func() { data := bytes.NewReader(make([]byte, 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) @@ -199,11 +199,10 @@ func TestBroker(t *testing.T) { ctx := NewBrokerContext(NullLogger()) // Proxy polls with its ID first... - dataP := bytes.NewReader([]byte("test")) + dataP := bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`)) wP := httptest.NewRecorder() rP, err := http.NewRequest("POST", "snowflake.broker/proxy", dataP) So(err, ShouldBeNil) - rP.Header.Set("X-Session-ID", "test") go func() { proxyPolls(ctx, wP, rP) polled <- true @@ -211,13 +210,13 @@ func TestBroker(t *testing.T) { // Manually do the Broker goroutine action here for full control. p := <-ctx.proxyPolls - So(p.id, ShouldEqual, "test") + So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") s := ctx.AddSnowflake(p.id) go func() { offer := <-s.offerChannel p.offerChannel <- offer }() - So(ctx.idToSnowflake["test"], ShouldNotBeNil) + So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], ShouldNotBeNil) // Client request blocks until proxy answer arrives. dataC := bytes.NewReader([]byte("fake offer")) @@ -231,20 +230,19 @@ func TestBroker(t *testing.T) { <-polled So(wP.Code, ShouldEqual, http.StatusOK) - So(wP.Body.String(), ShouldResemble, "fake offer") - So(ctx.idToSnowflake["test"], ShouldNotBeNil) + So(wP.Body.String(), ShouldResemble, `{"Status":"client match","Offer":"fake offer"}`) + So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], 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) + dataA := bytes.NewReader([]byte(`{"Version":"1.0","Sid":"ymbcCMto7KHNGYlp","Answer":"test"}`)) + rA, err := http.NewRequest("POST", "snowflake.broker/answer", dataA) So(err, ShouldBeNil) - rA.Header.Set("X-Session-ID", "test") proxyAnswers(ctx, wA, rA) So(wA.Code, ShouldEqual, http.StatusOK) <-done So(wC.Code, ShouldEqual, http.StatusOK) - So(wC.Body.String(), ShouldEqual, "fake answer") + So(wC.Body.String(), ShouldEqual, "test") }) } @@ -408,7 +406,7 @@ func TestMetrics(t *testing.T) { //Test addition of proxy polls Convey("for proxy polls", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader([]byte("{\"Sid\":\"ymbcCMto7KHNGYlp\",\"Version\":\"1.0\"}")) r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) r.Header.Set("X-Session-ID", "test") r.RemoteAddr = "129.97.208.23:8888" //CA geoip @@ -492,7 +490,7 @@ func TestMetrics(t *testing.T) { //Test unique ip Convey("proxy counts by unique ip", func() { w := httptest.NewRecorder() - data := bytes.NewReader([]byte("test")) + data := bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`)) r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) r.Header.Set("X-Session-ID", "test") r.RemoteAddr = "129.97.208.23:8888" //CA geoip @@ -505,7 +503,7 @@ func TestMetrics(t *testing.T) { p.offerChannel <- nil <-done - data = bytes.NewReader([]byte("test")) + data = bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`)) r, err = http.NewRequest("POST", "snowflake.broker/proxy", data) if err != nil { log.Printf("unable to get NewRequest with error: %v", err) diff --git a/common/messages/proxy.go b/common/messages/proxy.go new file mode 100644 index 0000000..141fbda --- /dev/null +++ b/common/messages/proxy.go @@ -0,0 +1,214 @@ +//Package for communication with the snowflake broker + +//import "git.torproject.org/pluggable-transports/snowflake.git/common/messages" +package messages + +import ( + "encoding/json" + "fmt" +) + +const version = "1.0" + +/* Version 1.0 specification: + +== ProxyPollRequest == +{ + Sid: [generated session id of proxy] + Version: 1.0 +} + +== ProxyPollResponse == +1) If a client is matched: +HTTP 200 OK +{ + Status: "client match", + { + type: offer, + sdp: [WebRTC SDP] + } +} + +2) If a client is not matched: +HTTP 200 OK + +{ + Status: "no proxies" +} + +3) If the request is malformed: +HTTP 400 BadRequest + +== ProxyAnswerRequest == +{ + Sid: [generated session id of proxy] + Version: 1.0 + Answer: + { + type: answer + sdp: [WebRTC SDP] + } +} + +== ProxyAnswerResponse == +1) If the client retrieved the answer: +HTTP 200 OK + +{ + Status: "success" +} + +2) If the client left: +HTTP 200 OK + +{ + Status: "client gone" +} + +3) If the request is malformed: +HTTP 400 BadRequest + +*/ + +type ProxyPollRequest struct { + Sid string + Version string +} + +func EncodePollRequest(sid string) ([]byte, error) { + return json.Marshal(ProxyPollRequest{ + Sid: sid, + Version: version, + }) +} + +// Decodes a poll message from a snowflake proxy and returns the +// sid of the proxy on success and an error if it failed +func DecodePollRequest(data []byte) (string, error) { + var message ProxyPollRequest + + err := json.Unmarshal(data, &message) + if err != nil { + return "", err + } + if message.Version != "1.0" { + return "", fmt.Errorf("using unknown version") + } + + // Version 1.0 requires an Sid + if message.Sid == "" { + return "", fmt.Errorf("no supplied session id") + } + + return message.Sid, nil +} + +type ProxyPollResponse struct { + Status string + Offer string +} + +func EncodePollResponse(offer string, success bool) ([]byte, error) { + if success { + return json.Marshal(ProxyPollResponse{ + Status: "client match", + Offer: offer, + }) + + } + return json.Marshal(ProxyPollResponse{ + Status: "no match", + }) +} + +// Decodes a poll response from the broker and returns an offer +// If there is a client match, the returned offer string will be non-empty +func DecodePollResponse(data []byte) (string, error) { + var message ProxyPollResponse + + err := json.Unmarshal(data, &message) + if err != nil { + return "", err + } + if message.Status == "" { + return "", fmt.Errorf("received invalid data") + } + + if message.Status == "client match" { + if message.Offer == "" { + return "", fmt.Errorf("no supplied offer") + } + } else { + message.Offer = "" + } + + return message.Offer, nil +} + +type ProxyAnswerRequest struct { + Version string + Sid string + Answer string +} + +func EncodeAnswerRequest(answer string, sid string) ([]byte, error) { + return json.Marshal(ProxyAnswerRequest{ + Version: "1.0", + Sid: sid, + Answer: answer, + }) +} + +// Returns the sdp answer and proxy sid +func DecodeAnswerRequest(data []byte) (string, string, error) { + var message ProxyAnswerRequest + + err := json.Unmarshal(data, &message) + if err != nil { + return "", "", err + } + if message.Version != "1.0" { + return "", "", fmt.Errorf("using unknown version") + } + + if message.Sid == "" || message.Answer == "" { + return "", "", fmt.Errorf("no supplied sid or answer") + } + + return message.Answer, message.Sid, nil +} + +type ProxyAnswerResponse struct { + Status string +} + +func EncodeAnswerResponse(success bool) ([]byte, error) { + if success { + return json.Marshal(ProxyAnswerResponse{ + Status: "success", + }) + + } + return json.Marshal(ProxyAnswerResponse{ + Status: "client gone", + }) +} + +func DecodeAnswerResponse(data []byte) (bool, error) { + var message ProxyAnswerResponse + var success bool + + err := json.Unmarshal(data, &message) + if err != nil { + return success, err + } + if message.Status == "" { + return success, fmt.Errorf("received invalid data") + } + + if message.Status == "success" { + success = true + } + + return success, nil +} diff --git a/common/messages/proxy_test.go b/common/messages/proxy_test.go new file mode 100644 index 0000000..f2f006e --- /dev/null +++ b/common/messages/proxy_test.go @@ -0,0 +1,161 @@ +package messages + +import ( + "encoding/json" + "fmt" + "testing" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestDecodeProxyPollRequest(t *testing.T) { + Convey("Context", t, func() { + for _, test := range []struct { + sid string + data string + err error + }{ + { + //Version 1.0 proxy message + "ymbcCMto7KHNGYlp", + `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`, + nil, + }, + { + //Version 0.X proxy message: + "", + "ymbcCMto7KHNGYlp", + &json.SyntaxError{}, + }, + { + "", + `{"Sid":"ymbcCMto7KHNGYlp"}`, + fmt.Errorf(""), + }, + { + "", + "{}", + fmt.Errorf(""), + }, + { + "", + `{"Version":"1.0"}`, + fmt.Errorf(""), + }, + { + "", + `{"Version":"2.0"}`, + fmt.Errorf(""), + }, + } { + sid, err := DecodePollRequest([]byte(test.data)) + So(sid, ShouldResemble, test.sid) + So(err, ShouldHaveSameTypeAs, test.err) + } + + }) +} + +func TestEncodeProxyPollRequests(t *testing.T) { + Convey("Context", t, func() { + b, err := EncodePollRequest("ymbcCMto7KHNGYlp") + So(err, ShouldEqual, nil) + sid, err := DecodePollRequest(b) + So(sid, ShouldEqual, "ymbcCMto7KHNGYlp") + So(err, ShouldEqual, nil) + }) +} + +func TestDecodeProxyAnswerRequest(t *testing.T) { + Convey("Context", t, func() { + for _, test := range []struct { + answer string + sid string + data string + err error + }{ + { + "test", + "test", + `{"Version":"1.0","Sid":"test","Answer":"test"}`, + nil, + }, + { + "", + "", + `{"type":"offer","sdp":"v=0\r\no=- 4358805017720277108 2 IN IP4 [scrubbed]\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 [scrubbed]\r\na=candidate:3769337065 1 udp 2122260223 [scrubbed] 56688 typ host generation 0 network-id 1 network-cost 50\r\na=candidate:2921887769 1 tcp 1518280447 [scrubbed] 35441 typ host tcptype passive generation 0 network-id 1 network-cost 50\r\na=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n"}`, + fmt.Errorf(""), + }, + { + "", + "", + `{"Version":"1.0","Answer":"test"}`, + fmt.Errorf(""), + }, + { + "", + "", + `{"Version":"1.0","Sid":"test"}`, + fmt.Errorf(""), + }, + } { + answer, sid, err := DecodeAnswerRequest([]byte(test.data)) + So(answer, ShouldResemble, test.answer) + So(sid, ShouldResemble, test.sid) + So(err, ShouldHaveSameTypeAs, test.err) + } + + }) +} + +func TestEncodeProxyAnswerRequest(t *testing.T) { + Convey("Context", t, func() { + b, err := EncodeAnswerRequest("test answer", "test sid") + So(err, ShouldEqual, nil) + answer, sid, err := DecodeAnswerRequest(b) + So(answer, ShouldEqual, "test answer") + So(sid, ShouldEqual, "test sid") + So(err, ShouldEqual, nil) + }) +} + +func TestDecodeProxyAnswerResponse(t *testing.T) { + Convey("Context", t, func() { + for _, test := range []struct { + success bool + data string + err error + }{ + { + true, + `{"Status":"success"}`, + nil, + }, + { + false, + `{"Status":"client gone"}`, + nil, + }, + { + false, + `{"Test":"test"}`, + fmt.Errorf(""), + }, + } { + success, err := DecodeAnswerResponse([]byte(test.data)) + So(success, ShouldResemble, test.success) + So(err, ShouldHaveSameTypeAs, test.err) + } + + }) +} + +func TestEncodeProxyAnswerResponse(t *testing.T) { + Convey("Context", t, func() { + b, err := EncodeAnswerResponse(true) + So(err, ShouldEqual, nil) + success, err := DecodeAnswerResponse(b) + So(success, ShouldEqual, true) + So(err, ShouldEqual, nil) + }) +} diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 9b7dad2..ea2a986 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -19,6 +19,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" "github.com/pion/webrtc" "golang.org/x/net/websocket" @@ -168,7 +169,12 @@ func pollOffer(sid string) *webrtc.SessionDescription { timeOfNextPoll = now } - req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer([]byte(sid))) + b, err := messages.EncodePollRequest(sid) + if err != nil { + log.Printf("Error encoding poll message: %s", err.Error()) + return nil + } + req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer(b)) req.Header.Set("X-Session-ID", sid) resp, err := client.Do(req) if err != nil { @@ -182,7 +188,16 @@ func pollOffer(sid string) *webrtc.SessionDescription { if err != nil { log.Printf("error reading broker response: %s", err) } else { - return deserializeSessionDescription(string(body)) + + offer, err := messages.DecodePollResponse(body) + if err != nil { + log.Printf("error reading broker response: %s", err.Error()) + log.Printf("body: %s", body) + return nil + } + if offer != "" { + return deserializeSessionDescription(offer) + } } } } @@ -191,9 +206,12 @@ func pollOffer(sid string) *webrtc.SessionDescription { func sendAnswer(sid string, pc *webrtc.PeerConnection) error { broker := brokerURL.ResolveReference(&url.URL{Path: "answer"}) - body := bytes.NewBuffer([]byte(serializeSessionDescription(pc.LocalDescription()))) - req, _ := http.NewRequest("POST", broker.String(), body) - req.Header.Set("X-Session-ID", sid) + answer := string([]byte(serializeSessionDescription(pc.LocalDescription()))) + b, err := messages.EncodeAnswerRequest(answer, sid) + if err != nil { + return err + } + req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer(b)) resp, err := client.Do(req) if err != nil { return err @@ -201,6 +219,19 @@ func sendAnswer(sid string, pc *webrtc.PeerConnection) error { if resp.StatusCode != http.StatusOK { return fmt.Errorf("broker returned %d", resp.StatusCode) } + + body, err := limitedRead(resp.Body, readLimit) + if err != nil { + return fmt.Errorf("error reading broker response: %s", err) + } + success, err := messages.DecodeAnswerResponse(body) + if err != nil { + return err + } + if !success { + return fmt.Errorf("broker returned client timeout") + } + return nil } diff --git a/proxy/translation b/proxy/translation index 120578e..bbf11bb 160000 --- a/proxy/translation +++ b/proxy/translation @@ -1 +1 @@ -Subproject commit 120578ec9dbf0975fc9ac573130282f628b9747a +Subproject commit bbf11bb0c9f1aca4f6b18c6505645f85e2fa1986 [View Less]

1 0

[lego/master] Update links
by hiro＠torproject.org 13 Nov '19

13 Nov '19

commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f Author: hiro <hiro(a)torproject.org> Date: Wed Nov 13 16:52:31 2019 +0100 Update links --- databags/links.ini | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/databags/links.ini b/databags/links.ini index b632ab1..7c68131 100644 --- a/databags/links.ini +++ b/databags/links.ini @@ -3,7 +3,87 @@ about = https://www.torproject.org/about/history/ support = https:… [View More]

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 13 Nov '19

13 Nov '19

commit b4c2776d707daaeb029dcffa0f415cf08dfd0957 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 13 10:53:01 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+es.po | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 7bd015620..b2173ce13 100644 --- a/contents+es.po +++ b/contents+es.po @@ -227,6 +227,10 @@ msgid "" "add more. Want to … [View More]

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 13 Nov '19

13 Nov '19

commit 86be6ae832f34b8b97fee3024775e6529b713864 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 13 10:52:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 26 ++++++++++++++++++++++++-- contents+es.po | 6 +++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 7d99174c8..0ecf606f4 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -5,8 +5,8 @@ # … [View More]Marc Ripoll <markripesp(a)gmail.com>, 2019 # Assumpta, 2019 # erinm, 2019 -# Emma Peel, 2019 # Ecron <ecron_89(a)hotmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 15:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -224,6 +224,10 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"Volem que tothom pugui gaudir del Navegador Tor en la seva pròpia llengua. " +"Ara està disponible en 32 llengües diferents, i estem treballant per " +"afegir-n'hi més. Ens voleu ajudar a traduir-lo? [Mireu " +"aquí](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -303,6 +307,9 @@ msgid "" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" +"El Tor Project i la comunitat que l'envolta desenvolupa i distribueix " +"algunes de les tecnologies de privadesa gratuïtes i de codi obert més " +"populars i àmpliament utilitzades: el Navegador Tor i la xarxa Tor." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -580,6 +587,12 @@ msgid "" "It not only protected people's identity online but also allowed them to " "access critical resources, social media, and websites which were blocked." msgstr "" +"El Tor va ser una eina fonamental durant la [Primavera " +"Àrab](https://en.wikipedia.org/wiki/Arab_Spring) que va començar a finals " +"del 2010, gràcies al fet que el Navegador Tor va fer més accessible per als " +"usuaris i activistes corrents la xarxa Tor. No només protegia la identitat " +"de la gent en línia, sinó que també els permetia accedir a recursos bàsics, " +"xarxes socials i llocs web que estaven blocats." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -589,6 +602,10 @@ msgid "" "2013](https://www.theguardian.com/world/interactive/2013/nov/01/snowden-nsa-" "files-surveillance-revelations-decoded#section/1)." msgstr "" +"La necessitat d'eines que protegissin de la vigilància massiva va esdevenir " +"una preocupació generalitzada gràcies a les [revelacions de Snowden el " +"2013](https://www.theguardian.com/world/interactive/2013/nov/01/snowden-nsa-" +"files-surveillance-revelations-decoded#section/1)." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -1196,6 +1213,8 @@ msgid "" "Tor Browser will block browser plugins such as Flash, RealPlayer, QuickTime," " and others: they can be manipulated into revealing your IP address." msgstr "" +"El Navegador Tor blocarà connectors com ara Flash, RealPlayer, QuickTime i " +"d'altres: els podrien manipular perquè revelin la vostra adreça IP." #: templates/download.html:27 msgid "" @@ -1325,6 +1344,9 @@ msgid "" "Tor Browser aims to make all users look the same, making it difficult for " "you to be fingerprinted based on your browser and device information." msgstr "" +"El Navegador Tor fa que tots els usuaris semblin iguals, i això dificulta " +"que sigueu identificat a partir de la informació del vostre navegador i el " +"vostre dispositiu." #: templates/home.html:58 msgid "Multi-layered Encryption" diff --git a/contents+es.po b/contents+es.po index 204828b22..9d6057d6f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1219,7 +1219,7 @@ msgid "" "Tor Browser will block browser plugins such as Flash, RealPlayer, QuickTime," " and others: they can be manipulated into revealing your IP address." msgstr "" -"Navegador Tor bloqueará complementos de navegador tales como Flash, " +"El Navegador Tor bloqueará complementos de navegador tales como Flash, " "RealPlayer, QuickTime, y otros: pueden ser manipulados para revelar tu " "dirección IP." @@ -1353,8 +1353,8 @@ msgid "" "you to be fingerprinted based on your browser and device information." msgstr "" "El Navegador Tor intenta que todos los usuarios parezcan iguales, haciendo " -"más difícil que puedas ser identificado unívocamente basándose en la " -"información de tu navegador y dispositivo." +"más difícil que puedas ser identificado por la información de tu navegador y" +" dispositivo." #: templates/home.html:58 msgid "Multi-layered Encryption" [View Less]

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 13 Nov '19

13 Nov '19

commit 31b34c0ca7714124dc56f6ff4e2eed457104d44e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 13 05:45:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/tr/LC_MESSAGES/messages.po | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index ce6ec6fba..4b9a886c5 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/… [View More]

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 13 Nov '19

13 Nov '19

commit c3bde6113f129ec008f88bd63a0d7d07e048850e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 13 03:45:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/tr/LC_MESSAGES/messages.po | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index 37fa3d91a..ce6ec6fba 100644 --- a/locale/tr/LC_MESSAGES/… [View More]messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -28,7 +28,7 @@ msgstr "Çevrimiçi izleme, gözetim ve sansür uygulamaları yaygındır." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 msgid "Take back the internet with Tor" -msgstr "" +msgstr "Tor kullanın İnterneti geri alın" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 msgid "Give today, and Mozilla will match your donation." @@ -98,12 +98,12 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 msgid "Privacy and freedom online should be the default." -msgstr "" +msgstr "Çevrimiçi kişisel gizlilik ve özgürlük temel bir hak olmalıdır." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 msgid "Donate to the Tor Project." -msgstr "" +msgstr "Tor Projesine bağış yapın." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 msgid "summary_large_image" @@ -521,6 +521,8 @@ msgstr "tişört" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:247 msgid "Get our limited edition Take Back the Internet With Tor shirt." msgstr "" +"Sınırlı sayıda üretilmiş Take Back the Internet with Tor (Tor kullanın " +"İnterneti geri alın) yazılı tişört." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:258 msgid "t-shirt pack" @@ -531,6 +533,8 @@ msgid "" "Get this year's Take Back the Internet With Tor t-shirt and the Tor: " "Strength in Numbers t-shirt." msgstr "" +"Bu yılın Take Back the Internet With Tor (Tor kullanın İnterneti geri alın) " +"ve Tor: Strength in Numbers (Birlikten Kuvvet Doğar) tişörtlerinden alın." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" @@ -707,7 +711,7 @@ msgstr "aylık" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:563 msgid "Gift selected" -msgstr "" +msgstr "Hediye seçildi" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59 msgid "Estimated Donation Date:" @@ -1900,6 +1904,9 @@ msgid "" "to make a hardware donation that you think might be especially useful for " "us, please mail giving(at)torproject.org." msgstr "" +"Normalde hayır. İnsanlardan bize donanım bağışlamasını istemiyoruz. Fakat " +"özellikle bize yardımcı olacağını düşündüğünüz bir donanım bağışınız varsa " +"giving(at)torproject.org adresine bir e-posta gönderebilirsiniz." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:597 msgid "" @@ -1907,6 +1914,9 @@ msgid "" "at helping the Tor project develop software design to protect people's " "anonymity. It does not, in itself, run the Tor network." msgstr "" +"Tor projesi, kişilerin anonimliğini korumak için yazılım geliştirme " +"çalışmalarına yardımcı olması amacı ile birden fazla yerde birden fazla " +"bilgisayar yönetir. Tor ağı Tor projesi içinde çalışmaz." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:601 msgid "" [View Less]

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 12 Nov '19

12 Nov '19

commit d8c354253ec51f7501cab0f47109ba411256614a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 12 23:50:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ka.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 26364d0e9..b584acda3 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -151,7 +151,7 @@ msgstr "გახდით Tor-ის … [View More]მთარგმნელი" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser portable" -msgstr "Tor-ბრაუზერის ადვილად გადატანა" +msgstr "Tor-ბრაუზერი სატარებლად" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -993,7 +993,7 @@ msgstr "" msgid "" "In the Tor Network Settings window, select 'Tor is censored in my country.'" msgstr "" -"Tor-ქსელის პარამეტრების ფანჯარაში, აირჩიეთ „Tor შეზღუდულია ჩემს ქვეყნაში“." +"Tor-ქსელის პარამეტრების ფანჯარაში, აირჩიეთ „Tor შეზღუდულია ჩემს ქვეყანაში“." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1855,7 +1855,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "### თქვენი ქსელის ცენზურის ქვეშაა?" +msgstr "### თქვენი ქსელი ცენზურის ქვეშაა?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -2260,12 +2260,12 @@ msgid "" "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." msgstr "" "* BitTorrent ზოგადად ვერ უზრუნველყოფს [ვინაობის გაუმხელობას Tor-" -"ით]https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)" +"ით](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title) msgid "MAKE TOR BROWSER PORTABLE" -msgstr "TOR-ბრაუზერის გადატანის შესაძლებლობა" +msgstr "TOR-ბრაუზერი სატარებლად" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.description) @@ -2278,9 +2278,9 @@ msgid "" "If preferred, Tor Browser may be made portable by extracting it from its " "archive directly onto removable media such as a USB stick or SD card." msgstr "" -"თუ გსურთ, Tor-ბრაუზერის გადატანა ადვილადაა შესაძლებელი, არქივის შიგთავსის " -"ამოღებით პირდაპირ მოსახსნელ მოწყობილობაზე, როგორიცაა USB-მეხსიერება ან SD-" -"ბარათი." +"სურვილის შემთხვევაში, Tor-ბრაუზერი სატარებლადაც გამოდგება, არქივის შიგთავსის" +" ამოღებითა და განთავსებით პირდაპირ მოსახსნელ მოწყობილობაზე, როგორიცაა USB-" +"მეხსიერება ან SD-ბარათი." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2349,8 +2349,8 @@ msgid "" "1. Plug in your removable media and format it. You *must* use macOS Extended" " (Journaled) format." msgstr "" -"1. შეაერთეთ მოსახსნელი მოწყობილობა და დააფორმატეთ. *უნდა* გამოიყენოთ საფაილო" -" სისტემა macOS Extended (Journaled)." +"1. შეაერთეთ მოსახსნელი მოწყობილობა და დააფორმატეთ. საფაილო სისტემად " +"*აუცილებლად* უნდა მიუთითოთ macOS Extended (Journaled)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2410,7 +2410,7 @@ msgstr "გაეცით დღესვე და Mozilla გააორმ #: lego/templates/navbar.html:74 templates/footer.html:9 #: templates/footer.html:18 templates/navbar.html:74 msgid "Download Tor Browser" -msgstr "Tor-ბრაუზერის ჩამოტვირთვა" +msgstr "ჩამოტვირთეთ Tor-ბრაუზერი" #: lego/templates/footer.html:10 templates/footer.html:10 msgid "" [View Less]

1 0