March 2016 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 9dd46bb87815f6e0c7633c899e988c0a149812ee Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:16 2016 +0000 Update translations for https_everywhere --- ca/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index c547f3a..6b012d6 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "Xifra la Web! Fes servir automàticament la seguretat HTTPS a molts llocs."> <!ENTITY https-everywhere.about.version "Versió"> <!ENTITY https-everywhere.about.created_by "Creat per"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> <!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">

1 0

[tor-messenger-build/master] Remove upstreamed patch in ESR45
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 60682d0e969831342fe013a7c104d9a3f8f02948 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 22:23:01 2016 -0700 Remove upstreamed patch in ESR45 --- projects/instantbird/config | 1 - projects/instantbird/trac-17552.patch | 92 ----------------------------------- 2 files changed, 93 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 67672bb..abc8610 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -71,7 +71,6 @@ input_files: - filename: xmppRegister.js - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch - - filename: trac-17552.patch - filename: trac-16489.patch - filename: trac-17896.patch - filename: trac-17494.patch diff --git a/projects/instantbird/trac-17552.patch b/projects/instantbird/trac-17552.patch deleted file mode 100644 index 442bbe9..0000000 --- a/projects/instantbird/trac-17552.patch +++ /dev/null @@ -1,92 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1446953889 28800 -# Sat Nov 07 19:38:09 2015 -0800 -# Node ID a42c96a62dee7a73910de738a9809d8247aede8c -# Parent 492c769c46c9ea9e54fab00d6f0310afd100885a -Ensure isMuc when attempting a subject change - -diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm ---- a/chat/protocols/xmpp/xmpp.jsm -+++ b/chat/protocols/xmpp/xmpp.jsm -@@ -1343,16 +1343,17 @@ const XMPPAccountPrototype = { - - return null; - }, - - /* Called when a message stanza is received */ - onMessageStanza: function(aStanza) { - let from = aStanza.attributes["from"]; - let norm = this.normalize(from); -+ let isMuc = this._mucs.has(norm); - - let type = aStanza.attributes["type"]; - let body; - let b = aStanza.getElement(["body"]); - if (b) { - // If there's a <body> child we have more than just typing notifications. - // Prefer HTML (in <html><body>) and use plain text (<body>) as fallback. - let htmlBody = aStanza.getElement(["html", "body"]); -@@ -1362,17 +1363,21 @@ const XMPPAccountPrototype = { - // Even if the message is in plain text, the prplIMessage - // should contain a string that's correctly escaped for - // insertion in an HTML document. - body = TXTToHTML(b.innerText); - } - } - - let subject = aStanza.getElement(["subject"]); -- if (subject) { -+ // Ignore subject when !isMuc. We're being permissive about subject changes -+ // in the comment below, so we need to be careful about where that makes -+ // sense. Psi+'s OTR plugin includes a subject and body in its message -+ // stanzas. -+ if (subject && isMuc) { - // XEP-0045 (7.2.16): Check for a subject element in the stanza and update - // the topic if it exists. - // We are breaking the spec because only a message that contains a - // <subject/> but no <body/> element shall be considered a subject change - // for MUC, but we ignore that to be compatible with ejabberd versions - // before 15.06. - let muc = this._mucs.get(norm); - let nick = this._parseJID(from).resource; -@@ -1386,18 +1391,18 @@ const XMPPAccountPrototype = { - let delay = aStanza.getElement(["delay"]); - if (delay && delay.uri == Stanza.NS.delay) { - if (delay.attributes["stamp"]) - date = new Date(delay.attributes["stamp"]); - } - if (date && isNaN(date)) - date = undefined; - if (type == "groupchat" || -- (type == "error" && this._mucs.has(norm) && !this._conv.has(from))) { -- if (!this._mucs.has(norm)) { -+ (type == "error" && isMuc && !this._conv.has(from))) { -+ if (!isMuc) { - this.WARN("Received a groupchat message for unknown MUC " + norm); - return; - } - let muc = this._mucs.get(norm); - muc.incomingMessage(body, aStanza, date); - return; - } - -@@ -1454,17 +1459,17 @@ const XMPPAccountPrototype = { - if (state) { - this.DEBUG(state); - if (state == "composing") - typingState = Ci.prplIConvIM.TYPING; - else if (state == "paused") - typingState = Ci.prplIConvIM.TYPED; - } - let convName = norm; -- if (this._mucs.has(norm)) -+ if (isMuc) - convName = from; - let conv = this._conv.get(convName); - if (!conv) - return; - conv.updateTyping(typingState, conv.shortName); - conv.supportChatStateNotifications = !!state; - }, -

1 0

[snowflake/master] Update proxy readme for npm
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 422717f36f0e4463085166545b939457786387ea Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 20:46:52 2016 -0700 Update proxy readme for npm --- proxy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index 5b5761d..0398d3d 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -11,9 +11,9 @@ See [keroserene.net/snowflake](http://keroserene.net/snowflake) for more info: Unit testing with Jasmine are available with: ``` -cake test +npm install +npm test ``` -Requires jasmine. (`npm install -g jasmine`) To run locally, either: - Navigate to `proxy/build/embed.html`

1 0

[snowflake/master] Run client tests in travis too
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 9867730e34ae1105ee98274de7ce2e37ecbc7b14 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 18:16:51 2016 -0700 Run client tests in travis too --- .travis.yml | 40 +++++++++++++++++++++++++++------------- proxy/package.json | 22 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec7038a..0f72040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,36 @@ language: go +sudo: required +dist: trusty + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + - gcc-5 + go: - - 1.5 - - 1.6 + - 1.6 env: - - TRAVIS_NODE_VERSION="4.1" + - TRAVIS_NODE_VERSION="4.2" CC="gcc-5" CXX="g++-5" -install: - - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION - - go get -u github.com/smartystreets/goconvey +before_install: + - nvm install $TRAVIS_NODE_VERSION -before_script: - npm install -g coffee-script coffeelint jasmine +install: + - go get -u github.com/smartystreets/goconvey + - go get -u github.com/keroserene/go-webrtc + - go get -u git.torproject.org/pluggable-transports/goptlib.git + - pushd proxy + - npm install + - popd script: - - make check - - go test -v -race ./broker - - cd proxy - - cake lint - - cake test + - make check + - go test -v -race ./broker ./client + - cd proxy + - npm run-script lint + - npm test diff --git a/proxy/package.json b/proxy/package.json new file mode 100644 index 0000000..0a23eb4 --- /dev/null +++ b/proxy/package.json @@ -0,0 +1,22 @@ +{ + "name": "snowflake-pt", + "version": "0.0.0-git", + "description": "WebRTC Pluggable Transport", + "main": "snowflake.coffee", + "directories": { + "test": "test" + }, + "scripts": { + "test": "cake test", + "lint": "cake lint" + }, + "author": "Serene Han", + "license": "BSD-3-Clause", + "devDependencies": { + "coffeelint": "^1.15.0", + "jasmine": "^2.4.1" + }, + "dependencies": { + "coffee-script": "^1.10.0" + } +}

1 0

[snowflake/master] prepare for multiplexed snowflake (#11)
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 5e318b62199401b5ee82f8ce3ba3c05198f0ba8c Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Mar 12 22:29:56 2016 -0800 prepare for multiplexed snowflake (#11) --- proxy/broker.coffee | 2 +- proxy/proxypair.coffee | 11 +++++++---- proxy/snowflake.coffee | 20 +++++++++----------- proxy/spec/snowflake.spec.coffee | 6 +++--- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 71c3186..78577e7 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -33,7 +33,7 @@ class Broker @url += '/' if '/' != @url.substr -1 # Promises some client SDP Offer. - # Registers this Snowfalke with the broker using an HTTP POST request, and + # Registers this Snowflake with the broker using an HTTP POST request, and # waits for a response containing some client offer that the Broker chooses # for this proxy.. # TODO: Actually support multiple clients. diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index b8db513..c6478cb 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -8,15 +8,17 @@ Represents a single: class ProxyPair MAX_BUFFER: 10 * 1024 * 1024 - pc: null + pc: null c2rSchedule: [] r2cSchedule: [] - client: null # WebRTC Data channel - relay: null # websocket - running: true + client: null # WebRTC Data channel + relay: null # websocket + running: true + active: false # Whether serving a client. flush_timeout_id: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> + @active = false # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> @@ -51,6 +53,7 @@ class ProxyPair log 'Invalid SDP message.' return false dbg 'SDP ' + offer.type + ' successfully received.' + @active = true true prepareDataChannel: (channel) => diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 4a98472..31a553f 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -51,10 +51,7 @@ CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." class Snowflake relayAddr: null - # TODO: Actually support multiple ProxyPairs. (makes more sense once meek- - # signalling is ready) proxyPairs: [] - proxyPair: null rateLimit: null state: MODE.INIT @@ -86,7 +83,6 @@ class Snowflake @state = MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr - @proxyPair = @proxyPairs[0] return if COPY_PASTE_ENABLED timer = null # Temporary countdown. @@ -114,17 +110,19 @@ class Snowflake findClients() - # Receive an SDP offer from some client assigned by the Broker. + # Receive an SDP offer from some client assigned by the Broker, receiveOffer: (desc) => sdp = new RTCSessionDescription desc - if @proxyPair.receiveWebRTCOffer sdp - @sendAnswer() if 'offer' == sdp.type + # Use the first proxyPair that's available. + pair = @proxyPairs.find (pp, i, arr) -> return !pp.active + if pair.receiveWebRTCOffer sdp + @sendAnswer pair if 'offer' == sdp.type - sendAnswer: => - next = (sdp) => + sendAnswer: (pair) -> + next = (sdp) -> dbg 'webrtc: Answer ready.' - @proxyPair.pc.setLocalDescription sdp - promise = @proxyPair.pc.createAnswer next + pair.pc.setLocalDescription sdp + promise = pair.pc.createAnswer next promise.then next if promise makeProxyPair: (relay) -> diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 9b63419..ca7661b 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -49,10 +49,10 @@ describe 'Snowflake', -> it 'receives SDP offer', -> s = new Snowflake(new FakeBroker(), fakeUI) - s.proxyPair = { receiveWebRTCOffer: -> } - spyOn(s.proxyPair, 'receiveWebRTCOffer').and.returnValue true + s.proxyPairs[0] = { receiveWebRTCOffer: -> } + spyOn(s.proxyPairs[0], 'receiveWebRTCOffer').and.returnValue true spyOn(s, 'sendAnswer') - s.receiveOffer 'foo' + s.receiveOffer { 'type': 'offer', 'sdp': 'foo' } expect(s.sendAnswer).toHaveBeenCalled() it 'can make a proxypair', ->

1 0

[snowflake/master] simplify proxypair relay onclose
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 3339b9f172c742cf9fbdaf64cb61bf32fb0070d0 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Mar 13 22:58:11 2016 -0700 simplify proxypair relay onclose --- proxy/proxypair.coffee | 51 ++++++++++++++++++++++---------------------------- proxy/snowflake.coffee | 8 ++------ 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index c6478cb..db53612 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -16,6 +16,7 @@ class ProxyPair running: true active: false # Whether serving a client. flush_timeout_id: null + onCleanup: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> @active = false @@ -56,6 +57,7 @@ class ProxyPair @active = true true + # Given a WebRTC DataChannel, prepare callbacks. prepareDataChannel: (channel) => channel.onopen = => log 'WebRTC DataChannel opened!' @@ -64,12 +66,14 @@ class ProxyPair # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() - channel.onclose = -> + channel.onclose = => log 'WebRTC DataChannel closed.' snowflake.ui.setStatus 'disconnected by webrtc.' snowflake.ui.setActive false snowflake.state = MODE.INIT - # Change this for multiplexing. + @flush() + @close() + # TODO: Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' channel.onmessage = @onClientToRelayMessage @@ -82,7 +86,14 @@ class ProxyPair @relay.onopen = => log @relay.label + ' connected!' snowflake.ui.setStatus 'connected' - @relay.onclose = @onClose + @relay.onclose = (event) => + ws = event.target + log ws.label + ' closed.' + snowflake.ui.setStatus 'disconnected.' + snowflake.ui.setActive false + snowflake.state = MODE.INIT + @flush() + @close() @relay.onerror = @onError @relay.onmessage = @onRelayToClientMessage @@ -105,47 +116,25 @@ class ProxyPair # log 'websocket-->WebRTC data: ' + event.data @flush() - onClose: (event) => - ws = event.target - log ws.label + ' closed.' - snowflake.ui.setStatus 'disconnected.' - snowflake.ui.setActive false - snowflake.state = MODE.INIT - @flush() - @maybeCleanup() - onError: (event) => ws = event.target log ws.label + ' error.' @close() - # we can't rely on onclose_callback to cleanup, since one common error - # case is when the client fails to connect and the relay never starts. - # in that case close() is a NOP and onclose_callback is never called. - @maybeCleanup() - webrtcIsReady: -> null != @client && 'open' == @client.readyState - relayIsReady: -> (null != @relay) && (WebSocket.OPEN == @relay.readyState) - isClosed: (ws) -> undefined == ws || WebSocket.CLOSED == ws.readyState + # Close both WebRTC and websocket. close: -> + @running = false @client.close() if @webrtcIsReady() @relay.close() if @relayIsReady() relay = null - maybeCleanup: => - if @running - @running = false - # TODO: Call external callback - true - false - - # Send as much data as the rate limit currently allows. + # Send as much data in both directions as the rate limit currently allows. flush: => clearTimeout @flush_timeout_id if @flush_timeout_id @flush_timeout_id = null busy = true checkChunks = => busy = false - # WebRTC --> websocket if @relayIsReady() && @relay.bufferedAmount < @MAX_BUFFER && @@ -154,7 +143,6 @@ class ProxyPair @rateLimit.update chunk.length @relay.send chunk busy = true - # websocket --> WebRTC if @webrtcIsReady() && @client.bufferedAmount < @MAX_BUFFER && @@ -170,3 +158,8 @@ class ProxyPair (@relayIsReady() && @relay.bufferedAmount > 0) || (@webrtcIsReady() && @client.bufferedAmount > 0) @flush_timeout_id = setTimeout @flush, @rateLimit.when() * 1000 + + webrtcIsReady: -> null != @client && 'open' == @client.readyState + relayIsReady: -> (null != @relay) && (WebSocket.OPEN == @relay.readyState) + isClosed: (ws) -> undefined == ws || WebSocket.CLOSED == ws.readyState + diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 31a553f..e8c00aa 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -131,13 +131,9 @@ class Snowflake pair.onCleanup = (event) => # Delete from the list of active proxy pairs. @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) - try - pair.begin() - catch err - log 'ERROR: ProxyPair exception while connecting.' - log err - return + pair.begin() + # Stop all proxypairs. cease: -> while @proxyPairs.length > 0 @proxyPairs.pop().close()

1 0

[snowflake/master] clarify webRTCConn errorChannel and error handling
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit ba7b59f80e544bc8518366495c94040c3425c04c Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Mar 10 17:14:36 2016 -0800 clarify webRTCConn errorChannel and error handling --- client/webrtc.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/client/webrtc.go b/client/webrtc.go index d4c0272..af32ddd 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -81,6 +81,8 @@ func NewWebRTCConnection(config *webrtc.Configuration, connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription, 1) connection.answerChannel = make(chan *webrtc.SessionDescription, 1) + // Error channel is mostly for reporting during the initial SDP offer + // creation & local description setting, which happens asynchronously. connection.errorChannel = make(chan error, 1) connection.reset = make(chan struct{}, 1) @@ -103,8 +105,12 @@ func (c *webRTCConn) ConnectLoop() { log.Println("Establishing WebRTC connection...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. - c.preparePeerConnection() - err := c.establishDataChannel() + err := c.preparePeerConnection() + if err != nil { + log.Println("WebRTC: Could not create PeerConnection.") + break + } + err = c.establishDataChannel() if err != nil { log.Println("WebRTC: Could not establish DataChannel.") } else { @@ -115,18 +121,19 @@ func (c *webRTCConn) ConnectLoop() { <-time.After(time.Second * 1) c.cleanup() } + log.Println("WebRTC cannot connect.") } // Create and prepare callbacks on a new WebRTC PeerConnection. -func (c *webRTCConn) preparePeerConnection() { +func (c *webRTCConn) preparePeerConnection() error { if nil != c.pc { c.pc.Close() c.pc = nil } pc, err := webrtc.NewPeerConnection(c.config) if err != nil { - log.Printf("NewPeerConnection: %s", err) - c.errorChannel <- err + log.Printf("NewPeerConnection ERROR: %s", err) + return err } // Prepare PeerConnection callbacks. pc.OnNegotiationNeeded = func() { @@ -162,6 +169,7 @@ func (c *webRTCConn) preparePeerConnection() { } c.pc = pc log.Println("WebRTC: PeerConnection created.") + return nil } // Create a WebRTC DataChannel locally. @@ -174,7 +182,7 @@ func (c *webRTCConn) establishDataChannel() error { // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen". if err != nil { - log.Printf("CreateDataChannel: %s", err) + log.Printf("CreateDataChannel ERROR: %s", err) return err } dc.OnOpen = func() { @@ -276,8 +284,8 @@ func (c *webRTCConn) exchangeSDP() error { log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err := c.pc.SetRemoteDescription(answer) if nil != err { - log.Println("webrtc: Unable to SetRemoteDescription:", err) - // c.errorChannel <- err + log.Println("WebRTC: Unable to SetRemoteDescription:", err) + return err } return nil }

1 0

[snowflake/master] begin FAQ section for readme
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 6b5a36ac8473082531463f83d9bcc6aa99762420 Author: Serene Han <keroserene+git(a)gmail.com> Date: Fri Mar 11 20:06:14 2016 -0800 begin FAQ section for readme --- README.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 714055b..b909df5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/keroserene/snowflake.svg?branch=master)](http… -A Pluggable Transport using WebRTC +A Pluggable Transport using WebRTC, inspired by Flashproxy   @@ -97,6 +97,41 @@ python -m http.server Then, open a browser tab to `0.0.0.0:8000/snowflake.html`, which causes you to act as an ephemeral Tor bridge. +### FAQ + +**Q: How does it work?** + +In the Tor use-case: + +1. Volunteers visit websites which host the "snowflake" proxy. (just +like flashproxy) +2. Tor clients automatically find available browser proxies via the Broker +(the domain fronted signaling channel). +3. Tor client and browser proxy establish a WebRTC peer connection. +4. Proxy connects to some relay. +5. Tor occurs. + +More detailed information about how clients, snowflake proxies, and the Broker +fit together on the way... + +**Q: What are the benefits of this PT compared with other PTs?** + +Snowflake combines the advantages of flashproxy and meek. Primarily: + +- It has the convenience of Meek, but can support magnitudes more +users with negligible CDN costs. (Domain fronting is only used for brief +signalling / NAT-piercing to setup the P2P WebRTC DataChannels which handle +the actual traffic.) + +- Arbitrarily high numbers of volunteer proxies are possible like in +flashproxy, but NATs are no longer a usability barrier - no need for +manual port forwarding! + +**Q: Why is this called Snowflake?** + +It utilizes the "ICE" negotiation via WebRTC, and also involves a great +abundance of ephemeral and short-lived (and special!) volunteer proxies... + ### Appendix ##### -- Testing directly via WebRTC Server --

1 0

[snowflake/master] more informative broker error messages (close #26)
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit f91b8faa0aef760a9356f02bbb412304d7e09e78 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Mar 9 14:37:29 2016 -0800 more informative broker error messages (close #26) --- client/rendezvous.go | 24 ++++++++++++++++-------- client/webrtc.go | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/client/rendezvous.go b/client/rendezvous.go index 29969f0..b764bc3 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -69,13 +69,21 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( } defer resp.Body.Close() log.Printf("BrokerChannel Response:\n%s\n\n", resp.Status) - if http.StatusOK != resp.StatusCode { - return nil, errors.New("no answer from broker.") - } - body, err := ioutil.ReadAll(resp.Body) - if nil != err { - return nil, err + + switch resp.StatusCode { + case http.StatusOK: + body, err := ioutil.ReadAll(resp.Body) + if nil != err { + return nil, err + } + answer := webrtc.DeserializeSessionDescription(string(body)) + return answer, nil + + case http.StatusServiceUnavailable: + return nil, errors.New("No snowflake proxies currently available.") + case http.StatusBadRequest: + return nil, errors.New("You sent an invalid offer in the request.") + default: + return nil, errors.New("Unexpected error, no answer.") } - answer := webrtc.DeserializeSessionDescription(string(body)) - return answer, nil } diff --git a/client/webrtc.go b/client/webrtc.go index a77d4a8..d4c0272 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -237,7 +237,7 @@ func (c *webRTCConn) sendOfferToBroker() { "\nFront URL: ", frontDomain) answer, err := c.broker.Negotiate(offer) if nil != err || nil == answer { - log.Printf("BrokerChannel error: %s", err) + log.Printf("BrokerChannel Error: %s", err) answer = nil } c.answerChannel <- answer

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 14 Mar '16

14 Mar '16

commit befc9877ecc64d3ad9164b997a7ddc4a2cff0803 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 14 21:45:47 2016 +0000 Update translations for tails-misc --- fa.po | 86 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/fa.po b/fa.po index a9f47fc..477b1da 100644 --- a/fa.po +++ b/fa.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-25 18:23+0000\n" +"POT-Creation-Date: 2016-03-07 18:07+0100\n" +"PO-Revision-Date: 2016-03-14 21:32+0000\n" "Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,30 +54,30 @@ msgid "" "</p>\n" msgstr "<h1>برای رفع ایراد نرم‌افزاری به ما کمک کنید!</h1>\n\n<p><a href=\"%s\">راهنمای گزارش ایرادهای نرم‌افزاری ما</a> را بخوانید</p>\n\n<p><strong>Do not include more personal information than\n\nneeded!</strong></p>\n\n<h2>درباره‌ی ارائه‌ی یک آدرس رایانامه (ایمیل) به ما</h2>\n\n<p>\n\nGiving us an email address allows us to contact you to clarify the problem. This\n\nis needed for the vast majority of the reports we receive as most reports\n\nwithout any contact information are useless. On the other hand it also provides\n\nan opportunity for eavesdroppers, like your email or Internet provider, to\n\nconfirm that you are using Tails.\n\n</p>\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "اصرار است برای غیرفعال بودن Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "هنگامی که شما راه اندازی مجدد Tails، همه داده های Electrum از دست خواهد رفت، از جمله کیف پول بیتکوین خود را. این است که به شدت توصیه می شود به تنهایی اجرا شود Electrum هنگامی که ویژگی تداوم آن فعال می شود." -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "آیا شما می خواهید برای شروع های Electrum به هر حال؟" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "اجرا" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "خروج" @@ -235,11 +235,11 @@ msgstr "خروجی GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "سایر پیغام‌هایی که GnuPG ارائه کرده است:" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The <b>Claws Mail</b> persistence feature is activated." msgstr "" -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in <b>Claws Mail</b>, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -320,40 +320,40 @@ msgstr "این نسخه از Tails این مشکلات امنیت شناخته msgid "Known security issues" msgstr "مسائل امنیتی شناخته شده" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "کارت شبکهٔ ${nic} غیرفعال است" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "شبکه غیرفعال شده است" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "خطا :" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "خطا" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "<b>Not enough memory available to check for upgrades.</b>\n" "\n" @@ -378,7 +378,7 @@ msgstr "هم سیستم میزبان و هم نرم افزار مجازی ساز #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" -msgstr "" +msgstr "هشدار: ماشین مجازی غیر آزاد شناسایی شد!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" @@ -390,54 +390,54 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 msgid "Learn more" -msgstr "" +msgstr "بیشتر بدانید" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "تور آماده نیست" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "تور آماده نیست. مرورگر تور به هر حال اجرا شود؟" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "اجرای مرورگر تور" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "لغو" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "آیا واقعا قصد دارید که مرورگر نا امن را اجرا کنید؟" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "در حال اجرای مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "این ممکن است مدتی طول بکشد, بنابراین لطفا شکیبا باشید." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "در حال بستن مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "ممکن است مدتی طول بکشد. تا زمانی که به درستی خاموش شود لطفا مرورگر ناامن را ری استارت نکنید" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "عدم موفقیت در ری استارت کردن Tor" @@ -476,40 +476,40 @@ msgstr "پیکربندی مرورگر ناموفق بود." msgid "Failed to run browser." msgstr "اجرای مرورگر ناموفق بود." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2P نتوانست شروع کند" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "در زمان شروع به کار I2P اشکالی پیش آمد.برای اطلاعات بیشتر گزارش‌ وقایع را در /var/log/i2p بررسی کنید." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "صفحه تنظیمات مسیریاب I2P آماده است." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "شما هم اکنون می توانید دسترسی داشته باشید به کنسول روتر I2P در مرورگر I2P" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P آماده نیست." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "تونل اپسایت در ۶ دقیقه درست نشد. کنسول روتر را در مرورگر I2P بررسی کنید و یا برای اطلاعات بیش‌تر، گزارش موجود در آدرس /var/log/i2p را بینید. برای تلاش مجدد، دوباره به شبکه‌ی تور متصل شوید." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P آماده است." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "حالا شما می توانید به سرویس های روی I2P دسترسی داشته باشید."

1 0