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

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit a1e04e644b9b2d5f432732f8d48571b1c916ccc4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 19:15:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ru/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index 6e607bab4..d38920d1a 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -34,4 +34,4 @@  <!ENTITY aboutTor.ey2019.mozilla "Пожертвуйте сегодня и Mozilla удвоит ваше пожертвование."> <!ENTITY aboutTor.ey2019.tracking "Отслеживание, наблюдение и цензура широко распространены в интернете."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.takeback "Верните себе интернет вместе с Tor">

1 0

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

31 Oct '19

commit a116e5cff27b47588b1d6d6b4a735ceb1288c331 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 18:50:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 2e3b5a9a5..027f9b4a7 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -2081,6 +2081,9 @@ msgid "" "censoring connections to the Tor network. Read the " "[Circumvention](/circumvention) section for possible solutions." msgstr "" +"Se você continua não conseguindo se conectar, seu Provedor de Serviço " +"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção de " +"[Circumentação](/circumvention) para possíveis soluções." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit 2d958b81193ab85cce768609523684512b8c29e6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 17:23:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 32e2cb6bd..9150b096e 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -5655,12 +5655,12 @@ msgstr "" #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.title) msgid "Why isn't my relay being used more?" -msgstr "" +msgstr "Por que meu relay não está sendo usada mais vezes?" #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) msgid "If your relay is relatively new then give it time." -msgstr "" +msgstr "Se seu relay é relativamente novo, aguarde um momento." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -5689,7 +5689,7 @@ msgstr "" #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.title) msgid "My relay is picking the wrong IP address." -msgstr "" +msgstr "Meu relay está pegando o endereço IP incorreto." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit b2d31c850fe9ecbbfdb7b0cff4dcf100eb0ffe7f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 16:53:38 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 12b0a383c..32e2cb6bd 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -8826,6 +8826,8 @@ msgid "" "You can ask questions in the empty bar at the bottom of the screen. Please, " "don't ask to ask, just ask your question." msgstr "" +"Você pode fazer perguntas na barra vazia da parte inferior da tela. Por " +"favor, não peça para perguntar, simplesmente pergunte." #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) @@ -8834,6 +8836,10 @@ msgid "" "(some people are listed on the channel but are away from their keyboards and" " record channel activities to read later)." msgstr "" +"As pessoas podem te responder imediatamente, ou talvez haja alguma demora " +"(algumas pessoas estão listadas no canal mas não se encontram próximas dos " +"seus teclados, e optam por gravar as atividades do canal para checá-las mais" +" tarde)." #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) @@ -8842,16 +8848,19 @@ msgid "" "nick and they will typically receive a notification that someone is trying " "to contact them." msgstr "" +"Se quiser conversar com alguém específico, inicie a mensagem com o apelido " +"dessa pessoa, assim ela receberá a notificação de que alguém está tentando " +"contatá-la." #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) msgid "You should also consider to use an IRC client." -msgstr "" +msgstr "Recomenda-se considerar o uso de um cliente IRC." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.title) msgid "Why I can't join Tor-dev and other channels?" -msgstr "" +msgstr "Por que não consigo me juntar ao Tor-dev e outros canais?" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8861,11 +8870,16 @@ msgid "" "hand. You are also welcome to join this channel. To access #tor-project, " "your nickname (nick) must be registered and verified." msgstr "" +"O canal #tor-project é onde as pessoas discutem e coordenam o trabalho " +"diário do Tor. Há menos membros do que em #tor e é mais focado no trabalho " +"prático. Você também pode se juntar a este canal. Para acessar #tor-project," +" seu apelido (nick) deve ser registrado e verificado." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Here's how to reach #tor-project and other registered channels." msgstr "" +"Aqui você encontra como acessar #tor-project e outros canais registrados." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description)

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit c3d0acf94b6462ee9ec0396fc0222560cd24da37 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 16:45:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- zh-CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd index 469bdd1a5..f0468fbff 100644 --- a/zh-CN/aboutTor.dtd +++ b/zh-CN/aboutTor.dtd @@ -34,4 +34,4 @@  <!ENTITY aboutTor.ey2019.mozilla "现在捐款， Mozilla 会匹配你的捐赠。"> <!ENTITY aboutTor.ey2019.tracking "跟踪，监视和审查在网上广泛存在。"> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.takeback "使用 Tor 夺回互联网">

1 0

[snowflake/master] Remove "active" property of proxyPairs
by cohosh＠torproject.org 31 Oct '19

31 Oct '19

commit 789285e0dfe69474b2876a79f82784ad2892d8c4 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 18 17:28:53 2019 -0400 Remove "active" property of proxyPairs Use their existence in the proxy pair list to indicate they are active. --- proxy/proxypair.js | 9 --------- proxy/snowflake.js | 58 +++++++++++++++++++++++------------------------------- 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 64eafdc..52594e9 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -85,9 +85,6 @@ class ProxyPair { prepareDataChannel(channel) { channel.onopen = () => { log('WebRTC DataChannel opened!'); - if (!this.active) { - return; - } snowflake.ui.setActive(true); // This is the point when the WebRTC datachannel is done, so the next step // is to establish websocket to the server. @@ -179,17 +176,13 @@ class ProxyPair { if (this.webrtcIsReady()) { this.client.close(); } - this.client = null; if (this.peerConnOpen()) { this.pc.close(); } - this.pc = null; if (this.relayIsReady()) { this.relay.close(); } - this.relay = null; this.onCleanup(); - this.active = false; } flush() { @@ -253,8 +246,6 @@ ProxyPair.prototype.relay = null; // websocket ProxyPair.prototype.timer = 0; -ProxyPair.prototype.active = false; // Whether serving a client. - ProxyPair.prototype.flush_timeout_id = null; ProxyPair.prototype.onCleanup = null; diff --git a/proxy/snowflake.js b/proxy/snowflake.js index c647b4e..c914520 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -43,10 +43,6 @@ class Snowflake { // Initialize WebRTC PeerConnection, which requires beginning the signalling // process. |pollBroker| automatically arranges signalling. beginWebRTC() { - log('ProxyPair Slots: ' + this.proxyPairs.length); - log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) { - return p.id; - })).join(' | ')); this.pollBroker(); return this.pollInterval = setInterval((() => { return this.pollBroker(); @@ -58,13 +54,13 @@ class Snowflake { pollBroker() { var msg, pair, recv; // Poll broker for clients. - pair = this.nextAvailableProxyPair(); + pair = this.makeProxyPair(); if (!pair) { log('At client capacity.'); return; } + log('Polling broker..'); // Do nothing until a new proxyPair is available. - pair.active = true; msg = 'Polling for client ... '; if (this.retries > 0) { msg += '[retries: ' + this.retries + ']'; @@ -72,35 +68,23 @@ class Snowflake { this.ui.setStatus(msg); recv = this.broker.getClientOffer(pair.id); recv.then((desc) => { - if (pair.active) { - if (!this.receiveOffer(pair, desc)) { - return pair.active = false; - } - //set a timeout for channel creation - return setTimeout((() => { - if (!pair.webrtcIsReady()) { - log('proxypair datachannel timed out waiting for open'); - pair.close(); - return pair.active = false; - } - }), 20000); // 20 second timeout + if (!this.receiveOffer(pair, desc)) { + return pair.close(); } + //set a timeout for channel creation + return setTimeout((() => { + if (!pair.webrtcIsReady()) { + log('proxypair datachannel timed out waiting for open'); + return pair.close(); + } + }), 20000); // 20 second timeout }, function() { - return pair.active = false; + //on error, close proxy pair + return pair.close(); }); return this.retries++; } - // Returns the first ProxyPair that's available to connect. - nextAvailableProxyPair() { - if (this.proxyPairs.length < this.config.connectionsPerClient) { - return this.makeProxyPair(this.relayAddr); - } - return this.proxyPairs.find(function(pp) { - return !pp.active; - }); - } - receiveOffer(pair, desc) { var e, offer, sdp; try { @@ -127,19 +111,27 @@ class Snowflake { return pair.pc.setLocalDescription(sdp).catch(fail); }; fail = function() { - pair.active = false + pair.close(); return dbg('webrtc: Failed to create or set Answer'); }; return pair.pc.createAnswer().then(next).catch(fail); } - makeProxyPair(relay) { + makeProxyPair() { + if (this.proxyPairs.length >= this.config.connectionsPerClient) { + return null; + } var pair; - pair = new ProxyPair(relay, this.rateLimit, this.config.pcConfig); + pair = new ProxyPair(this.relayAddr, this.rateLimit, this.config.pcConfig); this.proxyPairs.push(pair); + + log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) { + return p.id; + })).join(' | ')); + pair.onCleanup = () => { var ind; - // Delete from the list of active proxy pairs. + // Delete from the list of proxy pairs. ind = this.proxyPairs.indexOf(pair); if (ind > -1) { return this.proxyPairs.splice(ind, 1);

1 0

[snowflake/master] Moved function comments to their definitions
by cohosh＠torproject.org 31 Oct '19

31 Oct '19

commit 64b66c855fe35d2e56fca7510e913482cdb85793 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 18 17:48:45 2019 -0400 Moved function comments to their definitions Increase readability of code a bit, the function descriptions were automatically placed in the constructor when we moved from coffeescript. --- proxy/broker.js | 15 ++++++++------- proxy/proxypair.js | 16 ++++++---------- proxy/snowflake.js | 9 +++------ 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/proxy/broker.js b/proxy/broker.js index 9806e76..7b5b7e4 100644 --- a/proxy/broker.js +++ b/proxy/broker.js @@ -15,15 +15,9 @@ class Broker { // On construction, this Broker object does not do anything until // |getClientOffer| is called. constructor(url) { - // Promises some client SDP Offer. - // 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. this.getClientOffer = this.getClientOffer.bind(this); - // urlSuffix for the broker is different depending on what action - // is desired. this._postRequest = this._postRequest.bind(this); + this.url = url; this.clients = 0; if (0 === this.url.indexOf('localhost', 0)) { @@ -38,6 +32,11 @@ class Broker { } } + // Promises some client SDP Offer. + // 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. getClientOffer(id) { return new Promise((fulfill, reject) => { var xhr; @@ -87,6 +86,8 @@ class Broker { return this._postRequest(id, xhr, 'answer', JSON.stringify(answer)); } + // urlSuffix for the broker is different depending on what action + // is desired. _postRequest(id, xhr, urlSuffix, payload) { var err; try { diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 52594e9..25eaa9d 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -17,17 +17,13 @@ class ProxyPair { - @rateLimit specifies a rate limit on traffic */ constructor(relayAddr, rateLimit, pcConfig) { - // Given a WebRTC DataChannel, prepare callbacks. this.prepareDataChannel = this.prepareDataChannel.bind(this); - // Assumes WebRTC datachannel is connected. this.connectRelay = this.connectRelay.bind(this); - // WebRTC --> websocket this.onClientToRelayMessage = this.onClientToRelayMessage.bind(this); - // websocket --> WebRTC this.onRelayToClientMessage = this.onRelayToClientMessage.bind(this); this.onError = this.onError.bind(this); - // Send as much data in both directions as the rate limit currently allows. this.flush = this.flush.bind(this); + this.relayAddr = relayAddr; this.rateLimit = rateLimit; this.pcConfig = pcConfig; @@ -82,6 +78,7 @@ class ProxyPair { return true; } + // Given a WebRTC DataChannel, prepare callbacks. prepareDataChannel(channel) { channel.onopen = () => { log('WebRTC DataChannel opened!'); @@ -104,6 +101,7 @@ class ProxyPair { return channel.onmessage = this.onClientToRelayMessage; } + // Assumes WebRTC datachannel is connected. connectRelay() { var params, peer_ip, ref; dbg('Connecting to relay...'); @@ -148,12 +146,14 @@ class ProxyPair { }), 5000); } + // WebRTC --> websocket onClientToRelayMessage(msg) { dbg('WebRTC --> websocket data: ' + msg.data.byteLength + ' bytes'); this.c2rSchedule.push(msg.data); return this.flush(); } + // websocket --> WebRTC onRelayToClientMessage(event) { dbg('websocket --> WebRTC data: ' + event.data.byteLength + ' bytes'); this.r2cSchedule.push(event.data); @@ -185,6 +185,7 @@ class ProxyPair { this.onCleanup(); } + // Send as much data in both directions as the rate limit currently allows. flush() { var busy, checkChunks; if (this.flush_timeout_id) { @@ -239,15 +240,10 @@ class ProxyPair { ProxyPair.prototype.MAX_BUFFER = 10 * 1024 * 1024; ProxyPair.prototype.pc = null; - ProxyPair.prototype.client = null; // WebRTC Data channel - ProxyPair.prototype.relay = null; // websocket ProxyPair.prototype.timer = 0; - ProxyPair.prototype.flush_timeout_id = null; ProxyPair.prototype.onCleanup = null; - -ProxyPair.prototype.id = null; diff --git a/proxy/snowflake.js b/proxy/snowflake.js index c914520..ba1ef03 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -16,9 +16,8 @@ class Snowflake { // Prepare the Snowflake with a Broker (to find clients) and optional UI. constructor(config, ui, broker) { - // Receive an SDP offer from some client assigned by the Broker, - // |pair| - an available ProxyPair. this.receiveOffer = this.receiveOffer.bind(this); + this.config = config; this.ui = ui; this.broker = broker; @@ -85,6 +84,8 @@ class Snowflake { return this.retries++; } + // Receive an SDP offer from some client assigned by the Broker, + // |pair| - an available ProxyPair. receiveOffer(pair, desc) { var e, offer, sdp; try { @@ -156,13 +157,9 @@ class Snowflake { } Snowflake.prototype.relayAddr = null; - Snowflake.prototype.rateLimit = null; - Snowflake.prototype.pollInterval = null; -Snowflake.prototype.retries = 0; - Snowflake.MESSAGE = { CONFIRMATION: 'You\'re currently serving a Tor user via Snowflake.' };

1 0

[snowflake/master] Remove property "running" from proxy-pair
by cohosh＠torproject.org 31 Oct '19

31 Oct '19

commit d186fcd40103913bf06358e5dd47c0c776e07534 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 18 16:58:54 2019 -0400 Remove property "running" from proxy-pair We don't need it, and already have a function webrtcIsReady that tells us what we need to know (whether a datachannel was opened before the timeout period). --- proxy/proxypair.js | 4 ---- proxy/snowflake.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 9f6a7b2..64eafdc 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -88,7 +88,6 @@ class ProxyPair { if (!this.active) { return; } - this.running = true; snowflake.ui.setActive(true); // This is the point when the WebRTC datachannel is done, so the next step // is to establish websocket to the server. @@ -191,7 +190,6 @@ class ProxyPair { this.relay = null; this.onCleanup(); this.active = false; - this.running = false; } flush() { @@ -255,8 +253,6 @@ ProxyPair.prototype.relay = null; // websocket ProxyPair.prototype.timer = 0; -ProxyPair.prototype.running = false; // Whether a datachannel is opened - ProxyPair.prototype.active = false; // Whether serving a client. ProxyPair.prototype.flush_timeout_id = null; diff --git a/proxy/snowflake.js b/proxy/snowflake.js index 78b1d0e..c647b4e 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -78,7 +78,7 @@ class Snowflake { } //set a timeout for channel creation return setTimeout((() => { - if (!pair.running) { + if (!pair.webrtcIsReady()) { log('proxypair datachannel timed out waiting for open'); pair.close(); return pair.active = false;

1 0

[snowflake/master] Removed "janky" snowflake state machine
by cohosh＠torproject.org 31 Oct '19

31 Oct '19

commit 9b470fbe4b8429070559d2e895b9be45509cdf78 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 18 15:10:03 2019 -0400 Removed "janky" snowflake state machine The only place it was used was in window.onpageunload, and we have a better way of determining if the proxy is active there (through the ui). I also removed that code from the webextension since the proxy won't stop running unless you close the browser and after testing it looks like that code doesn't notify the user anyway. --- proxy/init-badge.js | 2 +- proxy/init-testing.js | 4 ++-- proxy/init-webext.js | 12 ------------ proxy/proxypair.js | 5 +---- proxy/snowflake.js | 9 --------- proxy/spec/init.spec.js | 15 +++++++-------- 6 files changed, 11 insertions(+), 36 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index fe8cc91..2cc5b07 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -193,7 +193,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific if ( !silenceNotifications && snowflake !== null && - Snowflake.MODE.WEBRTC_READY === snowflake.state + ui.active ) { return Snowflake.MESSAGE.CONFIRMATION; } diff --git a/proxy/init-testing.js b/proxy/init-testing.js index 5b63099..90026a9 100644 --- a/proxy/init-testing.js +++ b/proxy/init-testing.js @@ -46,7 +46,7 @@ DebugUI.prototype.$status = null; Entry point. */ -var snowflake, query, debug, silenceNotifications, log, dbg, init; +var snowflake, query, debug, ui, silenceNotifications, log, dbg, init; (function() { @@ -108,7 +108,7 @@ var snowflake, query, debug, silenceNotifications, log, dbg, init; if ( !silenceNotifications && snowflake !== null && - Snowflake.MODE.WEBRTC_READY === snowflake.state + ui.active ) { return Snowflake.MESSAGE.CONFIRMATION; } diff --git a/proxy/init-webext.js b/proxy/init-webext.js index 6789ffd..ad345fa 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -193,18 +193,6 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific return snowflake.beginWebRTC(); }; - // Notification of closing tab with active proxy. - window.onbeforeunload = function() { - if ( - !silenceNotifications && - snowflake !== null && - Snowflake.MODE.WEBRTC_READY === snowflake.state - ) { - return Snowflake.MESSAGE.CONFIRMATION; - } - return null; - }; - window.onunload = function() { if (snowflake !== null) { snowflake.disable(); } return null; diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 58efa1a..9f6a7b2 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -1,4 +1,4 @@ -/* global snowflake, log, dbg, Util, PeerConnection, Snowflake, Parse, WS */ +/* global snowflake, log, dbg, Util, PeerConnection, Parse, WS */ /* Represents a single: @@ -89,7 +89,6 @@ class ProxyPair { return; } this.running = true; - snowflake.state = Snowflake.MODE.WEBRTC_READY; snowflake.ui.setActive(true); // This is the point when the WebRTC datachannel is done, so the next step // is to establish websocket to the server. @@ -99,7 +98,6 @@ class ProxyPair { log('WebRTC DataChannel closed.'); snowflake.ui.setStatus('disconnected by webrtc.'); snowflake.ui.setActive(false); - snowflake.state = Snowflake.MODE.INIT; this.flush(); return this.close(); }; @@ -139,7 +137,6 @@ class ProxyPair { log(relay.label + ' closed.'); snowflake.ui.setStatus('disconnected.'); snowflake.ui.setActive(false); - snowflake.state = Snowflake.MODE.INIT; this.flush(); return this.close(); }; diff --git a/proxy/snowflake.js b/proxy/snowflake.js index cdc59fb..78b1d0e 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -22,7 +22,6 @@ class Snowflake { this.config = config; this.ui = ui; this.broker = broker; - this.state = Snowflake.MODE.INIT; this.proxyPairs = []; if (void 0 === this.config.rateLimitBytes) { this.rateLimit = new DummyRateLimit(); @@ -44,7 +43,6 @@ class Snowflake { // Initialize WebRTC PeerConnection, which requires beginning the signalling // process. |pollBroker| automatically arranges signalling. beginWebRTC() { - this.state = Snowflake.MODE.WEBRTC_CONNECTING; log('ProxyPair Slots: ' + this.proxyPairs.length); log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) { return p.id; @@ -173,13 +171,6 @@ Snowflake.prototype.pollInterval = null; Snowflake.prototype.retries = 0; -// Janky state machine -Snowflake.MODE = { - INIT: 0, - WEBRTC_CONNECTING: 1, - WEBRTC_READY: 2 -}; - Snowflake.MESSAGE = { CONFIRMATION: 'You\'re currently serving a Tor user via Snowflake.' }; diff --git a/proxy/spec/init.spec.js b/proxy/spec/init.spec.js index 748bc86..593add9 100644 --- a/proxy/spec/init.spec.js +++ b/proxy/spec/init.spec.js @@ -6,29 +6,28 @@ var snowflake = { ui: new UI, broker: { sendAnswer: function() {} - }, - state: Snowflake.MODE.INIT + } }; describe('Init', function() { it('gives a dialog when closing, only while active', function() { silenceNotifications = false; - snowflake.state = Snowflake.MODE.WEBRTC_READY; + ui.setActive(true); var msg = window.onbeforeunload(); - expect(snowflake.state).toBe(Snowflake.MODE.WEBRTC_READY); + expect(ui.active).toBe(true); expect(msg).toBe(Snowflake.MESSAGE.CONFIRMATION); - snowflake.state = Snowflake.MODE.INIT; + ui.setActive(false); msg = window.onbeforeunload(); - expect(snowflake.state).toBe(Snowflake.MODE.INIT); + expect(ui.active).toBe(false); expect(msg).toBe(null); }); it('does not give a dialog when silent flag is on', function() { silenceNotifications = true; - snowflake.state = Snowflake.MODE.WEBRTC_READY; + ui.setActive(true); var msg = window.onbeforeunload(); - expect(snowflake.state).toBe(Snowflake.MODE.WEBRTC_READY); + expect(ui.active).toBe(true); expect(msg).toBe(null); });

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit a68c430ad4a1a79d7c005d8bcca72688fdbf1bdb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 15:53:38 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 40813eb9c..12b0a383c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -8870,7 +8870,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### Register your nickname" -msgstr "" +msgstr "### Cadastre seu apelido" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8878,11 +8878,13 @@ msgid "" "1. Log onto #tor. See [How can I chat with Tor Project teams?](/get-in-touch" "/irc-help/)" msgstr "" +"1. Faça login em #tor. Veja [Como posso contatar os times do Tor Project" +"?](/get-in-touch/irc-help/)" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "2. Then, click on the word **\"Status\"** at the top left of the screen." -msgstr "" +msgstr "2. Então, clique na palavra **\"Status\"** no topo esquerdo da tela." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8890,46 +8892,55 @@ msgid "" "3. In the window at the bottom of the page, type: `/msg nickserv REGISTER " "yournewpassowrd youremailaddress`" msgstr "" +"3. Na janela, ao fim da página, digite: `/msg nickserv REGISTER suanovasenha" +" seuemail`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "4. Hit enter." -msgstr "" +msgstr "4. Pressione Enter." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "If all goes well, you will receive a message that you are registered." msgstr "" +"Se tudo correr bem, você receberá uma mensagem informando que foi registrado" +" com sucesso." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "The system may register you as your nick_ instead of your nick." msgstr "" +"O sistema pode te registrar como seu apelido_ ao invés de seu apelido." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "If so, just go with it but remember you are user_ and not user." msgstr "" +"Se este for o caso, vá assim mesmo, mas lembre-se de que você é user_, e não" +" user." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Every time you log on to IRC, to identify your registered nick, type:" msgstr "" +"Toda vez que você logar no IRC, para identificar seu apelido registrado, " +"digite:" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/nick yournick`" -msgstr "" +msgstr "`/nick seuapelido`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/msg nickserv IDENTIFY YourPassWord`" -msgstr "" +msgstr "`/msg nickserv IDENTIFY SuaSenha`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### How to verify your nickname" -msgstr "" +msgstr "### Como verificar seu apelido" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8937,6 +8948,8 @@ msgid "" "Then, to complete the registration and ultimately gain access to the #tor-" "project channel, your nickname must be **verified**." msgstr "" +"Então, para completar o registro e efetivamente obter acesso ao canal #tor-" +"project, seu apelido deve ser **verificado**." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8944,11 +8957,13 @@ msgid "" "1. To verify your nick, open a new browser window and go to " "https://services.oftc.net/login." msgstr "" +"1. Para verificar seu apelido, abra uma nova janela do navegador e vá para " +"https://services.oftc.net/login." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "2. Log in with your IRC nickname and password." -msgstr "" +msgstr "2. Faça o log in com seu apelido IRC e senha." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8957,11 +8972,14 @@ msgid "" " has happened. Look at the top of the page, and there will be a column " "called **Account**." msgstr "" +"3. Busque pela palavra **verificar** e faça log in. Pode parecer que nada " +"tenha sido feito. Observe o topo da página, e lá estará uma coluna chamada " +"**Conta**." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "4. Click on **Account**." -msgstr "" +msgstr "4. Clique em **Conta**." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8994,7 +9012,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "9. Click ENTER." -msgstr "" +msgstr "9. Pressione Enter." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9024,27 +9042,29 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Your nick is verified!" -msgstr "" +msgstr "Seu apelido foi verificado!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Now, to join #tor-project, you can just type:" -msgstr "" +msgstr "Agora, para entrar em #tor-project, você pode simplesmente digitar:" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/join #tor-project` and hit enter." -msgstr "" +msgstr "`/join #tor-project` e pressione Enter." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "You will be allowed into the channel. If so, Congratulations!" msgstr "" +"Você terá permissão para acessar o canal. Se este for o caso, parabéns!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "However, if you get stuck, you can ask for help in the #tor channel." msgstr "" +"Entretanto, se tiver dificuldades, você pode pedir ajuda no canal #tor." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9228,12 +9248,12 @@ msgstr "" #: https//support.torproject.org/apt/tor-ubuntu/ #: (content/apt/apt-2/contents+en.lrquestion.description) msgid "Please, use [Tor Debian repository](/apt/tor-deb-repo)." -msgstr "" +msgstr "Por favor, utilize o [repositório Tor Debian](/apt/tor-deb-repo)." #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.title) msgid "Can I use APT over Tor?" -msgstr "" +msgstr "Posso utilizar APT sobre o Tor?" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) @@ -9245,7 +9265,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "To use Apt over Tor, the apt transport needs to be installed:" -msgstr "" +msgstr "Para usar Apt sobre o Tor, o transporte de apt precisa ser instalado:" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description)

1 0