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

[snowflake/main] Refactor webRTCConn to its own file
by meskio＠torproject.org 07 Jul '21

07 Jul '21

commit ced539f234af4fbf460787b5f50eb78098406774 Author: meskio <meskio(a)torproject.org> Date: Fri Jun 25 18:37:31 2021 +0200 Refactor webRTCConn to its own file --- proxy/snowflake.go | 109 ---------------------------------------------- proxy/webrtcconn.go | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 109 deletions(-) diff --git a/proxy/snowflake.go b/proxy/snowflake.go index f7eacf8..12d97d3 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -13,7 +13,6 @@ import ( "net/http" "net/url" "os" - "regexp" "strings" "sync" "time" @@ -23,8 +22,6 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/common/util" "git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn" "github.com/gorilla/websocket" - "github.com/pion/ice/v2" - "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" ) @@ -60,117 +57,11 @@ var ( client http.Client ) -var remoteIPPatterns = []*regexp.Regexp{ - /* IPv4 */ - regexp.MustCompile(`(?m)^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |\r?\n)`), - /* IPv6 */ - regexp.MustCompile(`(?m)^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |\r?\n)`), -} - // Checks whether an IP address is a remote address for the client func isRemoteAddress(ip net.IP) bool { return !(util.IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback()) } -func remoteIPFromSDP(str string) net.IP { - // Look for remote IP in "a=candidate" attribute fields - // https://tools.ietf.org/html/rfc5245#section-15.1 - var desc sdp.SessionDescription - err := desc.Unmarshal([]byte(str)) - if err != nil { - log.Println("Error parsing SDP: ", err.Error()) - return nil - } - for _, m := range desc.MediaDescriptions { - for _, a := range m.Attributes { - if a.IsICECandidate() { - c, err := ice.UnmarshalCandidate(a.Value) - if err == nil { - ip := net.ParseIP(c.Address()) - if ip != nil && isRemoteAddress(ip) { - return ip - } - } - } - } - } - // Finally look for remote IP in "c=" Connection Data field - // https://tools.ietf.org/html/rfc4566#section-5.7 - for _, pattern := range remoteIPPatterns { - m := pattern.FindStringSubmatch(str) - if m != nil { - // Ignore parsing errors, ParseIP returns nil. - ip := net.ParseIP(m[1]) - if ip != nil && isRemoteAddress(ip) { - return ip - } - - } - } - - return nil -} - -type webRTCConn struct { - dc *webrtc.DataChannel - pc *webrtc.PeerConnection - pr *io.PipeReader - - lock sync.Mutex // Synchronization for DataChannel destruction - once sync.Once // Synchronization for PeerConnection destruction - - bytesLogger BytesLogger -} - -func (c *webRTCConn) Read(b []byte) (int, error) { - return c.pr.Read(b) -} - -func (c *webRTCConn) Write(b []byte) (int, error) { - c.bytesLogger.AddInbound(len(b)) - c.lock.Lock() - defer c.lock.Unlock() - if c.dc != nil { - c.dc.Send(b) - } - return len(b), nil -} - -func (c *webRTCConn) Close() (err error) { - c.once.Do(func() { - err = c.pc.Close() - }) - return -} - -func (c *webRTCConn) LocalAddr() net.Addr { - return nil -} - -func (c *webRTCConn) RemoteAddr() net.Addr { - //Parse Remote SDP offer and extract client IP - clientIP := remoteIPFromSDP(c.pc.RemoteDescription().SDP) - if clientIP == nil { - return nil - } - return &net.IPAddr{IP: clientIP, Zone: ""} -} - -func (c *webRTCConn) SetDeadline(t time.Time) error { - // nolint: golint - return fmt.Errorf("SetDeadline not implemented") -} - -func (c *webRTCConn) SetReadDeadline(t time.Time) error { - // nolint: golint - return fmt.Errorf("SetReadDeadline not implemented") -} - -func (c *webRTCConn) SetWriteDeadline(t time.Time) error { - // nolint: golint - return fmt.Errorf("SetWriteDeadline not implemented") -} - func genSessionID() string { buf := make([]byte, sessionIDLength) _, err := rand.Read(buf) diff --git a/proxy/webrtcconn.go b/proxy/webrtcconn.go new file mode 100644 index 0000000..5d95919 --- /dev/null +++ b/proxy/webrtcconn.go @@ -0,0 +1,121 @@ +package main + +import ( + "fmt" + "io" + "log" + "net" + "regexp" + "sync" + "time" + + "github.com/pion/ice/v2" + "github.com/pion/sdp/v3" + "github.com/pion/webrtc/v3" +) + +var remoteIPPatterns = []*regexp.Regexp{ + /* IPv4 */ + regexp.MustCompile(`(?m)^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |\r?\n)`), + /* IPv6 */ + regexp.MustCompile(`(?m)^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |\r?\n)`), +} + +type webRTCConn struct { + dc *webrtc.DataChannel + pc *webrtc.PeerConnection + pr *io.PipeReader + + lock sync.Mutex // Synchronization for DataChannel destruction + once sync.Once // Synchronization for PeerConnection destruction + + bytesLogger BytesLogger +} + +func (c *webRTCConn) Read(b []byte) (int, error) { + return c.pr.Read(b) +} + +func (c *webRTCConn) Write(b []byte) (int, error) { + c.bytesLogger.AddInbound(len(b)) + c.lock.Lock() + defer c.lock.Unlock() + if c.dc != nil { + c.dc.Send(b) + } + return len(b), nil +} + +func (c *webRTCConn) Close() (err error) { + c.once.Do(func() { + err = c.pc.Close() + }) + return +} + +func (c *webRTCConn) LocalAddr() net.Addr { + return nil +} + +func (c *webRTCConn) RemoteAddr() net.Addr { + //Parse Remote SDP offer and extract client IP + clientIP := remoteIPFromSDP(c.pc.RemoteDescription().SDP) + if clientIP == nil { + return nil + } + return &net.IPAddr{IP: clientIP, Zone: ""} +} + +func (c *webRTCConn) SetDeadline(t time.Time) error { + // nolint: golint + return fmt.Errorf("SetDeadline not implemented") +} + +func (c *webRTCConn) SetReadDeadline(t time.Time) error { + // nolint: golint + return fmt.Errorf("SetReadDeadline not implemented") +} + +func (c *webRTCConn) SetWriteDeadline(t time.Time) error { + // nolint: golint + return fmt.Errorf("SetWriteDeadline not implemented") +} + +func remoteIPFromSDP(str string) net.IP { + // Look for remote IP in "a=candidate" attribute fields + // https://tools.ietf.org/html/rfc5245#section-15.1 + var desc sdp.SessionDescription + err := desc.Unmarshal([]byte(str)) + if err != nil { + log.Println("Error parsing SDP: ", err.Error()) + return nil + } + for _, m := range desc.MediaDescriptions { + for _, a := range m.Attributes { + if a.IsICECandidate() { + c, err := ice.UnmarshalCandidate(a.Value) + if err == nil { + ip := net.ParseIP(c.Address()) + if ip != nil && isRemoteAddress(ip) { + return ip + } + } + } + } + } + // Finally look for remote IP in "c=" Connection Data field + // https://tools.ietf.org/html/rfc4566#section-5.7 + for _, pattern := range remoteIPPatterns { + m := pattern.FindStringSubmatch(str) + if m != nil { + // Ignore parsing errors, ParseIP returns nil. + ip := net.ParseIP(m[1]) + if ip != nil && isRemoteAddress(ip) { + return ip + } + + } + } + + return nil +}

1 0

[snowflake/main] Make the proxy to report the number of clients to the broker
by meskio＠torproject.org 07 Jul '21

07 Jul '21

commit 7a1857c42fdbaf78207d9e25ea814fe1d531036c Author: meskio <meskio(a)torproject.org> Date: Fri Jun 25 13:47:47 2021 +0200 Make the proxy to report the number of clients to the broker So the assignment of proxies is based on the load. The number of clients is ronded down to 8. Existing proxies that doesn't report the number of clients will be distributed equaly to new proxies until they get 8 clients, that is okish as the existing proxies do have a maximum capacity of 10. Fixes #40048 --- broker/broker.go | 14 +++++---- broker/snowflake-broker_test.go | 18 ++++++------ common/messages/messages_test.go | 26 +++++++++++++++-- common/messages/proxy.go | 28 +++++++++++------- doc/broker-spec.txt | 4 ++- proxy/proxy-go_test.go | 17 ++--------- proxy/snowflake.go | 63 +++++++++++++++++++--------------------- proxy/tokens.go | 44 ++++++++++++++++++++++++++++ proxy/tokens_test.go | 28 ++++++++++++++++++ 9 files changed, 165 insertions(+), 77 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 906c210..fc4727d 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -124,16 +124,18 @@ type ProxyPoll struct { id string proxyType string natType string + clients int offerChannel chan *ClientOffer } // Registers a Snowflake and waits for some Client to send an offer, // as part of the polling logic of the proxy handler. -func (ctx *BrokerContext) RequestOffer(id string, proxyType string, natType string) *ClientOffer { +func (ctx *BrokerContext) RequestOffer(id string, proxyType string, natType string, clients int) *ClientOffer { request := new(ProxyPoll) request.id = id request.proxyType = proxyType request.natType = natType + request.clients = clients request.offerChannel = make(chan *ClientOffer) ctx.proxyPolls <- request // Block until an offer is available, or timeout which sends a nil offer. @@ -146,7 +148,7 @@ func (ctx *BrokerContext) RequestOffer(id string, proxyType string, natType stri // client offer or nil on timeout / none are available. func (ctx *BrokerContext) Broker() { for request := range ctx.proxyPolls { - snowflake := ctx.AddSnowflake(request.id, request.proxyType, request.natType) + snowflake := ctx.AddSnowflake(request.id, request.proxyType, request.natType, request.clients) // Wait for a client to avail an offer to the snowflake. go func(request *ProxyPoll) { select { @@ -174,10 +176,10 @@ func (ctx *BrokerContext) Broker() { // Create and add a Snowflake to the heap. // Required to keep track of proxies between providing them // with an offer and awaiting their second POST with an answer. -func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType string) *Snowflake { +func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType string, clients int) *Snowflake { snowflake := new(Snowflake) snowflake.id = id - snowflake.clients = 0 + snowflake.clients = clients snowflake.proxyType = proxyType snowflake.natType = natType snowflake.offerChannel = make(chan *ClientOffer) @@ -205,7 +207,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { return } - sid, proxyType, natType, err := messages.DecodePollRequest(body) + sid, proxyType, natType, clients, err := messages.DecodePollRequest(body) if err != nil { w.WriteHeader(http.StatusBadRequest) return @@ -222,7 +224,7 @@ 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(sid, proxyType, natType) + offer := ctx.RequestOffer(sid, proxyType, natType, clients) var b []byte if nil == offer { ctx.metrics.lock.Lock() diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 646fb02..825bc6f 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -32,7 +32,7 @@ func TestBroker(t *testing.T) { Convey("Adds Snowflake", func() { So(ctx.snowflakes.Len(), ShouldEqual, 0) So(len(ctx.idToSnowflake), ShouldEqual, 0) - ctx.AddSnowflake("foo", "", NATUnrestricted) + ctx.AddSnowflake("foo", "", NATUnrestricted, 0) So(ctx.snowflakes.Len(), ShouldEqual, 1) So(len(ctx.idToSnowflake), ShouldEqual, 1) }) @@ -59,7 +59,7 @@ func TestBroker(t *testing.T) { Convey("Request an offer from the Snowflake Heap", func() { done := make(chan *ClientOffer) go func() { - offer := ctx.RequestOffer("test", "", NATUnrestricted) + offer := ctx.RequestOffer("test", "", NATUnrestricted, 0) done <- offer }() request := <-ctx.proxyPolls @@ -84,7 +84,7 @@ func TestBroker(t *testing.T) { Convey("with a proxy answer if available.", func() { done := make(chan bool) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted, 0) go func() { clientOffers(ctx, w, r) done <- true @@ -102,7 +102,7 @@ func TestBroker(t *testing.T) { return } done := make(chan bool) - snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted, 0) go func() { clientOffers(ctx, w, r) // Takes a few seconds here... @@ -132,7 +132,7 @@ func TestBroker(t *testing.T) { Convey("with a proxy answer if available.", func() { done := make(chan bool) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted, 0) go func() { clientOffers(ctx, w, r) done <- true @@ -150,7 +150,7 @@ func TestBroker(t *testing.T) { return } done := make(chan bool) - snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted, 0) go func() { clientOffers(ctx, w, r) // Takes a few seconds here... @@ -201,7 +201,7 @@ func TestBroker(t *testing.T) { }) Convey("Responds to proxy answers...", func() { - s := ctx.AddSnowflake("test", "", NATUnrestricted) + s := ctx.AddSnowflake("test", "", NATUnrestricted, 0) w := httptest.NewRecorder() data := bytes.NewReader([]byte(`{"Version":"1.0","Sid":"test","Answer":"test"}`)) @@ -314,7 +314,7 @@ func TestBroker(t *testing.T) { // Manually do the Broker goroutine action here for full control. p := <-ctx.proxyPolls So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") - s := ctx.AddSnowflake(p.id, "", NATUnrestricted) + s := ctx.AddSnowflake(p.id, "", NATUnrestricted, 0) go func() { offer := <-s.offerChannel p.offerChannel <- offer @@ -593,7 +593,7 @@ func TestMetrics(t *testing.T) { So(err, ShouldBeNil) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted, 0) go func() { clientOffers(ctx, w, r) done <- true diff --git a/common/messages/messages_test.go b/common/messages/messages_test.go index 3962d3b..abb978d 100644 --- a/common/messages/messages_test.go +++ b/common/messages/messages_test.go @@ -15,6 +15,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { sid string proxyType string natType string + clients int data string err error }{ @@ -23,6 +24,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { "ymbcCMto7KHNGYlp", "", "unknown", + 0, `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`, nil, }, @@ -31,6 +33,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { "ymbcCMto7KHNGYlp", "standalone", "unknown", + 0, `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.1","Type":"standalone"}`, nil, }, @@ -39,14 +42,25 @@ func TestDecodeProxyPollRequest(t *testing.T) { "ymbcCMto7KHNGYlp", "standalone", "restricted", + 0, `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.2","Type":"standalone", "NAT":"restricted"}`, nil, }, + { + //Version 1.2 proxy message with clients + "ymbcCMto7KHNGYlp", + "standalone", + "restricted", + 24, + `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.2","Type":"standalone", "NAT":"restricted","Clients":24}`, + nil, + }, { //Version 0.X proxy message: "", "", "", + 0, "", &json.SyntaxError{}, }, @@ -54,6 +68,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { "", "", "", + 0, `{"Sid":"ymbcCMto7KHNGYlp"}`, fmt.Errorf(""), }, @@ -61,6 +76,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { "", "", "", + 0, "{}", fmt.Errorf(""), }, @@ -68,6 +84,7 @@ func TestDecodeProxyPollRequest(t *testing.T) { "", "", "", + 0, `{"Version":"1.0"}`, fmt.Errorf(""), }, @@ -75,14 +92,16 @@ func TestDecodeProxyPollRequest(t *testing.T) { "", "", "", + 0, `{"Version":"2.0"}`, fmt.Errorf(""), }, } { - sid, proxyType, natType, err := DecodePollRequest([]byte(test.data)) + sid, proxyType, natType, clients, err := DecodePollRequest([]byte(test.data)) So(sid, ShouldResemble, test.sid) So(proxyType, ShouldResemble, test.proxyType) So(natType, ShouldResemble, test.natType) + So(clients, ShouldEqual, test.clients) So(err, ShouldHaveSameTypeAs, test.err) } @@ -91,12 +110,13 @@ func TestDecodeProxyPollRequest(t *testing.T) { func TestEncodeProxyPollRequests(t *testing.T) { Convey("Context", t, func() { - b, err := EncodePollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown") + b, err := EncodePollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown", 16) So(err, ShouldEqual, nil) - sid, proxyType, natType, err := DecodePollRequest(b) + sid, proxyType, natType, clients, err := DecodePollRequest(b) So(sid, ShouldEqual, "ymbcCMto7KHNGYlp") So(proxyType, ShouldEqual, "standalone") So(natType, ShouldEqual, "unknown") + So(clients, ShouldEqual, 16) So(err, ShouldEqual, nil) }) } diff --git a/common/messages/proxy.go b/common/messages/proxy.go index 2d9e58d..366e833 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -17,8 +17,9 @@ const version = "1.2" { Sid: [generated session id of proxy], Version: 1.2, - Type: ["badge"|"webext"|"standalone"] - NAT: ["unknown"|"restricted"|"unrestricted"] + Type: ["badge"|"webext"|"standalone"], + NAT: ["unknown"|"restricted"|"unrestricted"], + Clients: [number of current clients, rounded down to multiples of 8] } == ProxyPollResponse == @@ -79,43 +80,48 @@ type ProxyPollRequest struct { Version string Type string NAT string + Clients int } -func EncodePollRequest(sid string, proxyType string, natType string) ([]byte, error) { +func EncodePollRequest(sid string, proxyType string, natType string, clients int) ([]byte, error) { return json.Marshal(ProxyPollRequest{ Sid: sid, Version: version, Type: proxyType, NAT: natType, + Clients: clients, }) } // Decodes a poll message from a snowflake proxy and returns the -// sid and proxy type of the proxy on success and an error if it failed -func DecodePollRequest(data []byte) (string, string, string, error) { +// sid, proxy type, nat type and clients of the proxy on success +// and an error if it failed +func DecodePollRequest(data []byte) (sid string, proxyType string, natType string, clients int, err error) { var message ProxyPollRequest - err := json.Unmarshal(data, &message) + err = json.Unmarshal(data, &message) if err != nil { - return "", "", "", err + return } majorVersion := strings.Split(message.Version, ".")[0] if majorVersion != "1" { - return "", "", "", fmt.Errorf("using unknown version") + err = fmt.Errorf("using unknown version") + return } // Version 1.x requires an Sid if message.Sid == "" { - return "", "", "", fmt.Errorf("no supplied session id") + err = fmt.Errorf("no supplied session id") + return } - natType := message.NAT + natType = message.NAT if natType == "" { natType = "unknown" } - return message.Sid, message.Type, natType, nil + return message.Sid, message.Type, natType, message.Clients, nil } type ProxyPollResponse struct { diff --git a/doc/broker-spec.txt b/doc/broker-spec.txt index 9e4b8ae..f2cd231 100644 --- a/doc/broker-spec.txt +++ b/doc/broker-spec.txt @@ -141,7 +141,9 @@ POST /proxy HTTP { Sid: [generated session id of proxy], Version: 1.1, - Type: ["badge"|"webext"|"standalone"|"mobile"] + Type: ["badge"|"webext"|"standalone"|"mobile"], + NAT: ["unknown"|"restricted"|"unrestricted"], + Clients: [number of current clients, rounded down to multiples of 8] } ``` diff --git a/proxy/proxy-go_test.go b/proxy/proxy-go_test.go index e935ad9..183b1b4 100644 --- a/proxy/proxy-go_test.go +++ b/proxy/proxy-go_test.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "net" "net/http" - "net/url" "strconv" "strings" "testing" @@ -337,8 +336,9 @@ func TestBrokerInteractions(t *testing.T) { const sampleAnswer = `{"type":"answer","sdp":` + sampleSDP + `}` Convey("Proxy connections to broker", t, func() { - broker := new(SignalingServer) - broker.url, _ = url.Parse("localhost") + broker, err := newSignalingServer("localhost", false) + So(err, ShouldEqual, nil) + tokens = newTokens(0) //Mock peerConnection config = webrtc.Configuration{ @@ -469,17 +469,6 @@ func TestUtilityFuncs(t *testing.T) { So(err, ShouldEqual, io.ErrClosedPipe) }) }) - Convey("Tokens", t, func() { - tokens = make(chan bool, 2) - for i := uint(0); i < 2; i++ { - tokens <- true - } - So(len(tokens), ShouldEqual, 2) - getToken() - So(len(tokens), ShouldEqual, 1) - retToken() - So(len(tokens), ShouldEqual, 2) - }) Convey("SessionID Generation", t, func() { sid1 := genSessionID() sid2 := genSessionID() diff --git a/proxy/snowflake.go b/proxy/snowflake.go index 86ae0b2..f7eacf8 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -55,7 +55,7 @@ const ( ) var ( - tokens chan bool + tokens *tokens_t config webrtc.Configuration client http.Client ) @@ -171,14 +171,6 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("SetWriteDeadline not implemented") } -func getToken() { - <-tokens -} - -func retToken() { - tokens <- true -} - func genSessionID() string { buf := make([]byte, sessionIDLength) _, err := rand.Read(buf) @@ -204,6 +196,21 @@ type SignalingServer struct { keepLocalAddresses bool } +func newSignalingServer(rawURL string, keepLocalAddresses bool) (*SignalingServer, error) { + var err error + s := new(SignalingServer) + s.keepLocalAddresses = keepLocalAddresses + s.url, err = url.Parse(rawURL) + if err != nil { + return nil, fmt.Errorf("invalid broker url: %s", err) + } + + s.transport = http.DefaultTransport.(*http.Transport) + s.transport.(*http.Transport).ResponseHeaderTimeout = 30 * time.Second + + return s, nil +} + func (s *SignalingServer) Post(path string, payload io.Reader) ([]byte, error) { req, err := http.NewRequest("POST", path, payload) @@ -238,7 +245,8 @@ func (s *SignalingServer) pollOffer(sid string) *webrtc.SessionDescription { timeOfNextPoll = now } - body, err := messages.EncodePollRequest(sid, "standalone", currentNATType) + numClients := int((tokens.count() / 8) * 8) // Round down to 8 + body, err := messages.EncodePollRequest(sid, "standalone", currentNATType, numClients) if err != nil { log.Printf("Error encoding poll message: %s", err.Error()) return nil @@ -323,7 +331,7 @@ func CopyLoop(c1 io.ReadWriteCloser, c2 io.ReadWriteCloser) { // RemoteAddr). https://bugs.torproject.org/18628#comment:8 func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { defer conn.Close() - defer retToken() + defer tokens.ret() u, err := url.Parse(relayURL) if err != nil { @@ -494,14 +502,14 @@ func runSession(sid string) { offer := broker.pollOffer(sid) if offer == nil { log.Printf("bad offer from broker") - retToken() + tokens.ret() return } dataChan := make(chan struct{}) pc, err := makePeerConnectionFromOffer(offer, config, dataChan, datachannelHandler) if err != nil { log.Printf("error making WebRTC connection: %s", err) - retToken() + tokens.ret() return } err = broker.sendAnswer(sid, pc) @@ -510,7 +518,7 @@ func runSession(sid string) { if inerr := pc.Close(); inerr != nil { log.Printf("error calling pc.Close: %v", inerr) } - retToken() + tokens.ret() return } // Set a timeout on peerconnection. If the connection state has not @@ -524,7 +532,7 @@ func runSession(sid string) { if err := pc.Close(); err != nil { log.Printf("error calling pc.Close: %v", err) } - retToken() + tokens.ret() } } @@ -536,7 +544,7 @@ func main() { var unsafeLogging bool var keepLocalAddresses bool - flag.UintVar(&capacity, "capacity", 10, "maximum concurrent clients") + flag.UintVar(&capacity, "capacity", 0, "maximum concurrent clients") flag.StringVar(&rawBrokerURL, "broker", defaultBrokerURL, "broker URL") flag.StringVar(&relayURL, "relay", defaultRelayURL, "websocket relay URL") flag.StringVar(&stunURL, "stun", defaultSTUNURL, "stun URL") @@ -565,12 +573,11 @@ func main() { log.Println("starting") var err error - broker = new(SignalingServer) - broker.keepLocalAddresses = keepLocalAddresses - broker.url, err = url.Parse(rawBrokerURL) + broker, err = newSignalingServer(rawBrokerURL, keepLocalAddresses) if err != nil { - log.Fatalf("invalid broker url: %s", err) + log.Fatal(err) } + _, err = url.Parse(stunURL) if err != nil { log.Fatalf("invalid stun url: %s", err) @@ -580,8 +587,6 @@ func main() { log.Fatalf("invalid relay url: %s", err) } - broker.transport = http.DefaultTransport.(*http.Transport) - broker.transport.(*http.Transport).ResponseHeaderTimeout = 15 * time.Second config = webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ { @@ -589,17 +594,14 @@ func main() { }, }, } - tokens = make(chan bool, capacity) - for i := uint(0); i < capacity; i++ { - tokens <- true - } + tokens = newTokens(capacity) // use probetest to determine NAT compatability checkNATType(config, defaultProbeURL) log.Printf("NAT type: %s", currentNATType) for { - getToken() + tokens.get() sessionID := genSessionID() runSession(sessionID) } @@ -607,12 +609,7 @@ func main() { func checkNATType(config webrtc.Configuration, probeURL string) { - var err error - - probe := new(SignalingServer) - probe.transport = http.DefaultTransport.(*http.Transport) - probe.transport.(*http.Transport).ResponseHeaderTimeout = 30 * time.Second - probe.url, err = url.Parse(probeURL) + probe, err := newSignalingServer(probeURL, false) if err != nil { log.Printf("Error parsing url: %s", err.Error()) } diff --git a/proxy/tokens.go b/proxy/tokens.go new file mode 100644 index 0000000..fedb8f7 --- /dev/null +++ b/proxy/tokens.go @@ -0,0 +1,44 @@ +package main + +import ( + "sync/atomic" +) + +type tokens_t struct { + ch chan struct{} + capacity uint + clients int64 +} + +func newTokens(capacity uint) *tokens_t { + var ch chan struct{} + if capacity != 0 { + ch = make(chan struct{}, capacity) + } + + return &tokens_t{ + ch: ch, + capacity: capacity, + clients: 0, + } +} + +func (t *tokens_t) get() { + atomic.AddInt64(&t.clients, 1) + + if t.capacity != 0 { + t.ch <- struct{}{} + } +} + +func (t *tokens_t) ret() { + atomic.AddInt64(&t.clients, -1) + + if t.capacity != 0 { + <-t.ch + } +} + +func (t tokens_t) count() int64 { + return atomic.LoadInt64(&t.clients) +} diff --git a/proxy/tokens_test.go b/proxy/tokens_test.go new file mode 100644 index 0000000..622cc05 --- /dev/null +++ b/proxy/tokens_test.go @@ -0,0 +1,28 @@ +package main + +import ( + "testing" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestTokens(t *testing.T) { + Convey("Tokens", t, func() { + tokens := newTokens(2) + So(tokens.count(), ShouldEqual, 0) + tokens.get() + So(tokens.count(), ShouldEqual, 1) + tokens.ret() + So(tokens.count(), ShouldEqual, 0) + }) + Convey("Tokens capacity 0", t, func() { + tokens := newTokens(0) + So(tokens.count(), ShouldEqual, 0) + for i := 0; i < 20; i++ { + tokens.get() + } + So(tokens.count(), ShouldEqual, 20) + tokens.ret() + So(tokens.count(), ShouldEqual, 19) + }) +}

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit 249a99308fc89a04a93cf40d3ff20d578ad90e82 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 17:17:39 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index f6811983ee..1d8f7c47ae 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -4227,6 +4227,9 @@ msgid "" "This command results in the key being saved to a file found at the path " "`./tor.keyring`, i.e. in the current directory." msgstr "" +"Ces résultats de commande dans la clé étant sauvegardés vers un fichier se " +"trouvant dans le chemin `./tor.keyring`, c’est-à-dire dans l'actuel " +"répertoire." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -4394,6 +4397,8 @@ msgid "" "If you're using MacOS or GNU/Linux, the key can also be fetched by running " "the following command:" msgstr "" +"Si vous utilisez MacOS ou GNU/Linux, la clé peut donc être récupérée en " +"exécutant la commande suivante :" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -5321,6 +5326,8 @@ msgid "" "Both options are located in the [hamburger menu (\"≡\")](../../glossary" "/hamburger-menu)." msgstr "" +"Les deux options sont situées dans le [menu hamburger " +"(\"≡\")](../../glossary/hamburger-menu)." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -5369,7 +5376,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "![Tor Browser Menu](/static/images/menu-new-identity.png)" -msgstr "" +msgstr "![Menu du Navigateur Tor](/static/images/menu-new-identity.png)" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -5417,6 +5424,7 @@ msgstr "" #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "![New Circuit for this Site](/static/images/new-circuit-display.png)" msgstr "" +"![Nouveau circuit pour ce site](/static/images/new-circuit-display.png)" #: https//support.torproject.org/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.title) @@ -5593,6 +5601,8 @@ msgid "" "If you'd like to become a relay, please see our [Tor Relay " "Guide](https://community.torproject.org/relay)." msgstr "" +"Si vous voulez devenir un relais, veuillez regarder notre [Guide du relais " +"Tor](https://community.torproject.org/relay)." #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.title) @@ -5824,6 +5834,8 @@ msgid "" "[Learn more about the design of Tor " "Browser](https://www.torproject.org/projects/torbrowser/design/)." msgstr "" +"[Apprenez en plus sur le design du Navigateur " +"Tor](https://www.torproject.org/projects/torbrowser/design/)." #: https//support.torproject.org/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.title) @@ -5883,6 +5895,9 @@ msgid "" " their search history, and therefore is best positioned to protect your " "privacy." msgstr "" +"DuckDuckGo n'archive, ne collecte ou ne partage aucune information " +"personnelle ou historique de recherche de leurs utilisateurs, et est donc le" +" mieux positionné en termes de protection des renseignements personnels." #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -5891,6 +5906,9 @@ msgid "" "such as the timestamp, your IP address, and your account information if you " "are logged in." msgstr "" +"La plupart des autres moteurs de recherche stockent vos recherches avec " +"d'autres informations comme l'estampille temporelle, votre adresse IP, et " +"vos informations de compte si vous êtes connecté." #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.title) @@ -5943,6 +5961,10 @@ msgid "" "thinks you prefer, and it also includes giving you different results on your" " queries." msgstr "" +"Google utilise la \"géolocalisation\" pour déterminer où vous êtes dans le " +"monde, afin de vous donner une expérience personnalisée. Cela inclut " +"l'utilisation de la langue qu'il pense que vous préférez, et cela inclut " +"aussi des différents résultats pour vos requêtes." #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description)

1 0

[tpo/translations] content updates
by emmapeel＠torproject.org 07 Jul '21

07 Jul '21

commit 1475378ae7115935e5b299d48051ade8c220e789 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jul 7 18:45:33 2021 +0200 content updates --- content/about/people/lavamind/contents.lr | 2 + content/releases/tor-browser-10-5/contents.lr | 56 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/content/about/people/lavamind/contents.lr b/content/about/people/lavamind/contents.lr index 671ff173..2fbdb941 100644 --- a/content/about/people/lavamind/contents.lr +++ b/content/about/people/lavamind/contents.lr @@ -12,6 +12,8 @@ nickname: lavamind --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=0B5A33B8A26D60109C509C6C… --- +image: /static/images/people/lavamind.png +--- description: Member of the sysadmin team. diff --git a/content/releases/tor-browser-10-5/contents.lr b/content/releases/tor-browser-10-5/contents.lr new file mode 100644 index 00000000..dc496379 --- /dev/null +++ b/content/releases/tor-browser-10-5/contents.lr @@ -0,0 +1,56 @@ +section: What is new +--- +_template: release.html +--- +color: primary +--- +title: Tor Browser 10.5 +--- +body: + + +## New Release: Tor Browser 10.5 + +Tor Browser 10.5 is now available from the Tor Browser download page and our distribution directory. +The Android version is also available from Google Play and should be available from F-Droid within the next day. + +This release includes important security updates to Firefox. + +This new Tor Browser release is focussed on improving the internet access of users connecting through Tor in censored contexts. + +### What's new? + +#### V2 Onion Services Deprecation +As [we announced last year](https://blog.torproject.org/v2-deprecation-timeline), v2 onion services will be completely unreachable once Tor Browser moves to Tor 0.4.6.x in October 2021. +From now until then, Tor Browser will warn you when visiting a v2 onion site of its upcoming deprecation. + +#### Snowflake is now available as a bridge +With [Snowflake](https://snowflake.torproject.org), censored users can rely on proxies run by volunteers to connect to the internet. + +During Q1 this year, [the UX team ran a survey on Tor Browser Alpha to better understand Snowflake’s user experience](https://blog.torproject.org/snowflake-in-tor-browser-stable). +The survey received 1,795 complete responses, of which 726 participants confirmed they use Snowflake as a pluggable transport. +The majority of Snowflake users who completed the survey began using Tor Browser several times a week within the past year. +75% of users had a positive view of Snowflake, although many experienced connection troubles and slow speeds while browsing. +These facts and the stable network of volunteers allow us to make it available on this release. + +#### Improving the user experience of connecting to Tor +[Tor Launcher](https://support.torproject.org/glossary/tor-launcher/) has acted as the options panel for advanced Tor network configurations over the years. +It also serves as a control point for users who are in censored networks. +The UX and the Anti-Censorship teams joined efforts to improve the connecting flow for Tor Browser users. +This release is the first in the upcoming series of helping censored users seamlessly access the open internet by simplifying the connection flow, detecting censorship and providing bridges. + +#### Known Issues +Tor Browser 10.5 comes with a number of known issues: + +* [tpo/applications/tor-browser#40497](https://gitlab.torproject.org/tpo/appli… +* [tpo/applications/fenix#40176](https://gitlab.torproject.org/tpo/application… +* [tpo/applications/fenix#40110](https://gitlab.torproject.org/tpo/application… +* [tpo/applications/fenix#40172](https://gitlab.torproject.org/tpo/application… +* [tpo/applications/fenix#40174](https://gitlab.torproject.org/tpo/application… +* [tpo/applications/tor-browser#40242](https://gitlab.torproject.org/tpo/appli… +* [tpo/applications/fenix#40103](https://gitlab.torproject.org/tpo/application… +* [tpo/applications/fenix#40115](https://gitlab.torproject.org/tpo/application… + +#### Give Feedback +If you find a bug or have a suggestion for how we could improve this release, [please let us know](https://support.torproject.org/misc/bug-or-feedback/). +Thanks to all of the teams across Tor, and the many volunteers, who contributed to this release.

1 0

[tpo/translations] update translation file
by emmapeel＠torproject.org 07 Jul '21

07 Jul '21

commit 347418f57c9740233c6491e9a4f9b55658a34d53 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jul 7 19:03:07 2021 +0200 update translation file --- i18n/contents.pot | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 227 insertions(+), 11 deletions(-) diff --git a/i18n/contents.pot b/i18n/contents.pot index 48f8fecf..1b2916f6 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-22 18:56+CET\n" +"POT-Creation-Date: 2021-07-07 19:01+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -146,6 +146,8 @@ msgstr "" #: (content/releases/contents+en.lr:page.section) #: https://www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lr:page.section) +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.section) #: https://www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lr:page.section) msgid "What is new" @@ -547,6 +549,8 @@ msgstr "" #: https://www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lr:page.body) +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) #: https://www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lr:page.body) msgid "" @@ -557,6 +561,8 @@ msgstr "" #: https://www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lr:page.body) +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) #: https://www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lr:page.body) msgid "" @@ -564,6 +570,220 @@ msgid "" "contributed to this release." msgstr "" +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.title) +msgid "Tor Browser 10.5" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "## New Release: Tor Browser 10.5" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"Tor Browser 10.5 is now available from the Tor Browser download page and our " +"distribution directory." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"The Android version is also available from Google Play and should be " +"available from F-Droid within the next day." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "This release includes important security updates to Firefox." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"This new Tor Browser release is focussed on improving the internet access of " +"users connecting through Tor in censored contexts." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "### What's new?" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "#### V2 Onion Services Deprecation" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"As [we announced last year](https://blog.torproject.org/v2-deprecation-" +"timeline), v2 onion services will be completely unreachable once Tor Browser " +"moves to Tor 0.4.6.x in October 2021." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"From now until then, Tor Browser will warn you when visiting a v2 onion site " +"of its upcoming deprecation." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "#### Snowflake is now available as a bridge" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"With [Snowflake](https://snowflake.torproject.org), censored users can rely " +"on proxies run by volunteers to connect to the internet." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"During Q1 this year, [the UX team ran a survey on Tor Browser Alpha to " +"better understand Snowflake’s user experience](https://blog.torproject.org/" +"snowflake-in-tor-browser-stable)." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"The survey received 1,795 complete responses, of which 726 participants " +"confirmed they use Snowflake as a pluggable transport." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"The majority of Snowflake users who completed the survey began using Tor " +"Browser several times a week within the past year." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"75% of users had a positive view of Snowflake, although many experienced " +"connection troubles and slow speeds while browsing." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"These facts and the stable network of volunteers allow us to make it " +"available on this release." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "#### Improving the user experience of connecting to Tor" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"[Tor Launcher](https://support.torproject.org/glossary/tor-launcher/) has " +"acted as the options panel for advanced Tor network configurations over the " +"years." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"It also serves as a control point for users who are in censored networks." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"The UX and the Anti-Censorship teams joined efforts to improve the " +"connecting flow for Tor Browser users." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"This release is the first in the upcoming series of helping censored users " +"seamlessly access the open internet by simplifying the connection flow, " +"detecting censorship and providing bridges." +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "#### Known Issues" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "Tor Browser 10.5 comes with a number of known issues:" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/tor-browser#40497](https://gitlab.torproject.org/tpo/" +"applications/tor-browser/-/issues/40497)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40176](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40176)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40110](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40110)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40172](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40172)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40174](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40174)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/tor-browser#40242](https://gitlab.torproject.org/tpo/" +"applications/tor-browser/-/issues/40242)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40103](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40103)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "" +"* [tpo/applications/fenix#40115](https://gitlab.torproject.org/tpo/" +"applications/fenix/-/issues/40115)" +msgstr "" + +#: https://www.torproject.org/releases/tor-browser-10-5/ +#: (content/releases/tor-browser-10-5/contents+en.lr:page.body) +msgid "#### Give Feedback" +msgstr "" + #: https://www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lr:page.title) msgid "Tor Browser 10" @@ -1501,31 +1721,27 @@ msgstr "" msgid "Defend yourself." msgstr "" -#: templates/hero-download.html:42 +#: templates/hero-download.html:36 msgid "Download for" msgstr "" -#: templates/hero-download.html:43 +#: templates/hero-download.html:37 msgid "Signature" msgstr "" -#: templates/hero-download.html:44 -msgid "Learn how to verify a signature" -msgstr "" - -#: templates/hero-download.html:53 +#: templates/hero-download.html:47 msgid "Download for Android" msgstr "" -#: templates/hero-download.html:59 +#: templates/hero-download.html:53 msgid "Download in another language or platform" msgstr "" -#: templates/hero-download.html:60 +#: templates/hero-download.html:54 msgid "Download the latest alpha build" msgstr "" -#: templates/hero-download.html:65 +#: templates/hero-download.html:59 msgid "Read the latest release announcements" msgstr ""

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit 0831289cebf10740257a32747c4f96de7b438358 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 16:47:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index f948386825..f6811983ee 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1361,6 +1361,9 @@ msgid "" ".onion and is designed to be [self-authenticating](../self-authenticating-" "address)." msgstr "" +"Un nom de domaine Internet normalisé utilisé par les services oignon se " +"terminant par .onion et sont conçus pour être [auto-authentifiable](../self-" +"authenticating-address)." #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.translation) @@ -1881,12 +1884,16 @@ msgid "" "It has three components; the Snowflake client, the Snowflake proxy (the two " "together known as the Snowflake peers) and the broker." msgstr "" +"Il a trois composants ; le client Snowflake, le mandataire Snowflake (les " +"deux réunis forment les pairs Snowflake) et le relais." #: https//support.torproject.org/glossary/snowflake/ #: (content/glossary/snowflake/contents+en.lrword.definition) msgid "" "Snowflake can allow an open browser tab to act as an ephemeral Tor bridge." msgstr "" +"Snowflake peut permettre à un onglet ouvert à agir comme un pont Tor " +"éphémère." #: https//support.torproject.org/glossary/snowflake/ #: (content/glossary/snowflake/contents+en.lrword.definition) @@ -1894,16 +1901,19 @@ msgid "" "In order to prevent the blocking of proxy IP addresses, Snowflake involves a" " large number of volunteer proxies, which also makes them hard to pin point." msgstr "" +"Dans le but d'empêcher le blocage des adresses IP du mandataire, Snowflake " +"implique un grand nombre de mandataires bénévoles, ce qui les rend donc " +"difficile à repérer." #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.term) msgid "SOCKS5" -msgstr "" +msgstr "SOCKS5" #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.definition) msgid "SOCKS5 is an Internet protocol used by Tor." -msgstr "" +msgstr "SOCKS5 est un protocole Internet utilisé par Tor." #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.definition) @@ -1911,6 +1921,8 @@ msgid "" "It sends the traffic through the Tor network instead of sending it from your" " IP address into the open network." msgstr "" +"Il envoie le trafic à travers le réseau Tor au lieu de l'envoyer depuis " +"votre adresse IP dans le réseau ouvert." #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.definition) @@ -1925,16 +1937,19 @@ msgid "" "The applications that you run with SOCKS5 will be aware of the tunneling, " "but you can prevent identity correlation if set up correctly." msgstr "" +"Les applications que vous lancez avec SOCKS5 vont faire attention à la " +"tunnellisation, mais vous pouvez empêcher la corrélation d'identité si elle " +"est correctement configurée." #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.spelling) msgid "All in caps, as it is an acronym." -msgstr "" +msgstr "Tout en majuscule, comme un acronyme." #: https//support.torproject.org/glossary/ssl/ #: (content/glossary/ssl/contents+en.lrword.term) msgid "secure sockets layer (SSL)" -msgstr "" +msgstr "Protocole SSL" #: https//support.torproject.org/glossary/ssl/ #: (content/glossary/ssl/contents+en.lrword.definition) @@ -2009,7 +2024,7 @@ msgstr "[En apprendre davantage sur Tails](https://tails.boum.org/)." #: https//support.torproject.org/glossary/the-guardian-project/ #: (content/glossary/the-guardian-project/contents+en.lrword.term) msgid "The Guardian Project" -msgstr "" +msgstr "Le Projet Guardian" #: https//support.torproject.org/glossary/the-guardian-project/ #: (content/glossary/the-guardian-project/contents+en.lrword.definition) @@ -2018,6 +2033,10 @@ msgid "" " developers, activists and designers that create easy to use, secure, " "opensource mobile apps and operating system enhancements." msgstr "" +"[Le Projet Guardian](https://guardianproject.info/) est un ensemble de " +"développeurs de logiciels, d'activistes et de designeurs qui créent des " +"applis mobiles faciles à utiliser, sécurisées et open source ainsi que des " +"améliorations de systèmes d'exploitations." #: https//support.torproject.org/glossary/the-guardian-project/ #: (content/glossary/the-guardian-project/contents+en.lrword.definition) @@ -2027,6 +2046,10 @@ msgid "" "provided by The Guardian Project helps route other apps on your andriod " "device over the Tor network." msgstr "" +"[L'appli " +"Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" +" fournie par le Projet Guardian aide l'acheminement d'autres applis sur " +"votre appareil Android sous le réseau Tor." #: https//support.torproject.org/glossary/the-tor-project/ #: (content/glossary/the-tor-project/contents+en.lrword.term) @@ -3837,6 +3860,10 @@ msgid "" " to export and import bookmarks. [Bug " "#31617](https://bugs.torproject.org/tpo/applications/tor-browser/31617)" msgstr "" +"**Note :** Actuellement, sur le [Navigateur Tor sur " +"Android](https://www.torproject.org/download/#android), il n'y a pas de " +"bonne manière d'exporter et importer des marque-pages. [Bogue " +"#31617](https://bugs.torproject.org/tpo/applications/tor-browser/31617)" #: https//support.torproject.org/tbb/fake-tbb/ #: (content/tbb/fake-tbb/contents+en.lrquestion.title)

1 0

[tpo/master] fix titles
by emmapeel＠torproject.org 07 Jul '21

07 Jul '21

commit 76cc4d9f2b20e633131531fa30a4e408f0a9fc78 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jul 7 18:38:57 2021 +0200 fix titles --- content/releases/tor-browser-10-5/contents.lr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/releases/tor-browser-10-5/contents.lr b/content/releases/tor-browser-10-5/contents.lr index 0f2dc5f9..dc496379 100644 --- a/content/releases/tor-browser-10-5/contents.lr +++ b/content/releases/tor-browser-10-5/contents.lr @@ -20,11 +20,11 @@ This new Tor Browser release is focussed on improving the internet access of use ### What's new? -**V2 Onion Services Deprecation** +#### V2 Onion Services Deprecation As [we announced last year](https://blog.torproject.org/v2-deprecation-timeline), v2 onion services will be completely unreachable once Tor Browser moves to Tor 0.4.6.x in October 2021. From now until then, Tor Browser will warn you when visiting a v2 onion site of its upcoming deprecation. -**Snowflake is now available as a bridge** +#### Snowflake is now available as a bridge With [Snowflake](https://snowflake.torproject.org), censored users can rely on proxies run by volunteers to connect to the internet. During Q1 this year, [the UX team ran a survey on Tor Browser Alpha to better understand Snowflake’s user experience](https://blog.torproject.org/snowflake-in-tor-browser-stable). @@ -33,13 +33,13 @@ The majority of Snowflake users who completed the survey began using Tor Browser 75% of users had a positive view of Snowflake, although many experienced connection troubles and slow speeds while browsing. These facts and the stable network of volunteers allow us to make it available on this release. -**Improving the user experience of connecting to Tor** +#### Improving the user experience of connecting to Tor [Tor Launcher](https://support.torproject.org/glossary/tor-launcher/) has acted as the options panel for advanced Tor network configurations over the years. It also serves as a control point for users who are in censored networks. The UX and the Anti-Censorship teams joined efforts to improve the connecting flow for Tor Browser users. This release is the first in the upcoming series of helping censored users seamlessly access the open internet by simplifying the connection flow, detecting censorship and providing bridges. -**Known Issues** +#### Known Issues Tor Browser 10.5 comes with a number of known issues: * [tpo/applications/tor-browser#40497](https://gitlab.torproject.org/tpo/appli… @@ -51,6 +51,6 @@ Tor Browser 10.5 comes with a number of known issues: * [tpo/applications/fenix#40103](https://gitlab.torproject.org/tpo/application… * [tpo/applications/fenix#40115](https://gitlab.torproject.org/tpo/application… -**Give Feedback** +#### Give Feedback If you find a bug or have a suggestion for how we could improve this release, [please let us know](https://support.torproject.org/misc/bug-or-feedback/). Thanks to all of the teams across Tor, and the many volunteers, who contributed to this release.

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit c3b3ff38c450f6ff49a1683c03af99061baf133a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 16:18:26 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 0350de7ef2..f948386825 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -600,6 +600,8 @@ msgstr "" msgid "" "This is done by converting the pdf to raw pixel data and then back to pdf." msgstr "" +"Cela fonctionne en convertissant le PDF en données de pixels brutes et puis " +"de nouveau en PDF." #: https//support.torproject.org/glossary/directory-authority/ #: (content/glossary/directory-authority/contents+en.lrword.term) @@ -692,7 +694,7 @@ msgstr "" #: https//support.torproject.org/glossary/f-droid/ #: (content/glossary/f-droid/contents+en.lrword.term) msgid "F-Droid" -msgstr "" +msgstr "F-Droid" #: https//support.torproject.org/glossary/f-droid/ #: (content/glossary/f-droid/contents+en.lrword.definition) @@ -700,6 +702,8 @@ msgid "" "F-Droid is a repository of FOSS (free and open source software) applications" " for Android." msgstr "" +"F-Droid est un dépôt de l'application FOSS (logiciel à code source ouvert et" +" libre) pour Android." #: https//support.torproject.org/glossary/f-droid/ #: (content/glossary/f-droid/contents+en.lrword.definition) @@ -715,6 +719,9 @@ msgid "" "manual.torproject.org/mobile-tor/) if you prefer installing the app through " "F-Droid." msgstr "" +"Le Navigateur Tor est proposé sur F-Droid. Suivez ces [instructions](https" +"://tb-manual.torproject.org/mobile-tor/) si vous préférez installer l'appli " +"via F-Droid." #: https//support.torproject.org/glossary/firefox/ #: (content/glossary/firefox/contents+en.lrword.term) @@ -1712,6 +1719,10 @@ msgid "" "fingerprint is a sequence of bytes that is used to identify and authenticate" " a corresponding longer [public key](../public-key)." msgstr "" +"Dans la [cryptographie par clé publique](../public-key-cryptography), une " +"empreinte de clé publique est une séquence d'octets qui sont utilisés pour " +"identifier et authentifier une [clé publique](../public-key) correspondante " +"plus longue." #: https//support.torproject.org/glossary/relay/ #: (content/glossary/relay/contents+en.lrword.term) @@ -1861,6 +1872,8 @@ msgid "" "[Snowflake](https://snowflake.torproject.org) is a pluggable transport which" " provides censorship circumvention and access to a free and open internet." msgstr "" +"[Snowflake](https://snowflake.torproject.org) est un transport enfichable " +"qui permet d'éviter la censure et l'accès à un internet libre et ouvert." #: https//support.torproject.org/glossary/snowflake/ #: (content/glossary/snowflake/contents+en.lrword.definition)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit 99e3a1b4e8aec7b6b0ed49a81619c2a181fa6a91 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 15:47:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 58d3b47696..0350de7ef2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -582,7 +582,7 @@ msgstr "" #: https//support.torproject.org/glossary/dangerzone/ #: (content/glossary/dangerzone/contents+en.lrword.term) msgid "Dangerzone" -msgstr "" +msgstr "Dangerzone" #: https//support.torproject.org/glossary/dangerzone/ #: (content/glossary/dangerzone/contents+en.lrword.definition) @@ -591,6 +591,9 @@ msgid "" "document (even pdf) to pdf, when the document is potentially dangerous or " "from an untrustworthy source." msgstr "" +"[Dangerzone](https://github.com/firstlookmedia/dangerzone) convertit " +"n'importe quel document (même PDF) en PDF, quand le document est " +"potentiellement dangereux ou vient d'une source douteuse." #: https//support.torproject.org/glossary/dangerzone/ #: (content/glossary/dangerzone/contents+en.lrword.definition)

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit ead6b4afc2489db1f5a080e62e504bd0c96a9bd8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 15:47:45 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index e165059ae6..c4220834cd 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -67,7 +67,7 @@ <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen." > <!ENTITY torPreferences.learnMore "Lär dig mer"> <!ENTITY torPreferences.quickstart "Snabbstart"> -<!ENTITY torPreferences.quickstartDescription ""> +<!ENTITY torPreferences.quickstartDescription "Snabbstart låter Tor Browser ansluta automatiskt."> <!ENTITY torPreferences.quickstartCheckbox "Anslut alltid automatiskt"> <!ENTITY torPreferences.bridges "Broar"> <!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan.">

1 0