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

[snowflake/master] Add a WebExtUI the makes use of the new assests
by arlo＠torproject.org 08 May '19

08 May '19

commit e7f3ade06827f6501333f986661ed7aa4277946e Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue May 7 15:44:01 2019 -0400 Add a WebExtUI the makes use of the new assests The browser icon shows the on/off state. --- proxy/init.coffee | 2 ++ proxy/shims.coffee | 4 +++- proxy/ui.coffee | 9 +++++++++ proxy/webext/manifest.json | 6 +++--- proxy/webext/snowflake.html | 5 +---- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/proxy/init.coffee b/proxy/init.coffee index 031f7c5..22d4315 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -58,6 +58,8 @@ init = () -> ui = new BadgeUI() else if (document.getElementById('status') != null) ui = new DebugUI() + else if (document.getElementById('webext') != null) + ui = new WebExtUI() else ui = new UI() diff --git a/proxy/shims.coffee b/proxy/shims.coffee index 1aeaf3d..5c4bae0 100644 --- a/proxy/shims.coffee +++ b/proxy/shims.coffee @@ -5,7 +5,8 @@ WebRTC shims for multiple browsers. if module?.exports window = {} document = - getElementById: () -> null, + getElementById: () -> null + chrome = {} location = '' if not TESTING? or not TESTING @@ -23,6 +24,7 @@ if module?.exports else window = this document = window.document + chrome = window.chrome location = window.location.search.substr(1) PeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || diff --git a/proxy/ui.coffee b/proxy/ui.coffee index d887dbd..d4d647a 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -42,3 +42,12 @@ class DebugUI extends UI # Scroll to latest @$msglog.value += msg + '\n' @$msglog.scrollTop = @$msglog.scrollHeight + + +class WebExtUI extends UI + setActive: (connected) => + chrome.browserAction.setIcon { + "path": { + "32": "icons/status-" + (if connected then "on" else "off") + ".png" + } + } diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 83a3358..f0f671d 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -9,8 +9,8 @@ }, "browser_action": { "default_icon": { - "16": "icons/status-off.png", - "32": "icons/status-off(a)2x.png" - } + "32": "icons/status-off.png" + }, + "default_title": "Snowflake" } } diff --git a/proxy/webext/snowflake.html b/proxy/webext/snowflake.html index 6a5eca0..6d28fe6 100644 --- a/proxy/webext/snowflake.html +++ b/proxy/webext/snowflake.html @@ -8,9 +8,6 @@ </head> <body>  - <div> - <div id="status"></div> - <textarea id="msglog" readonly></textarea> - </div> + <div id="webext" /> </body> </html>

1 0

[snowflake/master] Make badge and debug extend ui
by arlo＠torproject.org 08 May '19

08 May '19

commit 2b1852c1a5bffd0c939662ccd2ca2233d7e03c84 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue May 7 14:36:23 2019 -0400 Make badge and debug extend ui Permits further ui extension --- proxy/init.coffee | 18 ++++++++++++------ proxy/shims.coffee | 5 ++++- proxy/snowflake.coffee | 6 +++--- proxy/spec/snowflake.spec.coffee | 6 +----- proxy/spec/ui.spec.coffee | 37 +++++++++++-------------------------- proxy/ui.coffee | 29 ++++++++++++++++++----------- 6 files changed, 49 insertions(+), 52 deletions(-) diff --git a/proxy/init.coffee b/proxy/init.coffee index a75f67c..031f7c5 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -44,17 +44,23 @@ snowflake = null # log to console. log = (msg) -> console.log 'Snowflake: ' + msg - snowflake?.ui?.log msg + snowflake?.ui.log msg -dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug +dbg = (msg) -> log msg if DEBUG or (snowflake?.ui instanceof DebugUI) ### Entry point. ### -init = (isNode) -> - # Hook up to the debug UI if available. - ui = if isNode then null else new UI() +init = () -> + ui = null + if (document.getElementById('badge') != null) + ui = new BadgeUI() + else if (document.getElementById('status') != null) + ui = new DebugUI() + else + ui = new UI() + silenceNotifications = Params.getBool(query, 'silent', false) broker = new Broker BROKER snowflake = new Snowflake broker, ui @@ -80,4 +86,4 @@ window.onunload = -> pair.close() for pair in snowflake.proxyPairs null -window.onload = init.bind null, false +window.onload = init diff --git a/proxy/shims.coffee b/proxy/shims.coffee index a0f53ea..1aeaf3d 100644 --- a/proxy/shims.coffee +++ b/proxy/shims.coffee @@ -4,6 +4,8 @@ WebRTC shims for multiple browsers. if module?.exports window = {} + document = + getElementById: () -> null, location = '' if not TESTING? or not TESTING @@ -16,10 +18,11 @@ if module?.exports WebSocket = require 'ws' { XMLHttpRequest } = require 'xmlhttprequest' - process.nextTick () -> init true + process.nextTick () -> init else window = this + document = window.document location = window.location.search.substr(1) PeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index cf71edc..1cf6582 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -55,11 +55,11 @@ class Snowflake countdown = (msg, sec, skip) => if not skip then dbg msg if sec > 0 - @ui?.setStatus msg + ' (Polling in ' + sec + ' seconds...)' + @ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)' sec-- setTimeout((-> countdown(msg, sec, true)), 1000) else - @ui?.setStatus msg + @ui.setStatus msg findClients() # Poll broker for clients. findClients = => @@ -70,7 +70,7 @@ class Snowflake return msg = 'Polling for client ... ' msg += '[retries: ' + @retries + ']' if @retries > 0 - @ui?.setStatus msg + @ui.setStatus msg recv = @broker.getClientOffer pair.id recv.then (desc) => @receiveOffer pair, desc diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 05dd843..8c11a22 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -17,11 +17,7 @@ class WebSocket @bufferedAmount = 0 send: (data) -> log = -> -class FakeUI - log: -> - setActive: -> - setStatus: -> -fakeUI = new FakeUI() +fakeUI = new UI() class FakeBroker getClientOffer: -> new Promise((F,R) -> {}) # Fake snowflake to interact with diff --git a/proxy/spec/ui.spec.coffee b/proxy/spec/ui.spec.coffee index 8229169..f1cf4b2 100644 --- a/proxy/spec/ui.spec.coffee +++ b/proxy/spec/ui.spec.coffee @@ -3,7 +3,7 @@ jasmine tests for Snowflake UI ### document = - getElementById: (id) -> + getElementById: (id) -> {} describe 'UI', -> @@ -11,9 +11,8 @@ describe 'UI', -> spyOn(document, 'getElementById').and.callFake (id) -> return null if 'badge' == id return {} - u = new UI() - expect(u.debug).toBe true - expect(document.getElementById.calls.count()).toEqual 3 + u = new DebugUI() + expect(document.getElementById.calls.count()).toEqual 2 expect(u.$status).not.toBeNull() expect(u.$msglog).not.toBeNull() @@ -21,49 +20,35 @@ describe 'UI', -> spyOn(document, 'getElementById').and.callFake (id) -> return {} if 'badge' == id return null - u = new UI() - expect(u.debug).toBe false + u = new BadgeUI() expect(document.getElementById).toHaveBeenCalled() expect(document.getElementById.calls.count()).toEqual 1 - expect(u.$status).toBeNull() - expect(u.$msglog).toBeNull() + expect(u.$badge).not.toBeNull() - it 'sets status message only when in debug mode', -> - u = new UI() + it 'sets status message when in debug mode', -> + u = new DebugUI() u.$status = { innerHTML: '' } - u.debug = false - u.setStatus('test') - expect(u.$status.innerHTML).toEqual '' - u.debug = true u.setStatus('test') expect(u.$status.innerHTML).toEqual 'Status: test' it 'sets message log css correctly for debug mode', -> - u = new UI() - u.debug = true - u.$msglog = {} + u = new DebugUI() u.setActive true expect(u.$msglog.className).toEqual 'active' u.setActive false expect(u.$msglog.className).toEqual '' it 'sets badge css correctly for non-debug mode', -> - u = new UI() - u.debug = false + u = new BadgeUI() u.$badge = {} u.setActive true expect(u.$badge.className).toEqual 'active' u.setActive false expect(u.$badge.className).toEqual '' - it 'logs to the textarea correctly, only when debug mode', -> - u = new UI() + it 'logs to the textarea correctly when debug mode', -> + u = new DebugUI() u.$msglog = { value: '', scrollTop: 0, scrollHeight: 1337 } - u.debug = false - u.log 'test' - expect(u.$msglog.value).toEqual '' - expect(u.$msglog.scrollTop).toEqual 0 - u.debug = true u.log 'test' expect(u.$msglog.value).toEqual 'test\n' expect(u.$msglog.scrollTop).toEqual 1337 diff --git a/proxy/ui.coffee b/proxy/ui.coffee index fb13aa4..d887dbd 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -3,17 +3,29 @@ All of Snowflake's DOM manipulation and inputs. ### class UI - debug: false # True when there's no badge + setStatus: (msg) => + + setActive: (connected) => + + log: (msg) => + +class BadgeUI extends UI + $badge: null + + constructor: -> + @$badge = document.getElementById('badge') + + setActive: (connected) => + @$badge.className = if connected then 'active' else '' + + +class DebugUI extends UI # DOM elements references. $msglog: null $status: null constructor: -> - @$badge = document.getElementById('badge') - @debug = null == @$badge - return if !@debug - # Setup other DOM handlers if it's debug mode. @$status = document.getElementById('status') @$msglog = document.getElementById('msglog') @@ -21,17 +33,12 @@ class UI # Status bar setStatus: (msg) => - return if !@debug @$status.innerHTML = 'Status: ' + msg setActive: (connected) => - if @debug - @$msglog.className = if connected then 'active' else '' - else - @$badge.className = if connected then 'active' else '' + @$msglog.className = if connected then 'active' else '' log: (msg) => - return if !@debug # Scroll to latest @$msglog.value += msg + '\n' @$msglog.scrollTop = @$msglog.scrollHeight

1 0

[snowflake/master] Start a webextension
by arlo＠torproject.org 08 May '19

08 May '19

commit 49dedf3a2f562b4582dcc41d9c82d3f63379d37d Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Apr 30 15:08:37 2019 -0400 Start a webextension --- .gitignore | 1 + proxy/Cakefile | 12 ++++++++---- proxy/package.json | 1 + proxy/webext/README.md | 9 +++++++++ proxy/webext/icons/16-on.png | Bin 0 -> 1386 bytes proxy/webext/icons/16.png | Bin 0 -> 1119 bytes proxy/webext/icons/32-on.png | Bin 0 -> 3035 bytes proxy/webext/icons/32.png | Bin 0 -> 1512 bytes proxy/webext/manifest.json | 16 ++++++++++++++++ proxy/webext/snowflake.html | 16 ++++++++++++++++ proxy/webext/tmp.js | 2 ++ 11 files changed, 53 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 165c512..a187011 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,6 @@ proxy/test proxy/build proxy/node_modules proxy/spec/support +proxy/webext/snowflake.js ignore/ npm-debug.log diff --git a/proxy/Cakefile b/proxy/Cakefile index 7da528e..8013dac 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -21,14 +21,14 @@ FILES_SPEC = [ 'spec/websocket.spec.coffee' ] FILES_ALL = FILES.concat FILES_SPEC -OUTFILE = 'build/snowflake.js' +OUTFILE = 'snowflake.js' STATIC = 'static' copyStaticFiles = -> exec 'cp ' + STATIC + '/* build/' -compileCoffee = -> - exec 'cat ' + FILES.join(' ') + ' | coffee -cs > ' + OUTFILE, (err, stdout, stderr) -> +compileCoffee = (outDir) -> + exec 'cat ' + FILES.join(' ') + ' | coffee -cs > ' + outDir + '/' + OUTFILE, (err, stdout, stderr) -> throw err if err task 'test', 'snowflake unit tests', -> @@ -48,9 +48,13 @@ task 'test', 'snowflake unit tests', -> task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' copyStaticFiles() - compileCoffee() + compileCoffee('build') console.log 'Snowflake prepared.' +task 'webext', 'build the webextension', -> + compileCoffee('webext') + console.log 'Webextension prepared.' + task 'lint', 'ensure idiomatic coffeescript', -> proc = spawn 'coffeelint', FILES_ALL, { file: 'coffeelint.json' diff --git a/proxy/package.json b/proxy/package.json index cc4cc78..8bc5fb5 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -10,6 +10,7 @@ "test": "cake test", "lint": "cake lint", "build": "cake build", + "webext": "cake webext", "clean": "cake clean", "prepublish": "npm run build", "start": "node build/snowflake.js" diff --git a/proxy/webext/README.md b/proxy/webext/README.md new file mode 100644 index 0000000..bacaa94 --- /dev/null +++ b/proxy/webext/README.md @@ -0,0 +1,9 @@ +Build it, + +``` +cd .. +npm install +npm run webext +``` + +and then load this directory as an unpacked extension. diff --git a/proxy/webext/icons/16-on.png b/proxy/webext/icons/16-on.png new file mode 100644 index 0000000..5cb253d Binary files /dev/null and b/proxy/webext/icons/16-on.png differ diff --git a/proxy/webext/icons/16.png b/proxy/webext/icons/16.png new file mode 100644 index 0000000..110bae3 Binary files /dev/null and b/proxy/webext/icons/16.png differ diff --git a/proxy/webext/icons/32-on.png b/proxy/webext/icons/32-on.png new file mode 100644 index 0000000..fed8ea0 Binary files /dev/null and b/proxy/webext/icons/32-on.png differ diff --git a/proxy/webext/icons/32.png b/proxy/webext/icons/32.png new file mode 100644 index 0000000..ee4de34 Binary files /dev/null and b/proxy/webext/icons/32.png differ diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json new file mode 100644 index 0000000..8d1649e --- /dev/null +++ b/proxy/webext/manifest.json @@ -0,0 +1,16 @@ +{ + "manifest_version": 2, + "name": "Snowflake", + "version": "0.0.0", + "description": "Snowflake ...", + "background": { + "page": "snowflake.html", + "persistent": true + }, + "browser_action": { + "default_icon": { + "16": "icons/16.png", + "32": "icons/32.png" + } + } +} diff --git a/proxy/webext/snowflake.html b/proxy/webext/snowflake.html new file mode 100644 index 0000000..6a5eca0 --- /dev/null +++ b/proxy/webext/snowflake.html @@ -0,0 +1,16 @@ +<!doctype html> +<html> + <head> + <meta charset="utf-8"> +  + <script src="tmp.js"></script> + <script src="snowflake.js"></script> + </head> + <body> +  + <div> + <div id="status"></div> + <textarea id="msglog" readonly></textarea> + </div> + </body> +</html> diff --git a/proxy/webext/tmp.js b/proxy/webext/tmp.js new file mode 100644 index 0000000..4bd0a10 --- /dev/null +++ b/proxy/webext/tmp.js @@ -0,0 +1,2 @@ +// FIXME: Refactor snowflake.js to eliminate the need for this +document.cookie = "snowflake-allow=1";

1 0

[snowflake/master] Add new assets
by arlo＠torproject.org 08 May '19

08 May '19

commit 5b18729e77d7e69df8b91801e13fc123050acd8c Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue May 7 13:03:59 2019 -0400 Add new assets From https://trac.torproject.org/projects/tor/ticket/23888#comment:5 --- proxy/webext/icons/16-on.png | Bin 1386 -> 0 bytes proxy/webext/icons/16.png | Bin 1119 -> 0 bytes proxy/webext/icons/32-on.png | Bin 3035 -> 0 bytes proxy/webext/icons/32.png | Bin 1512 -> 0 bytes proxy/webext/icons/status-off.png | Bin 0 -> 5021 bytes proxy/webext/icons/status-off.svg | 11 +++++++++++ proxy/webext/icons/status-off(a)2x.png | Bin 0 -> 11206 bytes proxy/webext/icons/status-off(a)3x.png | Bin 0 -> 17252 bytes proxy/webext/icons/status-on.png | Bin 0 -> 4791 bytes proxy/webext/icons/status-on.svg | 11 +++++++++++ proxy/webext/icons/status-on(a)2x.png | Bin 0 -> 10913 bytes proxy/webext/icons/status-on(a)3x.png | Bin 0 -> 17084 bytes proxy/webext/manifest.json | 4 ++-- 13 files changed, 24 insertions(+), 2 deletions(-) diff --git a/proxy/webext/icons/16-on.png b/proxy/webext/icons/16-on.png deleted file mode 100644 index 5cb253d..0000000 Binary files a/proxy/webext/icons/16-on.png and /dev/null differ diff --git a/proxy/webext/icons/16.png b/proxy/webext/icons/16.png deleted file mode 100644 index 110bae3..0000000 Binary files a/proxy/webext/icons/16.png and /dev/null differ diff --git a/proxy/webext/icons/32-on.png b/proxy/webext/icons/32-on.png deleted file mode 100644 index fed8ea0..0000000 Binary files a/proxy/webext/icons/32-on.png and /dev/null differ diff --git a/proxy/webext/icons/32.png b/proxy/webext/icons/32.png deleted file mode 100644 index ee4de34..0000000 Binary files a/proxy/webext/icons/32.png and /dev/null differ diff --git a/proxy/webext/icons/status-off.png b/proxy/webext/icons/status-off.png new file mode 100644 index 0000000..dd4065e Binary files /dev/null and b/proxy/webext/icons/status-off.png differ diff --git a/proxy/webext/icons/status-off.svg b/proxy/webext/icons/status-off.svg new file mode 100644 index 0000000..f6605ea --- /dev/null +++ b/proxy/webext/icons/status-off.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="61px" height="60px" viewBox="0 0 61 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>status-off</title> + <desc>Created with Sketch.</desc> + <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="00" transform="translate(-1003.000000, -111.000000)" fill="#4A4A4F"> + <path d="M1063.03226,140.032258 L1054.85452,140.032258 C1056.9129,137.995161 1060.31774,134.62129 1062.30774,132.632258 C1062.68581,132.254194 1062.68581,131.64129 1062.30806,131.263226 C1061.93,130.885484 1061.31774,130.885806 1060.93935,131.262903 C1058.37161,133.83 1053.43548,138.714516 1052.1029,140.032258 L1036.33613,140.032258 L1047.12097,129.247419 C1047.64677,129.253871 1048.17323,129.257419 1048.69968,129.257419 C1049.99645,129.257419 1051.29065,129.24129 1052.55419,129.225161 C1054.97516,129.194839 1057.47935,129.163871 1059.97839,129.246129 C1060.51968,129.259355 1060.96,128.845484 1060.97806,128.31129 C1060.99581,127.777097 1060.5771,127.329677 1060.04258,127.311935 C1057.49903,127.227419 1054.97323,127.259032 1052.52968,127.29 C1051.3871,127.304194 1050.21968,127.314516 1049.05097,127.317419 L1055.21323,121.155161 C1055.59129,120.777742 1055.59129,120.164516 1055.21323,119.786774 C1054.83548,119.40871 1054.22226,119.40871 1053.84484,119.786774 L1048.00839,12 5.623226 C1048.02323,122.708065 1048.04387,118.084839 1048.04452,115.345484 C1048.04484,114.810968 1047.61129,114.377742 1047.0771,114.377419 L1047.07677,114.377419 C1046.54258,114.377419 1046.10935,114.810645 1046.10903,115.345161 C1046.10839,118.843226 1046.07452,125.416129 1046.0629,127.56871 L1034.96774,138.663871 L1034.96774,123.21871 C1036.13,122.043871 1041.19774,116.92129 1043.83,114.288065 C1044.20806,113.91 1044.20806,113.297419 1043.83,112.919677 C1043.45161,112.54129 1042.83871,112.541935 1042.46097,112.919677 C1040.44129,114.940323 1036.99387,118.42 1034.96774,120.466774 L1034.96774,111.967742 C1034.96774,111.433226 1034.53452,111 1034,111 C1033.46581,111 1033.03226,111.433226 1033.03226,111.967742 L1033.03226,120.42129 C1032.29355,119.676129 1031.56032,118.929355 1030.84419,118.194839 C1029.13806,116.445161 1027.37387,114.636129 1025.51548,112.897419 C1025.12548,112.532258 1024.51323,112.551935 1024.14774,112.942581 C1023.78258,113.332903 1023.8029,113.945161 1024.1932 3,114.310645 C1026.01903,116.019355 1027.76742,117.811935 1029.45839,119.545806 C1030.61839,120.735161 1031.81677,121.95871 1033.03226,123.151935 L1033.03226,138.663871 L1022.51097,128.142581 C1022.50581,127.20129 1022.46161,119.277097 1022.46129,115.309355 C1022.46097,114.775161 1022.02806,114.341613 1021.49323,114.341935 C1020.95903,114.341935 1020.52548,114.775484 1020.52581,115.309677 C1020.52613,118.249355 1020.55065,123.356774 1020.56516,126.196452 L1014.15516,119.786774 C1013.77774,119.40871 1013.16452,119.40871 1012.78677,119.786774 C1012.40871,120.164516 1012.40871,120.777742 1012.78677,121.155161 L1018.91226,127.280645 C1017.9471,127.275484 1016.98516,127.266452 1016.04065,127.254516 C1013.5971,127.223548 1011.07097,127.191613 1008.52774,127.276452 C1007.99355,127.294194 1007.57484,127.74129 1007.59258,128.275806 C1007.61032,128.81 1008.05484,129.229032 1008.59194,129.210645 C1011.09065,129.128065 1013.59484,129.159355 1016.01645,129.189677 C1017.28,129.205484 1018.57387,1 29.221613 1019.87065,129.221613 C1020.19613,129.221613 1020.52161,129.218065 1020.84742,129.215806 L1031.66387,140.032258 L1016.42387,140.032258 C1015.09129,138.714516 1010.15516,133.83 1007.58742,131.262903 C1007.20935,130.885806 1006.59677,130.885484 1006.21903,131.263226 C1005.84097,131.64129 1005.84097,132.254194 1006.21903,132.632258 C1008.20903,134.62129 1011.61387,137.995161 1013.67194,140.032258 L1004.96774,140.032258 C1004.43355,140.032258 1004,140.465484 1004,141 C1004,141.534516 1004.43355,141.967742 1004.96774,141.967742 L1013.81387,141.967742 C1013.03774,142.73871 1012.25839,143.503548 1011.49226,144.250645 C1009.74355,145.956129 1007.93484,147.72 1006.19677,149.577419 C1005.83161,149.967742 1005.85161,150.58 1006.24194,150.945161 C1006.42871,151.119677 1006.66613,151.206452 1006.90323,151.206452 C1007.16161,151.206452 1007.41935,151.103226 1007.60968,150.899677 C1009.31774,149.074516 1011.11032,147.326774 1012.84355,145.636452 C1014.06387,144.446452 1015.32097,143.2161 29 1016.54387,141.967742 L1031.66387,141.967742 L1020.35387,153.277742 C1018.69323,153.264516 1017.02516,153.282903 1015.40613,153.303871 C1012.98484,153.333548 1010.48065,153.364839 1007.98194,153.282581 C1007.44742,153.27 1007.00032,153.683226 1006.98226,154.217742 C1006.96452,154.751935 1007.38323,155.199355 1007.91774,155.216774 C1010.46065,155.30129 1012.98677,155.269355 1015.43065,155.239032 C1016.4129,155.226774 1017.41452,155.217419 1018.41871,155.212903 L1012.78677,160.844839 C1012.40871,161.222258 1012.40871,161.835484 1012.78677,162.213226 C1012.97581,162.402258 1013.22355,162.496774 1013.47097,162.496774 C1013.71871,162.496774 1013.96645,162.402258 1014.15516,162.213226 L1019.95419,156.414194 C1019.93968,159.274839 1019.91613,164.283871 1019.91581,167.183548 C1019.91548,167.718065 1020.34903,168.151613 1020.88323,168.151613 L1020.88355,168.151613 C1021.41774,168.151613 1021.85097,167.718387 1021.85129,167.184194 C1021.85194,163.349677 1021.8929,155.82 1021.9,154.468387 L 1033.03226,143.336129 L1033.03226,158.848065 C1031.81613,160.042258 1030.6171,161.266129 1029.45645,162.456129 C1027.76613,164.189355 1026.01839,165.98129 1024.19323,167.689355 C1023.8029,168.054516 1023.78258,168.667097 1024.14774,169.057419 C1024.33839,169.260645 1024.59613,169.363871 1024.85452,169.363871 C1025.09161,169.363871 1025.32903,169.277097 1025.51548,169.102581 C1027.37323,167.364194 1029.13677,165.556129 1030.84226,163.807419 C1031.55935,163.072258 1032.29323,162.324516 1033.03226,161.579032 L1033.03226,170.032258 C1033.03226,170.566774 1033.46581,171 1034,171 C1034.53452,171 1034.96774,170.566774 1034.96774,170.032258 L1034.96774,161.533226 C1036.99387,163.580323 1040.44129,167.059355 1042.46097,169.080323 C1042.83903,169.458065 1043.45161,169.458387 1043.83,169.080645 C1044.20806,168.702581 1044.20806,168.09 1043.83,167.711935 C1041.19774,165.079032 1036.13,159.956452 1034.96774,158.781613 L1034.96774,143.336129 L1045.86806,154.236452 C1045.87645,155.739032 1045.9161 3,163.11129 1045.91677,166.890968 C1045.9171,167.425484 1046.35032,167.85871 1046.88484,167.85871 C1047.41935,167.85871 1047.85258,167.425161 1047.85226,166.890968 C1047.85194,164.011613 1047.82871,159.053226 1047.81419,156.182258 L1053.84484,162.213226 C1054.03355,162.402258 1054.28129,162.496774 1054.52903,162.496774 C1054.77645,162.496774 1055.02452,162.402258 1055.21323,162.213226 C1055.59129,161.835484 1055.59129,161.222258 1055.21323,160.844839 L1049.28839,154.919677 C1050.3129,154.924516 1051.33516,154.933548 1052.33774,154.946129 C1054.78097,154.977097 1057.30677,155.009032 1059.85065,154.924194 C1060.38484,154.906452 1060.80355,154.459355 1060.78581,153.924839 C1060.76774,153.390645 1060.32774,152.978387 1059.78613,152.99 C1057.2871,153.072258 1054.78323,153.040968 1052.36194,153.010968 C1050.72355,152.990323 1049.03484,152.97129 1047.35387,152.985484 L1036.33613,141.967742 L1051.9829,141.967742 C1053.20581,143.216129 1054.46323,144.446452 1055.68323,145.636452 C1057.41677, 147.326774 1059.20871,149.074516 1060.91677,150.899677 C1061.10742,151.103226 1061.36516,151.206452 1061.62387,151.206452 C1061.86065,151.206452 1062.09806,151.119677 1062.28484,150.945161 C1062.67516,150.58 1062.69548,149.967742 1062.33,149.577419 C1060.59194,147.72 1058.78355,145.956129 1057.03452,144.250645 C1056.26839,143.503548 1055.48903,142.73871 1054.7129,141.967742 L1063.03226,141.967742 C1063.56677,141.967742 1064,141.534516 1064,141 C1064,140.465484 1063.56677,140.032258 1063.03226,140.032258" id="status-off" transform="translate(1034.000000, 141.000000) rotate(65.000000) translate(-1034.000000, -141.000000) "></path> + </g> + </g> +</svg> \ No newline at end of file diff --git a/proxy/webext/icons/status-off(a)2x.png b/proxy/webext/icons/status-off(a)2x.png new file mode 100644 index 0000000..902d1b5 Binary files /dev/null and b/proxy/webext/icons/status-off(a)2x.png differ diff --git a/proxy/webext/icons/status-off(a)3x.png b/proxy/webext/icons/status-off(a)3x.png new file mode 100644 index 0000000..71a6dc8 Binary files /dev/null and b/proxy/webext/icons/status-off(a)3x.png differ diff --git a/proxy/webext/icons/status-on.png b/proxy/webext/icons/status-on.png new file mode 100644 index 0000000..688debf Binary files /dev/null and b/proxy/webext/icons/status-on.png differ diff --git a/proxy/webext/icons/status-on.svg b/proxy/webext/icons/status-on.svg new file mode 100644 index 0000000..6c7df00 --- /dev/null +++ b/proxy/webext/icons/status-on.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="61px" height="60px" viewBox="0 0 61 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>status-on</title> + <desc>Created with Sketch.</desc> + <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Artboard" transform="translate(-1003.000000, -111.000000)" fill="#8000D7"> + <path d="M1063.03226,140.032258 L1054.85452,140.032258 C1056.9129,137.995161 1060.31774,134.62129 1062.30774,132.632258 C1062.68581,132.254194 1062.68581,131.64129 1062.30806,131.263226 C1061.93,130.885484 1061.31774,130.885806 1060.93935,131.262903 C1058.37161,133.83 1053.43548,138.714516 1052.1029,140.032258 L1036.33613,140.032258 L1047.12097,129.247419 C1047.64677,129.253871 1048.17323,129.257419 1048.69968,129.257419 C1049.99645,129.257419 1051.29065,129.24129 1052.55419,129.225161 C1054.97516,129.194839 1057.47935,129.163871 1059.97839,129.246129 C1060.51968,129.259355 1060.96,128.845484 1060.97806,128.31129 C1060.99581,127.777097 1060.5771,127.329677 1060.04258,127.311935 C1057.49903,127.227419 1054.97323,127.259032 1052.52968,127.29 C1051.3871,127.304194 1050.21968,127.314516 1049.05097,127.317419 L1055.21323,121.155161 C1055.59129,120.777742 1055.59129,120.164516 1055.21323,119.786774 C1054.83548,119.40871 1054.22226,119.40871 1053.84484,119.786774 L1048.00839,12 5.623226 C1048.02323,122.708065 1048.04387,118.084839 1048.04452,115.345484 C1048.04484,114.810968 1047.61129,114.377742 1047.0771,114.377419 L1047.07677,114.377419 C1046.54258,114.377419 1046.10935,114.810645 1046.10903,115.345161 C1046.10839,118.843226 1046.07452,125.416129 1046.0629,127.56871 L1034.96774,138.663871 L1034.96774,123.21871 C1036.13,122.043871 1041.19774,116.92129 1043.83,114.288065 C1044.20806,113.91 1044.20806,113.297419 1043.83,112.919677 C1043.45161,112.54129 1042.83871,112.541935 1042.46097,112.919677 C1040.44129,114.940323 1036.99387,118.42 1034.96774,120.466774 L1034.96774,111.967742 C1034.96774,111.433226 1034.53452,111 1034,111 C1033.46581,111 1033.03226,111.433226 1033.03226,111.967742 L1033.03226,120.42129 C1032.29355,119.676129 1031.56032,118.929355 1030.84419,118.194839 C1029.13806,116.445161 1027.37387,114.636129 1025.51548,112.897419 C1025.12548,112.532258 1024.51323,112.551935 1024.14774,112.942581 C1023.78258,113.332903 1023.8029,113.945161 1024.1932 3,114.310645 C1026.01903,116.019355 1027.76742,117.811935 1029.45839,119.545806 C1030.61839,120.735161 1031.81677,121.95871 1033.03226,123.151935 L1033.03226,138.663871 L1022.51097,128.142581 C1022.50581,127.20129 1022.46161,119.277097 1022.46129,115.309355 C1022.46097,114.775161 1022.02806,114.341613 1021.49323,114.341935 C1020.95903,114.341935 1020.52548,114.775484 1020.52581,115.309677 C1020.52613,118.249355 1020.55065,123.356774 1020.56516,126.196452 L1014.15516,119.786774 C1013.77774,119.40871 1013.16452,119.40871 1012.78677,119.786774 C1012.40871,120.164516 1012.40871,120.777742 1012.78677,121.155161 L1018.91226,127.280645 C1017.9471,127.275484 1016.98516,127.266452 1016.04065,127.254516 C1013.5971,127.223548 1011.07097,127.191613 1008.52774,127.276452 C1007.99355,127.294194 1007.57484,127.74129 1007.59258,128.275806 C1007.61032,128.81 1008.05484,129.229032 1008.59194,129.210645 C1011.09065,129.128065 1013.59484,129.159355 1016.01645,129.189677 C1017.28,129.205484 1018.57387,1 29.221613 1019.87065,129.221613 C1020.19613,129.221613 1020.52161,129.218065 1020.84742,129.215806 L1031.66387,140.032258 L1016.42387,140.032258 C1015.09129,138.714516 1010.15516,133.83 1007.58742,131.262903 C1007.20935,130.885806 1006.59677,130.885484 1006.21903,131.263226 C1005.84097,131.64129 1005.84097,132.254194 1006.21903,132.632258 C1008.20903,134.62129 1011.61387,137.995161 1013.67194,140.032258 L1004.96774,140.032258 C1004.43355,140.032258 1004,140.465484 1004,141 C1004,141.534516 1004.43355,141.967742 1004.96774,141.967742 L1013.81387,141.967742 C1013.03774,142.73871 1012.25839,143.503548 1011.49226,144.250645 C1009.74355,145.956129 1007.93484,147.72 1006.19677,149.577419 C1005.83161,149.967742 1005.85161,150.58 1006.24194,150.945161 C1006.42871,151.119677 1006.66613,151.206452 1006.90323,151.206452 C1007.16161,151.206452 1007.41935,151.103226 1007.60968,150.899677 C1009.31774,149.074516 1011.11032,147.326774 1012.84355,145.636452 C1014.06387,144.446452 1015.32097,143.2161 29 1016.54387,141.967742 L1031.66387,141.967742 L1020.35387,153.277742 C1018.69323,153.264516 1017.02516,153.282903 1015.40613,153.303871 C1012.98484,153.333548 1010.48065,153.364839 1007.98194,153.282581 C1007.44742,153.27 1007.00032,153.683226 1006.98226,154.217742 C1006.96452,154.751935 1007.38323,155.199355 1007.91774,155.216774 C1010.46065,155.30129 1012.98677,155.269355 1015.43065,155.239032 C1016.4129,155.226774 1017.41452,155.217419 1018.41871,155.212903 L1012.78677,160.844839 C1012.40871,161.222258 1012.40871,161.835484 1012.78677,162.213226 C1012.97581,162.402258 1013.22355,162.496774 1013.47097,162.496774 C1013.71871,162.496774 1013.96645,162.402258 1014.15516,162.213226 L1019.95419,156.414194 C1019.93968,159.274839 1019.91613,164.283871 1019.91581,167.183548 C1019.91548,167.718065 1020.34903,168.151613 1020.88323,168.151613 L1020.88355,168.151613 C1021.41774,168.151613 1021.85097,167.718387 1021.85129,167.184194 C1021.85194,163.349677 1021.8929,155.82 1021.9,154.468387 L 1033.03226,143.336129 L1033.03226,158.848065 C1031.81613,160.042258 1030.6171,161.266129 1029.45645,162.456129 C1027.76613,164.189355 1026.01839,165.98129 1024.19323,167.689355 C1023.8029,168.054516 1023.78258,168.667097 1024.14774,169.057419 C1024.33839,169.260645 1024.59613,169.363871 1024.85452,169.363871 C1025.09161,169.363871 1025.32903,169.277097 1025.51548,169.102581 C1027.37323,167.364194 1029.13677,165.556129 1030.84226,163.807419 C1031.55935,163.072258 1032.29323,162.324516 1033.03226,161.579032 L1033.03226,170.032258 C1033.03226,170.566774 1033.46581,171 1034,171 C1034.53452,171 1034.96774,170.566774 1034.96774,170.032258 L1034.96774,161.533226 C1036.99387,163.580323 1040.44129,167.059355 1042.46097,169.080323 C1042.83903,169.458065 1043.45161,169.458387 1043.83,169.080645 C1044.20806,168.702581 1044.20806,168.09 1043.83,167.711935 C1041.19774,165.079032 1036.13,159.956452 1034.96774,158.781613 L1034.96774,143.336129 L1045.86806,154.236452 C1045.87645,155.739032 1045.9161 3,163.11129 1045.91677,166.890968 C1045.9171,167.425484 1046.35032,167.85871 1046.88484,167.85871 C1047.41935,167.85871 1047.85258,167.425161 1047.85226,166.890968 C1047.85194,164.011613 1047.82871,159.053226 1047.81419,156.182258 L1053.84484,162.213226 C1054.03355,162.402258 1054.28129,162.496774 1054.52903,162.496774 C1054.77645,162.496774 1055.02452,162.402258 1055.21323,162.213226 C1055.59129,161.835484 1055.59129,161.222258 1055.21323,160.844839 L1049.28839,154.919677 C1050.3129,154.924516 1051.33516,154.933548 1052.33774,154.946129 C1054.78097,154.977097 1057.30677,155.009032 1059.85065,154.924194 C1060.38484,154.906452 1060.80355,154.459355 1060.78581,153.924839 C1060.76774,153.390645 1060.32774,152.978387 1059.78613,152.99 C1057.2871,153.072258 1054.78323,153.040968 1052.36194,153.010968 C1050.72355,152.990323 1049.03484,152.97129 1047.35387,152.985484 L1036.33613,141.967742 L1051.9829,141.967742 C1053.20581,143.216129 1054.46323,144.446452 1055.68323,145.636452 C1057.41677, 147.326774 1059.20871,149.074516 1060.91677,150.899677 C1061.10742,151.103226 1061.36516,151.206452 1061.62387,151.206452 C1061.86065,151.206452 1062.09806,151.119677 1062.28484,150.945161 C1062.67516,150.58 1062.69548,149.967742 1062.33,149.577419 C1060.59194,147.72 1058.78355,145.956129 1057.03452,144.250645 C1056.26839,143.503548 1055.48903,142.73871 1054.7129,141.967742 L1063.03226,141.967742 C1063.56677,141.967742 1064,141.534516 1064,141 C1064,140.465484 1063.56677,140.032258 1063.03226,140.032258" id="status-on" transform="translate(1034.000000, 141.000000) rotate(65.000000) translate(-1034.000000, -141.000000) "></path> + </g> + </g> +</svg> \ No newline at end of file diff --git a/proxy/webext/icons/status-on(a)2x.png b/proxy/webext/icons/status-on(a)2x.png new file mode 100644 index 0000000..619feac Binary files /dev/null and b/proxy/webext/icons/status-on(a)2x.png differ diff --git a/proxy/webext/icons/status-on(a)3x.png b/proxy/webext/icons/status-on(a)3x.png new file mode 100644 index 0000000..cb86fe0 Binary files /dev/null and b/proxy/webext/icons/status-on(a)3x.png differ diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 8d1649e..83a3358 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -9,8 +9,8 @@ }, "browser_action": { "default_icon": { - "16": "icons/16.png", - "32": "icons/32.png" + "16": "icons/status-off.png", + "32": "icons/status-off(a)2x.png" } } }

1 0

[snowflake/master] Remove copy/paste signalling
by arlo＠torproject.org 08 May '19

08 May '19

commit 622005c79ed2e9f444d75dba90b3ee52fdc82a37 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Apr 30 22:05:40 2019 -0400 Remove copy/paste signalling --- README.md | 25 +-------------- client/README.md | 5 +-- client/lib/rendezvous.go | 78 ++------------------------------------------- client/lib/webrtc.go | 9 +----- client/snowflake.go | 13 +++----- client/torrc-manual | 7 ---- proxy/README.md | 5 --- proxy/proxypair.coffee | 7 +--- proxy/snowflake.coffee | 35 ++------------------ proxy/spec/ui.spec.coffee | 10 ++---- proxy/static/snowflake.html | 28 ---------------- proxy/ui.coffee | 25 --------------- server-webrtc/snowflake.go | 54 ++----------------------------- 13 files changed, 18 insertions(+), 283 deletions(-) diff --git a/README.md b/README.md index f5807a2..c031213 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ Pluggable Transport using WebRTC, inspired by Flashproxy. - [Test Environment](#test-environment) - [FAQ](#faq) - [Appendix](#appendix) - - [-- Testing Copy-Paste Via Browser Proxy --](#---testing-copy-paste-via-browser-proxy---) - [-- Testing directly via WebRTC Server --](#---testing-directly-via-webrtc-server---)  @@ -69,9 +68,7 @@ comma-separated list of ICE servers, which are required for NAT traversal. For logging, run `tail -F snowflake.log` in a second terminal. -You can modify the `torrc` to use your own broker, -or remove the options entirely which will default to the old copy paste -method (see `torrc-manual`): +You can modify the `torrc` to use your own broker: ``` ClientTransportPlugin snowflake exec ./client --meek @@ -155,26 +152,6 @@ go build ./proxy-go ``` -##### -- Testing Copy-Paste Via Browser Proxy -- - -Open a browser proxy, passing the `manual` parameter; e.g. -`http://127.0.0.1:8000/snowflake.html?manual=1`, - -Open up three terminals for the **client:** - -A: `tor -f torrc-manual SOCKSPort auto` - -B: `cat > signal` - -C: `tail -F snowflake.log` - -Then, in the browser proxy: - -- Look for the offer in terminal C; copy and paste it into the browser. -- Copy and paste the answer generated in the browser back to terminal B. -- Once WebRTC successfully connects, the browser terminal should turn green. - Shortly after, the tor client should bootstrap to 100%. - ##### -- Testing directly via WebRTC Server -- See server-webrtc/README.md for information on connecting directly to a diff --git a/client/README.md b/client/README.md index 96f3276..50bdba3 100644 --- a/client/README.md +++ b/client/README.md @@ -12,12 +12,9 @@ ClientTransportPlugin snowflake exec ./client \ -ice stun:stun.l.google.com:19302 ``` -`-url` should be the URL of a Broker instance. This is required to have -automated signalling (which is desired in most use cases). -When omitted, the client uses copy-paste signalling instead. +`-url` should be the URL of a Broker instance. `-front` is an optional front domain for the Broker request. `-ice` is a comma-separated list of ICE servers. These can be STUN or TURN servers. - diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 7436f54..d04b0b1 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -1,26 +1,20 @@ // WebRTC rendezvous requires the exchange of SessionDescriptions between // peers in order to establish a PeerConnection. // -// This file contains the two methods currently available to Snowflake: +// This file contains the one method currently available to Snowflake: // // - Domain-fronted HTTP signaling. The Broker automatically exchange offers // and answers between this client and some remote WebRTC proxy. -// (This is the recommended default, enabled via the flags in "torrc".) -// -// - Manual copy-paste signaling. User must create a signaling pipe. -// (The flags in torrc-manual allow this) + package lib import ( - "bufio" "bytes" "errors" "io/ioutil" "log" "net/http" "net/url" - "os" - "syscall" "github.com/keroserene/go-webrtc" ) @@ -143,71 +137,3 @@ func (w WebRTCDialer) Catch() (Snowflake, error) { err := connection.Connect() return connection, err } - -// CopyPasteDialer handles the interaction required to copy-paste the -// offers and answers. -// Implements |Tongue| interface to catch snowflakes manually. -// Supports recovery of connections. -type CopyPasteDialer struct { - webrtcConfig *webrtc.Configuration - signal *os.File - current *WebRTCPeer -} - -func NewCopyPasteDialer(iceServers IceServerList) *CopyPasteDialer { - log.Println("No HTTP signaling detected. Using manual copy-paste signaling.") - log.Println("Waiting for a \"signal\" pipe...") - // This FIFO receives signaling messages. - err := syscall.Mkfifo("signal", 0600) - if err != nil { - if syscall.EEXIST != err.(syscall.Errno) { - log.Fatal(err) - } - } - signalFile, err := os.OpenFile("signal", os.O_RDONLY, 0600) - if nil != err { - log.Fatal(err) - return nil - } - config := webrtc.NewConfiguration(iceServers...) - dialer := &CopyPasteDialer{ - webrtcConfig: config, - signal: signalFile, - } - go dialer.readSignals() - return dialer -} - -// Initialize a WebRTC Peer via manual copy-paste. -func (d *CopyPasteDialer) Catch() (Snowflake, error) { - if nil == d.signal { - return nil, errors.New("Cannot copy-paste dial without signal pipe.") - } - connection := NewWebRTCPeer(d.webrtcConfig, nil) - // Must keep track of pending new connection until copy-paste completes. - d.current = connection - // Outputs SDP offer to log, expecting user to copy-paste to the remote Peer. - // Blocks until user pastes back the answer. - err := connection.Connect() - d.current = nil - return connection, err -} - -// Manual copy-paste signalling. -func (d *CopyPasteDialer) readSignals() { - defer d.signal.Close() - log.Printf("CopyPasteDialer: reading messages from signal pipe.") - s := bufio.NewScanner(d.signal) - for s.Scan() { - msg := s.Text() - sdp := webrtc.DeserializeSessionDescription(msg) - if sdp == nil { - log.Printf("CopyPasteDialer: ignoring invalid signal message %+q", msg) - continue - } - d.current.answerChannel <- sdp - } - if err := s.Err(); err != nil { - log.Printf("signal FIFO: %s", err) - } -} diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index fe8b44c..71c96ab 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -284,14 +284,7 @@ func (c *WebRTCPeer) sendOfferToBroker() { // the Broker or signal pipe, then await for the SDP answer. func (c *WebRTCPeer) exchangeSDP() error { select { - case offer := <-c.offerChannel: - // Display for copy-paste when no broker available. - if nil == c.broker { - log.Printf("Please Copy & Paste the following to the peer:") - log.Printf("----------------") - log.Printf("\n\n" + offer.Serialize() + "\n\n") - log.Printf("----------------") - } + case <-c.offerChannel: case err := <-c.errorChannel: log.Println("Failed to prepare offer", err) c.Close() diff --git a/client/snowflake.go b/client/snowflake.go index 715f83f..9098de7 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -113,14 +113,11 @@ func main() { // Prepare to collect remote WebRTC peers. snowflakes := sf.NewPeers(*max) - if "" != *brokerURL { - // Use potentially domain-fronting broker to rendezvous. - broker := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) - snowflakes.Tongue = sf.NewWebRTCDialer(broker, iceServers) - } else { - // Otherwise, use manual copy and pasting of SDP messages. - snowflakes.Tongue = sf.NewCopyPasteDialer(iceServers) - } + + // Use potentially domain-fronting broker to rendezvous. + broker := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) + snowflakes.Tongue = sf.NewWebRTCDialer(broker, iceServers) + if nil == snowflakes.Tongue { log.Fatal("Unable to prepare rendezvous method.") return diff --git a/client/torrc-manual b/client/torrc-manual deleted file mode 100644 index c043924..0000000 --- a/client/torrc-manual +++ /dev/null @@ -1,7 +0,0 @@ -UseBridges 1 -DataDirectory datadir - -ClientTransportPlugin snowflake exec ./client \ --log snowflake.log - -Bridge snowflake 0.0.3.0:1 diff --git a/proxy/README.md b/proxy/README.md index 856b30c..634e13c 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -33,8 +33,3 @@ With no parameters, snowflake uses the default relay `snowflake.bamsoftware.com:443` and uses automatic signaling with the default broker at `https://snowflake-broker.bamsoftware.com/`. - -Here are optional parameters to include in the query string. -``` -manual - enables copy-paste signalling mode. -``` diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index d3340ed..ee2f3e7 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -40,15 +40,11 @@ class ProxyPair ] } @pc.onicecandidate = (evt) => # Browser sends a null candidate once the ICE gathering completes. - # In this case, it makes sense to send one copy-paste blob. if null == evt.candidate # TODO: Use a promise.all to tell Snowflake about all offers at once, # once multiple proxypairs are supported. dbg 'Finished gathering ICE candidates.' - if COPY_PASTE_ENABLED - Signalling.send @pc.localDescription - else - snowflake.broker.sendAnswer @id, @pc.localDescription + snowflake.broker.sendAnswer @id, @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => channel = dc.channel @@ -193,4 +189,3 @@ class ProxyPair 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 8cb4d46..a8fc183 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -18,13 +18,11 @@ RELAY = # Original non-wss relay: # host: '192.81.135.242' # port: 9902 -COPY_PASTE_ENABLED = false COOKIE_NAME = "snowflake-allow" silenceNotifications = false query = Query.parse(location) DEBUG = Params.getBool(query, 'debug', false) -COPY_PASTE_ENABLED = Params.getBool(query, 'manual', false) # Bytes per second. Set to undefined to disable limit. DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined @@ -78,17 +76,14 @@ class Snowflake setRelayAddr: (relayAddr) -> @relayAddr = relayAddr log 'Using ' + relayAddr.host + ':' + relayAddr.port + ' as Relay.' - log 'Input offer from the snowflake client:' if COPY_PASTE_ENABLED return true # Initialize WebRTC PeerConnection, which requires beginning the signalling - # process. If in copy paste mode, the user will need to copy and paste the SDP - # blobs. Otherwise, |pollBroker| automatically arranges signalling. + # process. |pollBroker| automatically arranges signalling. beginWebRTC: -> @state = MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr - return if COPY_PASTE_ENABLED log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' @pollBroker() @@ -182,31 +177,6 @@ class Snowflake snowflake = null -# Signalling channel - just tells user to copy paste to the peer. -# When copy-paste mode is not enabled, this is handled automatically by Broker. -Signalling = - send: (msg) -> - log '---- Please copy the below to peer ----\n' - log JSON.stringify msg - log '\n' - - receive: (msg) -> - recv = '' - try - recv = JSON.parse msg - catch e - log 'Invalid JSON.' - return - desc = recv['sdp'] - if !desc - log 'Invalid SDP.' - return false - pair = snowflake.nextAvailableProxyPair() - if !pair - log 'At client capacity.' - return false - snowflake.receiveOffer pair, msg - # Log to both console and UI if applicable. # Requires that the snowflake and UI objects are hooked up in order to # log to console. @@ -246,8 +216,7 @@ init = (isNode) -> return # Otherwise, begin setting up WebRTC and acting as a proxy. - log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED - dbg 'Contacting Broker at ' + broker.url if not COPY_PASTE_ENABLED + dbg 'Contacting Broker at ' + broker.url snowflake.setRelayAddr RELAY snowflake.beginWebRTC() diff --git a/proxy/spec/ui.spec.coffee b/proxy/spec/ui.spec.coffee index 1628d83..8229169 100644 --- a/proxy/spec/ui.spec.coffee +++ b/proxy/spec/ui.spec.coffee @@ -10,16 +10,12 @@ describe 'UI', -> it 'activates debug mode when badge does not exist', -> spyOn(document, 'getElementById').and.callFake (id) -> return null if 'badge' == id - return { - focus: -> - } + return {} u = new UI() expect(u.debug).toBe true - expect(document.getElementById.calls.count()).toEqual 5 + expect(document.getElementById.calls.count()).toEqual 3 expect(u.$status).not.toBeNull() expect(u.$msglog).not.toBeNull() - expect(u.$send).not.toBeNull() - expect(u.$input).not.toBeNull() it 'is not debug mode when badge exists', -> spyOn(document, 'getElementById').and.callFake (id) -> @@ -31,8 +27,6 @@ describe 'UI', -> expect(document.getElementById.calls.count()).toEqual 1 expect(u.$status).toBeNull() expect(u.$msglog).toBeNull() - expect(u.$send).toBeNull() - expect(u.$input).toBeNull() it 'sets status message only when in debug mode', -> u = new UI() diff --git a/proxy/static/snowflake.html b/proxy/static/snowflake.html index 4b42bae..fb2c0e5 100644 --- a/proxy/static/snowflake.html +++ b/proxy/static/snowflake.html @@ -40,30 +40,6 @@ margin-bottom: 1em; padding: 8px; } - .inputarea { - position: relative; - width: 100%; - height: 3em; - display: block; - } - #input { - display: inline-block; - position: absolute; left: 0; - width: 89%; height: 100%; - padding: 8px 30px; - font-size: 80%; - color: #fff; - background-color: rgba(0,0,0,0.9); - border: 1px solid #999; - } - #send { - display: inline-block; position: absolute; - right: 0; top: 0; height: 100%; width: 10%; - background-color: #202; color: #f8f; - font-variant: small-caps; font-size: 100%; - border: none; /* box-shadow: 0 2px 5px #000; */ - } - #send:hover { background-color: #636; } #status { background-color: rgba(0,0,0,0.9); color: #999; margin: 8px 0; padding: 8px 1em; cursor: default; @@ -79,10 +55,6 @@ </div> <textarea id="msglog" readonly> </textarea> - <div class="inputarea"> - <input type="text" id="input"> - <input type="submit" id="send" value="send"> - </div> </div> </body> diff --git a/proxy/ui.coffee b/proxy/ui.coffee index 1603ec3..fb13aa4 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -7,8 +7,6 @@ class UI # DOM elements references. $msglog: null - $send: null - $input: null $status: null constructor: -> @@ -21,14 +19,6 @@ class UI @$msglog = document.getElementById('msglog') @$msglog.value = '' - @$send = document.getElementById('send') - @$send.onclick = @acceptInput - - @$input = document.getElementById('input') - @$input.focus() - @$input.onkeydown = (e) => - @$send.onclick() if 13 == e.keyCode # enter - # Status bar setStatus: (msg) => return if !@debug @@ -40,21 +30,6 @@ class UI else @$badge.className = if connected then 'active' else '' - # Local input from keyboard into message window. - acceptInput: => - msg = @$input.value - if !COPY_PASTE_ENABLED - @log 'No input expected - Copy Paste Signalling disabled.' - else switch snowflake.state - when MODE.WEBRTC_CONNECTING - Signalling.receive msg - when MODE.WEBRTC_READY - @log 'No input expected - WebRTC connected.' - else - @log 'ERROR: ' + msg - @$input.value = '' - @$input.focus() - log: (msg) => return if !@debug # Scroll to latest diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index 4d6641a..be9f012 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -1,7 +1,6 @@ package main import ( - "bufio" "flag" "fmt" "io" @@ -194,43 +193,6 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. return pc, nil } -// Create a signaling named pipe and feed offers from it into -// makePeerConnectionFromOffer. -func receiveSignalsFIFO(filename string, config *webrtc.Configuration) error { - err := syscall.Mkfifo(filename, 0600) - if err != nil { - if err.(syscall.Errno) != syscall.EEXIST { - return err - } - } - signalFile, err := os.OpenFile(filename, os.O_RDONLY, 0600) - if err != nil { - return err - } - defer signalFile.Close() - - s := bufio.NewScanner(signalFile) - for s.Scan() { - msg := s.Text() - sdp := webrtc.DeserializeSessionDescription(msg) - if sdp == nil { - log.Printf("ignoring invalid signal message %+q", msg) - continue - } - - pc, err := makePeerConnectionFromOffer(sdp, config) - if err != nil { - log.Printf("makePeerConnectionFromOffer: %s", err) - continue - } - // Write offer to log for manual signaling. - log.Printf("----------------") - fmt.Fprintln(logFile, pc.LocalDescription().Serialize()) - log.Printf("----------------") - } - return s.Err() -} - func main() { var err error var httpAddr string @@ -260,24 +222,14 @@ func main() { webRTCConfig := webrtc.NewConfiguration(webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - // Start FIFO-based signaling receiver. + // Start HTTP-based signaling receiver. go func() { - err := receiveSignalsFIFO("signal", webRTCConfig) + err := receiveSignalsHTTP(httpAddr, webRTCConfig) if err != nil { - log.Printf("receiveSignalsFIFO: %s", err) + log.Printf("receiveSignalsHTTP: %s", err) } }() - // Start HTTP-based signaling receiver. - if httpAddr != "" { - go func() { - err := receiveSignalsHTTP(httpAddr, webRTCConfig) - if err != nil { - log.Printf("receiveSignalsHTTP: %s", err) - } - }() - } - for _, bindaddr := range ptInfo.Bindaddrs { switch bindaddr.MethodName { case ptMethodName:

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 08 May '19

08 May '19

commit 33a6ecbcb60c216a316c249dbd3d051bc091af88 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:21:36 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3d22d5f12..80804f270 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -173,7 +173,7 @@ msgid "" "manual.torproject.org/) section on [censorship](https://tb-" "manual.torproject.org/circumvention/)" msgstr "" -"Pour de plus amples renseignements, veuillez consulter la rubrique sur la " +"Pour plus de précisions, veuillez consulter la rubrique sur la " "[censure](https://tb-manual.torproject.org/fr/circumvention//) du [guide " "d’utilisation du Navigateur Tor(https://tb-manual.torproject.org/fr)." @@ -303,7 +303,7 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our " "wiki</a></mark>." msgstr "" -"De plus amples renseignements sur Tor + RPV se trouvent dans <mark><a " +"Plus de précisions sur Tor + RPV se trouvent dans <mark><a " "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusRPV\">notre " "wiki</a></mark>." @@ -742,7 +742,8 @@ msgstr "" #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Subkey fingerprint: A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136" msgstr "" -"Empreinte de la sous-clef: 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" +"Empreinte de la sous-clef : 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF " +"06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1233,10 +1234,10 @@ msgid "" "users.cs.umn.edu/~hoppernj/single_guard.pdf\">paper</a></mark> on entry " "guards." msgstr "" -"Pour de plus amples renseignements sur le fonctionnement des relais de " -"garde, consultez cet <mark><a href=\"https://blog.torproject.org/improving-" -"tors-anonymity-changing-guard-parameters\">article de blogue</a></mark> et " -"cet <mark><a href=\"https://www-" +"Pour plus de précisions sur le fonctionnement des relais de garde, consultez" +" cet <mark><a href=\"https://blog.torproject.org/improving-tors-anonymity-" +"changing-guard-parameters\">article de blogue</a></mark> et cet <mark><a " +"href=\"https://www-" "users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a></mark> sur les " "gardes d’entrée." @@ -2394,7 +2395,7 @@ msgid "" "<mark><a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a></mark> " "web pages." msgstr "" -"De plus amples renseignements se trouvent sur les pages Web d’<mark><a " +"Plus de précisions se trouvent sur les pages Web d’<mark><a " "href=\"https://guardianproject.info/apps/orbot/\">Orbot</a></mark> et " "d’<mark><a " "href=\"https://guardianproject.info/apps/orfox/\">Orfox</a></mark>." @@ -6408,7 +6409,7 @@ msgid "" "You can find more information about donating on our <mark><a " "href=\"https://donate.torproject.org/donor-faq\">donor FAQ</a></mark>." msgstr "" -"De plus amples renseignements sur les dons se trouvent dans notre <mark><a " +"Plus de précisions sur les dons se trouvent dans notre <mark><a " "href=\"https://donate.torproject.org/donor-faq\">FAQ pour les " "donateurs</a></mark>."

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 08 May '19

08 May '19

commit 6fb21708e56ad61eadb5290aa00fcb2696691390 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:21:29 2019 +0000 Update translations for support-portal --- contents+fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3d22d5f12..80804f270 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -173,7 +173,7 @@ msgid "" "manual.torproject.org/) section on [censorship](https://tb-" "manual.torproject.org/circumvention/)" msgstr "" -"Pour de plus amples renseignements, veuillez consulter la rubrique sur la " +"Pour plus de précisions, veuillez consulter la rubrique sur la " "[censure](https://tb-manual.torproject.org/fr/circumvention//) du [guide " "d’utilisation du Navigateur Tor(https://tb-manual.torproject.org/fr)." @@ -303,7 +303,7 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our " "wiki</a></mark>." msgstr "" -"De plus amples renseignements sur Tor + RPV se trouvent dans <mark><a " +"Plus de précisions sur Tor + RPV se trouvent dans <mark><a " "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusRPV\">notre " "wiki</a></mark>." @@ -742,7 +742,8 @@ msgstr "" #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Subkey fingerprint: A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136" msgstr "" -"Empreinte de la sous-clef: 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" +"Empreinte de la sous-clef : 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF " +"06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1233,10 +1234,10 @@ msgid "" "users.cs.umn.edu/~hoppernj/single_guard.pdf\">paper</a></mark> on entry " "guards." msgstr "" -"Pour de plus amples renseignements sur le fonctionnement des relais de " -"garde, consultez cet <mark><a href=\"https://blog.torproject.org/improving-" -"tors-anonymity-changing-guard-parameters\">article de blogue</a></mark> et " -"cet <mark><a href=\"https://www-" +"Pour plus de précisions sur le fonctionnement des relais de garde, consultez" +" cet <mark><a href=\"https://blog.torproject.org/improving-tors-anonymity-" +"changing-guard-parameters\">article de blogue</a></mark> et cet <mark><a " +"href=\"https://www-" "users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a></mark> sur les " "gardes d’entrée." @@ -2394,7 +2395,7 @@ msgid "" "<mark><a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a></mark> " "web pages." msgstr "" -"De plus amples renseignements se trouvent sur les pages Web d’<mark><a " +"Plus de précisions se trouvent sur les pages Web d’<mark><a " "href=\"https://guardianproject.info/apps/orbot/\">Orbot</a></mark> et " "d’<mark><a " "href=\"https://guardianproject.info/apps/orfox/\">Orfox</a></mark>." @@ -6408,7 +6409,7 @@ msgid "" "You can find more information about donating on our <mark><a " "href=\"https://donate.torproject.org/donor-faq\">donor FAQ</a></mark>." msgstr "" -"De plus amples renseignements sur les dons se trouvent dans notre <mark><a " +"Plus de précisions sur les dons se trouvent dans notre <mark><a " "href=\"https://donate.torproject.org/donor-faq\">FAQ pour les " "donateurs</a></mark>."

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 08 May '19

08 May '19

commit 5c0a7d997cd258a18875539e796c790d7c3b3e3e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:18:35 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3ef482d55..4ebe216e3 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -828,9 +828,9 @@ msgstr "" "L’accès direct au réseau Tor pourrait parfois être bloqué par votre " "fournisseur d’accès à internet ou par un gouvernement. Le Navigateur Tor " "comprend des outils de contournement de ces blocages. On appelle ces outils " -"des « transports enfichables ». La page <a href=\"/en-" -"US/transports\">Transports enfichables</a> contient des renseignements " -"supplémentaires sur les types de transports proposés actuellement." +"des « transports enfichables ». Plus de précisions sur les types de " +"transports proposés actuellement se trouvent sur la page <a href=\"/en-" +"US/transports\">Transports enfichables</a>." #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) @@ -1030,8 +1030,8 @@ msgstr "" "automatiquement et aléatoirement sélectionné par Tor. Mais il est différent " "des autres nœuds du circuit. Afin d’éviter les attaques par profilage, le " "nœud de garde ne change qu’après 2 à 3 mois, contrairement aux autres nœuds " -"qui changent pour chaque nouveau domaine. Pour de plus amples renseignements" -" sur les gardes, consultez la <a " +"qui changent pour chaque nouveau domaine. Pour plus de précisions sur les " +"gardes, consultez la <a " "href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> et le <a " "href=\"https://support.torproject.org/tbb/tbb-2/\">Portail d’assistance</a>."

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 08 May '19

08 May '19

commit 00b496e848e7e0ff217a1213e6c8e30567bf1da4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:18:28 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3ef482d55..4ebe216e3 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -828,9 +828,9 @@ msgstr "" "L’accès direct au réseau Tor pourrait parfois être bloqué par votre " "fournisseur d’accès à internet ou par un gouvernement. Le Navigateur Tor " "comprend des outils de contournement de ces blocages. On appelle ces outils " -"des « transports enfichables ». La page <a href=\"/en-" -"US/transports\">Transports enfichables</a> contient des renseignements " -"supplémentaires sur les types de transports proposés actuellement." +"des « transports enfichables ». Plus de précisions sur les types de " +"transports proposés actuellement se trouvent sur la page <a href=\"/en-" +"US/transports\">Transports enfichables</a>." #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) @@ -1030,8 +1030,8 @@ msgstr "" "automatiquement et aléatoirement sélectionné par Tor. Mais il est différent " "des autres nœuds du circuit. Afin d’éviter les attaques par profilage, le " "nœud de garde ne change qu’après 2 à 3 mois, contrairement aux autres nœuds " -"qui changent pour chaque nouveau domaine. Pour de plus amples renseignements" -" sur les gardes, consultez la <a " +"qui changent pour chaque nouveau domaine. Pour plus de précisions sur les " +"gardes, consultez la <a " "href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> et le <a " "href=\"https://support.torproject.org/tbb/tbb-2/\">Portail d’assistance</a>."

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 08 May '19

08 May '19

commit 812aff97f5576f8270198912e44162be4d80c53b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:15:59 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 0d0e11fa2..fe525845d 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1311,8 +1311,8 @@ msgid "" "class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">EFF site</a>." msgstr "" -"Vous trouverez plus de renseignements sur le statut juridique de Tor sur le " -"<a class=\"hyperlinks links\" target=\"_blank\" " +"Vous trouverez plus de précisions sur le statut juridique de Tor sur le <a " +"class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">site de la FFÉ</a>." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:196 @@ -1320,7 +1320,7 @@ msgid "" "Where can I find out more about the Tor Project, especially financial " "information?" msgstr "" -"Où puis-je en savoir davantage sur le Projet Tor, en particulier les " +"Où puis-je trouver plus de précisions sur le Projet Tor, en particulier les " "renseignements financiers ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:200

1 0