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

[snowflake/master] Add toggle functionality to web extension
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 799a13d3853c26b51bb2ed3c05690f6650cebec2 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 26 20:21:44 2019 -0400 Add toggle functionality to web extension --- proxy/init-webext.coffee | 12 ++++++++++++ proxy/ui.coffee | 8 ++++++++ proxy/webext/manifest.json | 3 ++- proxy/webext/popup.html | 4 ++-- proxy/webext/popup.js | 13 +++++++++++++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/proxy/init-webext.coffee b/… [View More]proxy/init-webext.coffee index 1ba6391..104384d 100644 --- a/proxy/init-webext.coffee +++ b/proxy/init-webext.coffee @@ -4,6 +4,9 @@ Entry point. debug = false snowflake = null +config = null +broker = null +ui = null # Log to both console and UI if applicable. # Requires that the snowflake and UI objects are hooked up in order to @@ -21,8 +24,17 @@ init = () -> snowflake = new Snowflake config, ui, broker log '== snowflake proxy ==' + +update = () -> + if !ui.enabled + # Do not activate the proxy if any number of conditions are true. + snowflake.disable() + log 'Currently not active.' + return + # Otherwise, begin setting up WebRTC and acting as a proxy. dbg 'Contacting Broker at ' + broker.url + log 'Starting snowflake' snowflake.setRelayAddr config.relayAddr snowflake.beginWebRTC() diff --git a/proxy/ui.coffee b/proxy/ui.coffee index 505fa45..fa45823 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -4,6 +4,7 @@ All of Snowflake's DOM manipulation and inputs. class UI active: false + enabled: false setStatus: (msg) -> @@ -74,10 +75,17 @@ class WebExtUI extends UI total: @stats.reduce ((t, c) -> t + c ), 0 + enabled: @enabled onConnect: (port) => @port = port port.onDisconnect.addListener @onDisconnect + port.onMessage.addListener @onMessage + @postActive() + + onMessage: (m) => + @enabled = m.enabled + update() @postActive() onDisconnect: (port) => diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index cd7d250..8cf43ae 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -13,5 +13,6 @@ }, "default_title": "Snowflake", "default_popup": "popup.html" - } + }, + "permissions": ["cookies", "https://snowflake.torproject.org/"] } diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html index 8149232..c32a5f8 100644 --- a/proxy/webext/popup.html +++ b/proxy/webext/popup.html @@ -12,9 +12,9 @@ <p></p> </div> <div class="b toggle"> - <label>Turn Off</label> + <label id=toggle>Turn On</label> <label class="switch"> - <input type="checkbox" checked> + <input id="enabled" type="checkbox"/> <span class="slider round"></span> </label> </div> diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js index 3869a5f..f02bdff 100644 --- a/proxy/webext/popup.js +++ b/proxy/webext/popup.js @@ -11,4 +11,17 @@ port.onMessage.addListener((m) => { const clients = active ? 1 : 0; ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} connected.`; ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`; + const enabled = m.enabled + const enabledText = document.getElementById('toggle'); + if (enabled) { + document.getElementById('enabled').checked = true; + enabledText.innerText = 'Turn Off'; + } else { + document.getElementById('enabled').checked = false; + enabledText.innerText = 'Turn On'; + } }); + +document.addEventListener('change', (event) => { + port.postMessage({enabled: event.target.checked}); +}) [View Less]

1 0

[snowflake/master] Fixed linting errors/warnings and tests
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 788f2a595fa5daf076e08b80c9476cb0a1064c37 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jun 27 09:28:36 2019 -0400 Fixed linting errors/warnings and tests The test failure was due to pollBorker waiting the full 5 seconds before polling for the first time. The lint errors were some trailing whitespace and unecessary fat arrows --- proxy/snowflake.coffee | 8 +++++--- proxy/ui.coffee | 2 +- 2 files changed, 6 insertions(+), 4 … [View More]

1 0

[snowflake/master] Removed unecessary permissions from manifest
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 6f01a6bfc440100e061a0bc6e7057d674f3a11d5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jun 27 09:36:38 2019 -0400 Removed unecessary permissions from manifest --- proxy/webext/manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 8cf43ae..cd7d250 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -13,6 +13,5 @@ }, "default_title": "… [View More]

1 0

[snowflake/master] Refactored poll loop
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit ead579a6e9b426cb6182dea402343b26431e2eb3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 26 20:16:17 2019 -0400 Refactored poll loop This enables breaking the loop from the outside and cleans up the countdown --- proxy/proxypair.coffee | 1 - proxy/snowflake.coffee | 54 ++++++++++++++++++++------------------------------ 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index … [View More]f174a37..efcc8c7 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -60,7 +60,6 @@ class ProxyPair log 'Invalid SDP message.' return false dbg 'SDP ' + offer.type + ' successfully received.' - @active = true true # Given a WebRTC DataChannel, prepare callbacks. diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index bb03cf0..b86e0b7 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -13,6 +13,7 @@ TODO: More documentation class Snowflake relayAddr: null rateLimit: null + pollInterval: null retries: 0 # Janky state machine @@ -54,43 +55,29 @@ class Snowflake @makeProxyPair @relayAddr log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' - @pollBroker() + @pollInterval = setInterval((=> @pollBroker()), config.defaultBrokerPollInterval) + log @pollInterval # Regularly poll Broker for clients to serve until this snowflake is # serving at capacity, at which point stop polling. pollBroker: -> - # Temporary countdown. TODO: Simplify - countdown = (msg, sec, skip) => - if not skip then dbg msg - if sec > 0 - @ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)' - sec-- - setTimeout((-> countdown(msg, sec, true)), 1000) - else - @ui.setStatus msg - findClients() # Poll broker for clients. - findClients = => - pair = @nextAvailableProxyPair() - if !pair - log 'At client capacity.' - # Do nothing until a new proxyPair is available. - return - msg = 'Polling for client ... ' - msg += '[retries: ' + @retries + ']' if @retries > 0 - @ui.setStatus msg - recv = @broker.getClientOffer pair.id - recv.then (desc) => - @receiveOffer pair, desc - countdown( - 'Serving 1 new client.', - @config.defaultBrokerPollInterval / 1000 - ) - , (err) => - countdown(err, @config.defaultBrokerPollInterval / 1000) - @retries++ - - findClients() + pair = @nextAvailableProxyPair() + if !pair + log 'At client capacity.' + # Do nothing until a new proxyPair is available. + return + pair.active = true + msg = 'Polling for client ... ' + msg += '[retries: ' + @retries + ']' if @retries > 0 + @ui.setStatus msg + recv = @broker.getClientOffer pair.id + recv.then (desc) => + @receiveOffer pair, desc + , (err) => + pair.active = false + @retries++ + # Returns the first ProxyPair that's available to connect. nextAvailableProxyPair: -> @@ -99,7 +86,6 @@ class Snowflake # Receive an SDP offer from some client assigned by the Broker, # |pair| - an available ProxyPair. receiveOffer: (pair, desc) => - console.assert !pair.active try offer = JSON.parse desc dbg 'Received:\n\n' + offer.sdp + '\n' @@ -131,6 +117,8 @@ class Snowflake cease: -> while @proxyPairs.length > 0 @proxyPairs.pop().close() + log @pollInterval + clearInterval(@pollInterval) disable: -> log 'Disabling Snowflake.' [View Less]

1 0

[snowflake/master] Remove unecessary logging
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 651dca464ff981564fad46b99ac2261ead097408 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jun 27 09:40:30 2019 -0400 Remove unecessary logging --- proxy/snowflake.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 30f1d6b..4bf6cb6 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -58,7 +58,6 @@ class Snowflake @pollBroker() @pollInterval = setInterval((=> @pollBroker()),… [View More]

1 0

[snowflake/master] getClientOffer can return after snowflake is disabled
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 7090316e5c3a780dbf877fab6e5339534b3f5377 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jun 29 20:19:51 2019 -0400 getClientOffer can return after snowflake is disabled --- proxy/snowflake.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index d2fdf91..d54f593 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -72,7 +72,7 @@ class Snowflake @ui.setStatus msg recv = @… [View More]

1 0

[snowflake/master] Include a local copy of the arrow icon
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 51bc1cf3ed8ec66a1caffbfa20d4dfb5b261cda1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jun 29 19:49:52 2019 -0400 Include a local copy of the arrow icon From https://design.firefox.com/icons/icons/desktop/arrowhead-right-12.svg --- proxy/webext/icons/arrowhead-right-12.svg | 4 ++++ proxy/webext/popup.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/webext/icons/arrowhead-right-12.svg b/proxy/webext/icons/… [View More]

1 0

[snowflake/master] Updated popup icon to be purple when it's enabled
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit f890739a389c959442e8e74a025929ffed96271d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jun 27 10:41:15 2019 -0400 Updated popup icon to be purple when it's enabled --- proxy/snowflake.coffee | 2 +- proxy/ui.coffee | 6 +++--- proxy/webext/popup.js | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 4bf6cb6..99dd2bd 100644 --- a/proxy/snowflake.coffee +++ b/proxy/… [View More]snowflake.coffee @@ -73,7 +73,7 @@ class Snowflake msg += '[retries: ' + @retries + ']' if @retries > 0 @ui.setStatus msg recv = @broker.getClientOffer pair.id - recv.then (desc) -> + recv.then (desc) => @receiveOffer pair, desc , (err) -> pair.active = false diff --git a/proxy/ui.coffee b/proxy/ui.coffee index a47e224..e316e54 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -86,6 +86,9 @@ class WebExtUI extends UI onMessage: (m) => @enabled = m.enabled update() + chrome.browserAction.setIcon + path: + 32: "icons/status-" + (if @enabled then "on" else "off") + ".png" @postActive() onDisconnect: (port) => @@ -95,6 +98,3 @@ class WebExtUI extends UI super connected if connected then @stats[0] += 1 @postActive() - chrome.browserAction.setIcon - path: - 32: "icons/status-" + (if connected then "on" else "off") + ".png" diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js index f02bdff..b926f75 100644 --- a/proxy/webext/popup.js +++ b/proxy/webext/popup.js @@ -6,17 +6,19 @@ port.onMessage.addListener((m) => { const active = m.active; const div = document.getElementById('active'); const img = div.querySelector('img'); - img.src = `icons/status-${active ? "on" : "off"}.png`; + const enabled = m.enabled + img.src = `icons/status-${enabled ? "on" : "off"}.png`; const ps = div.querySelectorAll('p'); const clients = active ? 1 : 0; - ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} connected.`; - ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`; - const enabled = m.enabled const enabledText = document.getElementById('toggle'); if (enabled) { document.getElementById('enabled').checked = true; enabledText.innerText = 'Turn Off'; + ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} connected.`; + ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`; } else { + ps[0].innerText = "Snowflake is off"; + ps[1].innerText = ""; document.getElementById('enabled').checked = false; enabledText.innerText = 'Turn On'; } [View Less]

1 0

[snowflake/master] Fix whitespace to match conventions
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit 58d07788c794734bfdf2a1bc64f22b4d244a6cb2 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jul 2 09:56:47 2019 -0400 Fix whitespace to match conventions --- proxy/webext/popup.css | 26 +++++++++++++------------- proxy/webext/popup.html | 44 ++++++++++++++++++++++---------------------- proxy/webext/popup.js | 42 +++++++++++++++++++++--------------------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/proxy/webext/popup.css b/proxy/webext/… [View More]popup.css index 479d2f4..332092d 100644 --- a/proxy/webext/popup.css +++ b/proxy/webext/popup.css @@ -1,13 +1,13 @@ body { - margin: 10px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - width: 300px; - font-size:12px; + margin: 10px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; + width: 300px; + font-size:12px; } #active { - margin: 20px 0; - text-align: center; + margin: 20px 0; + text-align: center; } .b { @@ -18,8 +18,8 @@ body { .b a { color: black; - display: inline-block; - text-decoration: none; + display: inline-block; + text-decoration: none; } .learn:before { @@ -40,11 +40,11 @@ body { /* Snowflake Status */ .transfering { - -webkit-animation:spin 8s linear infinite; - -moz-animation:spin 8s linear infinite; - animation:spin 8s linear infinite; + -webkit-animation:spin 8s linear infinite; + -moz-animation:spin 8s linear infinite; + animation:spin 8s linear infinite; - fill: BlueViolet; + fill: BlueViolet; } @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } } @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } @@ -67,7 +67,7 @@ body { height: 0; } - .slider { +.slider { position: absolute; cursor: pointer; top: 0; diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html index c32a5f8..1074333 100644 --- a/proxy/webext/popup.html +++ b/proxy/webext/popup.html @@ -1,25 +1,25 @@ <!doctype html> <html> - <head> - <meta charset="utf-8" /> - <link rel="stylesheet" href="popup.css" /> - <script src="popup.js"></script> - </head> - <body> - <div id="active"> - <img src="icons/status-off.png" /> - <p></p> - <p></p> - </div> - <div class="b toggle"> - <label id=toggle>Turn On</label> - <label class="switch"> - <input id="enabled" type="checkbox"/> - <span class="slider round"></span> - </label> - </div> - <div class="b learn"> - <a target="_blank" href="https://snowflake.torproject.org/">Learn more</a> - </div> - </body> + <head> + <meta charset="utf-8" /> + <link rel="stylesheet" href="popup.css" /> + <script src="popup.js"></script> + </head> + <body> + <div id="active"> + <img src="icons/status-off.png" /> + <p></p> + <p></p> + </div> + <div class="b toggle"> + <label id=toggle>Turn On</label> + <label class="switch"> + <input id="enabled" type="checkbox"/> + <span class="slider round"></span> + </label> + </div> + <div class="b learn"> + <a target="_blank" href="https://snowflake.torproject.org/">Learn more</a> + </div> + </body> </html> diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js index b926f75..c447b86 100644 --- a/proxy/webext/popup.js +++ b/proxy/webext/popup.js @@ -1,29 +1,29 @@ const port = chrome.runtime.connect({ - name: "popup" + name: "popup" }); port.onMessage.addListener((m) => { - const active = m.active; - const div = document.getElementById('active'); - const img = div.querySelector('img'); - const enabled = m.enabled - img.src = `icons/status-${enabled ? "on" : "off"}.png`; - const ps = div.querySelectorAll('p'); - const clients = active ? 1 : 0; - const enabledText = document.getElementById('toggle'); - if (enabled) { - document.getElementById('enabled').checked = true; - enabledText.innerText = 'Turn Off'; - ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} connected.`; - ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`; - } else { - ps[0].innerText = "Snowflake is off"; - ps[1].innerText = ""; - document.getElementById('enabled').checked = false; - enabledText.innerText = 'Turn On'; - } + const active = m.active; + const div = document.getElementById('active'); + const img = div.querySelector('img'); + const enabled = m.enabled + img.src = `icons/status-${enabled ? "on" : "off"}.png`; + const ps = div.querySelectorAll('p'); + const clients = active ? 1 : 0; + const enabledText = document.getElementById('toggle'); + if (enabled) { + document.getElementById('enabled').checked = true; + enabledText.innerText = 'Turn Off'; + ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} connected.`; + ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`; + } else { + ps[0].innerText = "Snowflake is off"; + ps[1].innerText = ""; + document.getElementById('enabled').checked = false; + enabledText.innerText = 'Turn On'; + } }); document.addEventListener('change', (event) => { - port.postMessage({enabled: event.target.checked}); + port.postMessage({enabled: event.target.checked}); }) [View Less]

1 0

[snowflake/master] Stop resetting after every pair closes
by cohosh＠torproject.org 02 Jul '19

02 Jul '19

commit b1116a1c356bef91dd53f83563af49e0c422b127 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jun 29 18:09:12 2019 -0400 Stop resetting after every pair closes --- proxy/init-badge.coffee | 2 +- proxy/init-webext.coffee | 2 +- proxy/proxypair.coffee | 3 +-- proxy/snowflake.coffee | 29 ++++++++--------------------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/proxy/init-badge.coffee b/proxy/init-badge.coffee index 7802ca4..eead5b0 100644 --- a/… [View More]proxy/init-badge.coffee +++ b/proxy/init-badge.coffee @@ -54,7 +54,7 @@ window.onbeforeunload = -> null window.onunload = -> - pair.close() for pair in snowflake.proxyPairs + snowflake.disable() null window.onload = init diff --git a/proxy/init-webext.coffee b/proxy/init-webext.coffee index 104384d..20b8bc3 100644 --- a/proxy/init-webext.coffee +++ b/proxy/init-webext.coffee @@ -45,7 +45,7 @@ window.onbeforeunload = -> null window.onunload = -> - pair.close() for pair in snowflake.proxyPairs + snowflake.disable() null window.onload = init diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index efcc8c7..b66ba4f 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -78,8 +78,6 @@ class ProxyPair snowflake.state = Snowflake.MODE.INIT @flush() @close() - # TODO: Change this for multiplexing. - snowflake.reset() channel.onerror = -> log 'Data channel error!' channel.binaryType = "arraybuffer" channel.onmessage = @onClientToRelayMessage @@ -149,6 +147,7 @@ class ProxyPair @client.close() if @webrtcIsReady() @relay.close() if @relayIsReady() relay = null + @onCleanup() # Send as much data in both directions as the rate limit currently allows. flush: => diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 99dd2bd..d2fdf91 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -51,8 +51,6 @@ class Snowflake # process. |pollBroker| automatically arranges signalling. beginWebRTC: -> @state = Snowflake.MODE.WEBRTC_CONNECTING - for i in [1..(a)config.connectionsPerClient] - @makeProxyPair @relayAddr log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' @pollBroker() @@ -82,6 +80,8 @@ class Snowflake # Returns the first ProxyPair that's available to connect. nextAvailableProxyPair: -> + if @proxyPairs.length < @config.connectionsPerClient + return @makeProxyPair @relayAddr return @proxyPairs.find (pp, i, arr) -> return !pp.active # Receive an SDP offer from some client assigned by the Broker, @@ -110,27 +110,14 @@ class Snowflake @proxyPairs.push pair pair.onCleanup = (event) => # Delete from the list of active proxy pairs. - @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) - @pollBroker() + ind = @proxyPairs.indexOf(pair) + if ind > -1 then @proxyPairs.splice(ind, 1) pair.begin() + return pair # Stop all proxypairs. - cease: -> - while @proxyPairs.length > 0 - @proxyPairs.pop().close() - clearInterval(@pollInterval) - disable: -> log 'Disabling Snowflake.' - @cease() - - die: -> - log 'Snowflake died.' - @cease() - - # Close all existing ProxyPairs and begin finding new clients from scratch. - reset: -> - @cease() - log 'Snowflake resetting...' - @retries = 0 - @beginWebRTC() + clearInterval(@pollInterval) + while @proxyPairs.length > 0 + @proxyPairs.pop().close() [View Less]

1 0