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

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

08 May '19

commit 2713f4bcb9133c7f6947b81bc53ed2a6d5680d18 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 17:50:48 2019 +0000 Update translations for support-portal --- contents+fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index eb9e2e5b2..2cdffe65f 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1526,7 +1526,8 @@ msgstr "Il est facile de supprimer le Navigateur Tor de votre système :" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "* Locate your Tor Browser folder or application." -msgstr "* Trouvez le dossier ou l’application du Navigateur Tor" +msgstr "" +"* Trouvez votre dossier « Tor Browser » ou l’application du Navigateur Tor." #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description)

1 0

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

08 May '19

commit 7f7ca0de20b4d6fd2dff7a2820368e8e21c52d68 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 17:21:01 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b157cde2e..eb9e2e5b2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1280,8 +1280,8 @@ msgid "" "If this doesn't fix the problem, see the Troubleshooting page on the [Tor " "Browser manual](https://tb-manual.torproject.org/en-US/troubleshooting)." msgstr "" -"Si cela ne répare pas le problème, consultez la page Dépannage sur le [guide" -" d’utilisation du Navigateur Tor] (https://tb-" +"Si cela ne corrige pas le problème, consultez la page Dépannage sur le " +"[guide d’utilisation du Navigateur Tor](https://tb-" "manual.torproject.org/fr/troubleshooting)" #: https//support.torproject.org/tbb/tbb-21/

1 0

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

08 May '19

commit 9cde92a92be4f142e8a4c4d92d701fc68bcb509c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 17:20:53 2019 +0000 Update translations for support-portal --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b157cde2e..eb9e2e5b2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1280,8 +1280,8 @@ msgid "" "If this doesn't fix the problem, see the Troubleshooting page on the [Tor " "Browser manual](https://tb-manual.torproject.org/en-US/troubleshooting)." msgstr "" -"Si cela ne répare pas le problème, consultez la page Dépannage sur le [guide" -" d’utilisation du Navigateur Tor] (https://tb-" +"Si cela ne corrige pas le problème, consultez la page Dépannage sur le " +"[guide d’utilisation du Navigateur Tor](https://tb-" "manual.torproject.org/fr/troubleshooting)" #: https//support.torproject.org/tbb/tbb-21/

1 0

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

08 May '19

commit adeb8d710516e6ecd385e4c325385bed9a7dce4e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:51:04 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 80804f270..b157cde2e 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1341,10 +1341,9 @@ msgid "" " route all of their traffic, and the load on each server can sometimes cause" " latency." msgstr "" -"Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec " -"seulement un peu plus de 6 000 relais pour acheminer tout leur trafic. La " -"charge à laquelle chaque serveur doit répondre peut parfois entraîner une " -"latence." +"Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec un " +"peu plus de 6 000 relais pour acheminer tout leur trafic. La charge à " +"laquelle chaque serveur doit répondre peut parfois entraîner une latence." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description)

1 0

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

08 May '19

commit e17b79e0306688a146eca172317eea89d6e80618 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 15:50:57 2019 +0000 Update translations for support-portal --- contents+fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 80804f270..b157cde2e 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1341,10 +1341,9 @@ msgid "" " route all of their traffic, and the load on each server can sometimes cause" " latency." msgstr "" -"Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec " -"seulement un peu plus de 6 000 relais pour acheminer tout leur trafic. La " -"charge à laquelle chaque serveur doit répondre peut parfois entraîner une " -"latence." +"Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec un " +"peu plus de 6 000 relais pour acheminer tout leur trafic. La charge à " +"laquelle chaque serveur doit répondre peut parfois entraîner une latence." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description)

1 0

[snowflake/master] Move init into its own file
by arlo＠torproject.org 08 May '19

08 May '19

commit 25dac378ee11a9c7a33ef9527d5acc06b89c49e9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 1 08:59:10 2019 -0400 Move init into its own file --- proxy/Cakefile | 1 + proxy/init.coffee | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ proxy/snowflake.coffee | 97 -------------------------------------------------- 3 files changed, 96 insertions(+), 97 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 8032034..d984c1b 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -5,6 +5,7 @@ fs = require 'fs' FILES = [ 'shims.coffee' 'util.coffee' + 'init.coffee' 'proxypair.coffee' 'websocket.coffee' 'broker.coffee' diff --git a/proxy/init.coffee b/proxy/init.coffee new file mode 100644 index 0000000..22176e5 --- /dev/null +++ b/proxy/init.coffee @@ -0,0 +1,95 @@ +# General snowflake proxy constants. +# For websocket-specific constants, see websocket.coffee. +BROKER = 'snowflake-broker.bamsoftware.com' +RELAY = + host: 'snowflake.bamsoftware.com' + port: '443' + # Original non-wss relay: + # host: '192.81.135.242' + # port: 9902 +COOKIE_NAME = "snowflake-allow" + +silenceNotifications = false +query = Query.parse(location) +DEBUG = Params.getBool(query, 'debug', false) + +# Bytes per second. Set to undefined to disable limit. +DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined +MIN_RATE_LIMIT = 10 * 1024 +RATE_LIMIT_HISTORY = 5.0 +DEFAULT_BROKER_POLL_INTERVAL = 5.0 * 1000 + +MAX_NUM_CLIENTS = 1 +CONNECTIONS_PER_CLIENT = 1 + +# TODO: Different ICE servers. +config = { + iceServers: [ + { urls: ['stun:stun.l.google.com:19302'] } + ] +} + +# Janky state machine +MODE = + INIT: 0 + WEBRTC_CONNECTING: 1 + WEBRTC_READY: 2 + +CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' + +snowflake = null + +# Log to both console and UI if applicable. +# Requires that the snowflake and UI objects are hooked up in order to +# log to console. +log = (msg) -> + console.log 'Snowflake: ' + msg + snowflake?.ui?.log msg + +dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug + +snowflakeIsDisabled = -> + cookies = Parse.cookie document.cookie + # Do nothing if snowflake has not been opted in by user. + if cookies[COOKIE_NAME] != '1' + log 'Not opted-in. Please click the badge to change options.' + return true + # Also do nothing if running in Tor Browser. + if mightBeTBB() + log 'Will not run within Tor Browser.' + return true + return false + + +### +Entry point. +### +init = (isNode) -> + # Hook up to the debug UI if available. + ui = if isNode then null else new UI() + silenceNotifications = Params.getBool(query, 'silent', false) + broker = new Broker BROKER + snowflake = new Snowflake broker, ui + + log '== snowflake proxy ==' + if snowflakeIsDisabled() + # Do not activate the proxy if any number of conditions are true. + log 'Currently not active.' + return + + # Otherwise, begin setting up WebRTC and acting as a proxy. + dbg 'Contacting Broker at ' + broker.url + snowflake.setRelayAddr RELAY + snowflake.beginWebRTC() + +# Notification of closing tab with active proxy. +window.onbeforeunload = -> + if !silenceNotifications && MODE.WEBRTC_READY == snowflake.state + return CONFIRMATION_MESSAGE + null + +window.onunload = -> + pair.close() for pair in snowflake.proxyPairs + null + +window.onload = init.bind null, false diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index a8fc183..0192818 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -9,48 +9,8 @@ this proxy must always act as the answerer. TODO: More documentation ### -# General snowflake proxy constants. -# For websocket-specific constants, see websocket.coffee. -BROKER = 'snowflake-broker.bamsoftware.com' -RELAY = - host: 'snowflake.bamsoftware.com' - port: '443' - # Original non-wss relay: - # host: '192.81.135.242' - # port: 9902 -COOKIE_NAME = "snowflake-allow" - -silenceNotifications = false -query = Query.parse(location) -DEBUG = Params.getBool(query, 'debug', false) - -# Bytes per second. Set to undefined to disable limit. -DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined -MIN_RATE_LIMIT = 10 * 1024 -RATE_LIMIT_HISTORY = 5.0 -DEFAULT_BROKER_POLL_INTERVAL = 5.0 * 1000 - -MAX_NUM_CLIENTS = 1 -CONNECTIONS_PER_CLIENT = 1 - -# TODO: Different ICE servers. -config = { - iceServers: [ - { urls: ['stun:stun.l.google.com:19302'] } - ] -} - -# Janky state machine -MODE = - INIT: 0 - WEBRTC_CONNECTING: 1 - WEBRTC_READY: 2 - -CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' - # Minimum viable snowflake for now - just 1 client. class Snowflake - relayAddr: null proxyPairs: [] rateLimit: null @@ -174,60 +134,3 @@ class Snowflake log 'Snowflake resetting...' @retries = 0 @beginWebRTC() - -snowflake = null - -# Log to both console and UI if applicable. -# Requires that the snowflake and UI objects are hooked up in order to -# log to console. -log = (msg) -> - console.log 'Snowflake: ' + msg - snowflake?.ui?.log msg - -dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug - -snowflakeIsDisabled = -> - cookies = Parse.cookie document.cookie - # Do nothing if snowflake has not been opted in by user. - if cookies[COOKIE_NAME] != '1' - log 'Not opted-in. Please click the badge to change options.' - return true - # Also do nothing if running in Tor Browser. - if mightBeTBB() - log 'Will not run within Tor Browser.' - return true - return false - - -### -Entry point. -### -init = (isNode) -> - # Hook up to the debug UI if available. - ui = if isNode then null else new UI() - silenceNotifications = Params.getBool(query, 'silent', false) - broker = new Broker BROKER - snowflake = new Snowflake broker, ui - - log '== snowflake proxy ==' - if snowflakeIsDisabled() - # Do not activate the proxy if any number of conditions are true. - log 'Currently not active.' - return - - # Otherwise, begin setting up WebRTC and acting as a proxy. - dbg 'Contacting Broker at ' + broker.url - snowflake.setRelayAddr RELAY - snowflake.beginWebRTC() - -# Notification of closing tab with active proxy. -window.onbeforeunload = -> - if !silenceNotifications && MODE.WEBRTC_READY == snowflake.state - return CONFIRMATION_MESSAGE - null - -window.onunload = -> - pair.close() for pair in snowflake.proxyPairs - null - -window.onload = init.bind null, false

1 0

[snowflake/master] Make a WS class to eliminate globals
by arlo＠torproject.org 08 May '19

08 May '19

commit bd5887a8765f76b46f9203a216c6896a076dfebe Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 1 10:11:15 2019 -0400 Make a WS class to eliminate globals --- proxy/Cakefile | 1 + proxy/proxypair.coffee | 2 +- proxy/spec/util.spec.coffee | 35 ------------- proxy/spec/websocket.spec.coffee | 38 ++++++++++++++ proxy/websocket.coffee | 107 ++++++++++++++++++++------------------- 5 files changed, 94 insertions(+), 89 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index d984c1b..7da528e 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -18,6 +18,7 @@ FILES_SPEC = [ 'spec/broker.spec.coffee' 'spec/proxypair.spec.coffee' 'spec/snowflake.spec.coffee' + 'spec/websocket.spec.coffee' ] FILES_ALL = FILES.concat FILES_SPEC OUTFILE = 'build/snowflake.js' diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index ee2f3e7..81ddd41 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -103,7 +103,7 @@ class ProxyPair if peer_ip? params.push(["client_ip", peer_ip]) - @relay = makeWebsocket @relayAddr, params + @relay = WS.makeWebsocket @relayAddr, params @relay.label = 'websocket-relay' @relay.onopen = => if @timer diff --git a/proxy/spec/util.spec.coffee b/proxy/spec/util.spec.coffee index fd5b77e..19f0041 100644 --- a/proxy/spec/util.spec.coffee +++ b/proxy/spec/util.spec.coffee @@ -2,41 +2,6 @@ jasmine tests for Snowflake utils ### -describe 'BuildUrl', -> - it 'should parse just protocol and host', -> - expect(buildUrl('http', 'example.com')).toBe 'http://example.com' - it 'should handle different ports', -> - expect buildUrl 'http', 'example.com', 80 - .toBe 'http://example.com' - expect buildUrl 'http', 'example.com', 81 - .toBe 'http://example.com:81' - expect buildUrl 'http', 'example.com', 443 - .toBe 'http://example.com:443' - expect buildUrl 'http', 'example.com', 444 - .toBe 'http://example.com:444' - it 'should handle paths', -> - expect buildUrl 'http', 'example.com', 80, '/' - .toBe 'http://example.com/' - expect buildUrl 'http', 'example.com', 80,'/test?k=%#v' - .toBe 'http://example.com/test%3Fk%3D%25%23v' - expect buildUrl 'http', 'example.com', 80, '/test' - .toBe 'http://example.com/test' - it 'should handle params', -> - expect buildUrl 'http', 'example.com', 80, '/test', [['k', '%#v']] - .toBe 'http://example.com/test?k=%25%23v' - expect buildUrl 'http', 'example.com', 80, '/test', [['a', 'b'], ['c', 'd']] - .toBe 'http://example.com/test?a=b&c=d' - it 'should handle ips', -> - expect buildUrl 'http', '1.2.3.4' - .toBe 'http://1.2.3.4' - expect buildUrl 'http', '1:2::3:4' - .toBe 'http://[1:2::3:4]' - it 'should handle bogus', -> - expect buildUrl 'http', 'bog][us' - .toBe 'http://bog%5D%5Bus' - expect buildUrl 'http', 'bog:u]s' - .toBe 'http://bog%3Au%5Ds' - describe 'Parse', -> describe 'cookie', -> diff --git a/proxy/spec/websocket.spec.coffee b/proxy/spec/websocket.spec.coffee new file mode 100644 index 0000000..178bcfd --- /dev/null +++ b/proxy/spec/websocket.spec.coffee @@ -0,0 +1,38 @@ +### +jasmine tests for Snowflake websocket +### + +describe 'BuildUrl', -> + it 'should parse just protocol and host', -> + expect(WS.buildUrl('http', 'example.com')).toBe 'http://example.com' + it 'should handle different ports', -> + expect WS.buildUrl 'http', 'example.com', 80 + .toBe 'http://example.com' + expect WS.buildUrl 'http', 'example.com', 81 + .toBe 'http://example.com:81' + expect WS.buildUrl 'http', 'example.com', 443 + .toBe 'http://example.com:443' + expect WS.buildUrl 'http', 'example.com', 444 + .toBe 'http://example.com:444' + it 'should handle paths', -> + expect WS.buildUrl 'http', 'example.com', 80, '/' + .toBe 'http://example.com/' + expect WS.buildUrl 'http', 'example.com', 80,'/test?k=%#v' + .toBe 'http://example.com/test%3Fk%3D%25%23v' + expect WS.buildUrl 'http', 'example.com', 80, '/test' + .toBe 'http://example.com/test' + it 'should handle params', -> + expect WS.buildUrl 'http', 'example.com', 80, '/test', [['k', '%#v']] + .toBe 'http://example.com/test?k=%25%23v' + expect WS.buildUrl 'http', 'example.com', 80, '/test', [['a', 'b'], ['c', 'd']] + .toBe 'http://example.com/test?a=b&c=d' + it 'should handle ips', -> + expect WS.buildUrl 'http', '1.2.3.4' + .toBe 'http://1.2.3.4' + expect WS.buildUrl 'http', '1:2::3:4' + .toBe 'http://[1:2::3:4]' + it 'should handle bogus', -> + expect WS.buildUrl 'http', 'bog][us' + .toBe 'http://bog%5D%5Bus' + expect WS.buildUrl 'http', 'bog:u]s' + .toBe 'http://bog%3Au%5Ds' diff --git a/proxy/websocket.coffee b/proxy/websocket.coffee index 5487df1..00a65a8 100644 --- a/proxy/websocket.coffee +++ b/proxy/websocket.coffee @@ -2,58 +2,59 @@ Only websocket-specific stuff. ### -WSS_ENABLED = true -DEFAULT_PORTS = - http: 80 - https: 443 - -# Build an escaped URL string from unescaped components. Only scheme and host -# are required. See RFC 3986, section 3. -buildUrl = (scheme, host, port, path, params) -> - parts = [] - parts.push(encodeURIComponent scheme) - parts.push '://' - - # If it contains a colon but no square brackets, treat it as IPv6. - if host.match(/:/) && !host.match(/[[\]]/) - parts.push '[' - parts.push host - parts.push ']' - else - parts.push(encodeURIComponent host) - - if undefined != port && DEFAULT_PORTS[scheme] != port - parts.push ':' - parts.push(encodeURIComponent port.toString()) - - if undefined != path && '' != path - if !path.match(/^\//) - path = '/' + path +class WS + @WSS_ENABLED: true + @DEFAULT_PORTS: + http: 80 + https: 443 + + # Build an escaped URL string from unescaped components. Only scheme and host + # are required. See RFC 3986, section 3. + @buildUrl: (scheme, host, port, path, params) -> + parts = [] + parts.push(encodeURIComponent scheme) + parts.push '://' + + # If it contains a colon but no square brackets, treat it as IPv6. + if host.match(/:/) && !host.match(/[[\]]/) + parts.push '[' + parts.push host + parts.push ']' + else + parts.push(encodeURIComponent host) + + if undefined != port && @DEFAULT_PORTS[scheme] != port + parts.push ':' + parts.push(encodeURIComponent port.toString()) + + if undefined != path && '' != path + if !path.match(/^\//) + path = '/' + path + ### + Slash is significant so we must protect it from encodeURIComponent, while + still encoding question mark and number sign. RFC 3986, section 3.3: 'The + path is terminated by the first question mark ('?') or number sign ('#') + character, or by the end of the URI. ... A path consists of a sequence of + path segments separated by a slash ('/') character.' + ### + path = path.replace /[^\/]+/, (m) -> + encodeURIComponent m + parts.push path + + if undefined != params + parts.push '?' + parts.push Query.buildString params + + parts.join '' + + @makeWebsocket: (addr, params) -> + wsProtocol = if @WSS_ENABLED then 'wss' else 'ws' + url = @buildUrl wsProtocol, addr.host, addr.port, '/', params + ws = new WebSocket url ### - Slash is significant so we must protect it from encodeURIComponent, while - still encoding question mark and number sign. RFC 3986, section 3.3: 'The - path is terminated by the first question mark ('?') or number sign ('#') - character, or by the end of the URI. ... A path consists of a sequence of - path segments separated by a slash ('/') character.' + 'User agents can use this as a hint for how to handle incoming binary data: if + the attribute is set to 'blob', it is safe to spool it to disk, and if it is + set to 'arraybuffer', it is likely more efficient to keep the data in memory.' ### - path = path.replace /[^\/]+/, (m) -> - encodeURIComponent m - parts.push path - - if undefined != params - parts.push '?' - parts.push Query.buildString params - - parts.join '' - -makeWebsocket = (addr, params) -> - wsProtocol = if WSS_ENABLED then 'wss' else 'ws' - url = buildUrl wsProtocol, addr.host, addr.port, '/', params - ws = new WebSocket url - ### - 'User agents can use this as a hint for how to handle incoming binary data: if - the attribute is set to 'blob', it is safe to spool it to disk, and if it is - set to 'arraybuffer', it is likely more efficient to keep the data in memory.' - ### - ws.binaryType = 'arraybuffer' - ws + ws.binaryType = 'arraybuffer' + ws

1 0

[snowflake/master] Remove Modernizr dependency
by arlo＠torproject.org 08 May '19

08 May '19

commit f3254e340273b110fb205e862050148b2b14838f Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 1 09:26:25 2019 -0400 Remove Modernizr dependency And inline its only use site. --- proxy/modernizr-config.json | 11 ----------- proxy/package.json | 4 +--- proxy/shims.coffee | 14 ++++++-------- proxy/static/embed.html | 1 - proxy/static/modernizr.js | 3 --- proxy/static/snowflake.html | 1 - 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/proxy/modernizr-config.json b/proxy/modernizr-config.json deleted file mode 100644 index 1cad4d3..0000000 --- a/proxy/modernizr-config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "minify": true, - "options": [ - "prefixed" - ], - "feature-detects": [ - "test/websockets", - "test/webrtc/datachannel", - "test/webrtc/peerconnection" - ] -} \ No newline at end of file diff --git a/proxy/package.json b/proxy/package.json index 276adcf..cc4cc78 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -11,7 +11,6 @@ "lint": "cake lint", "build": "cake build", "clean": "cake clean", - "modern": "modernizr -c modernizr-config.json -d static/", "prepublish": "npm run build", "start": "node build/snowflake.js" }, @@ -22,8 +21,7 @@ "license": "BSD-3-Clause", "devDependencies": { "coffeelint": "^1.16.0", - "jasmine": "2.5.2", - "modernizr": "^3.3.1" + "jasmine": "2.5.2" }, "dependencies": { "coffee-script": "^1.12.2", diff --git a/proxy/shims.coffee b/proxy/shims.coffee index 325184c..a0f53ea 100644 --- a/proxy/shims.coffee +++ b/proxy/shims.coffee @@ -22,17 +22,15 @@ else window = this location = window.location.search.substr(1) - prop = Modernizr.prefixed 'RTCPeerConnection', window, false - if not prop - console.log 'webrtc feature not detected. shutting down' - return - - PeerConnection = window[prop] - - ### FIXME: push these upstream ### + PeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || + window.webkitRTCPeerConnection IceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate SessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription + if typeof PeerConnection isnt 'function' + console.log 'webrtc feature not detected. shutting down' + return + WebSocket = window.WebSocket XMLHttpRequest = window.XMLHttpRequest diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 9efe369..32c26ca 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -3,7 +3,6 @@ <head> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> <meta http-equiv="refresh" content="86400"> - <script type="text/javascript" src="modernizr.js"></script> <script type="text/javascript" src="snowflake.js"></script> <style> * { diff --git a/proxy/static/modernizr.js b/proxy/static/modernizr.js deleted file mode 100644 index 8c77f81..0000000 --- a/proxy/static/modernizr.js +++ /dev/null @@ -1,3 +0,0 @@ -/*! modernizr 3.3.1 (Custom Build) | MIT * - * http://modernizr.com/download/?-datachannel-peerconnection-websockets-prefi… !*/ -!function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in h)if(h.hasOwnProperty(f)){if(e=[],n=h[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++)s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),C.push((o?"":"no-")+a.join("-"))}}function i(e,n){return!!~(""+e).indexOf(n)}function s(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function a(){var e=n.body;return e||(e=s(x?"svg":"body"),e.fake=!0),e}function f(e,t,r,o){var i,f,u,l,d="modernizr",p=s("div"),c=a();if(parseInt(r,10))for(;r--;)u=s("div"),u.id=o?o[r ]:d+(r+1),p.appendChild(u);return i=s("style"),i.type="text/css",i.id="s"+d,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=d,c.fake&&(c.style.background="",c.style.overflow="hidden",l=S.style.overflow,S.style.overflow="hidden",S.appendChild(c)),f=t(p,e),c.fake?(c.parentNode.removeChild(c),S.style.overflow=l,S.offsetHeight):p.parentNode.removeChild(p),!!f}function u(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function l(n,r){var o=n.length;if("CSS"in e&&"supports"in e.CSS){for(;o--;)if(e.CSS.supports(u(n[o]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var i=[];o--;)i.push("("+u(n[o])+":"+r+")");return i=i.join(" or "),f("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function d(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^ -/,"")}function p(e,n,o,a){function f(){p&&(delete T.style,delete T.modElem)}if(a=r(a,"undefined")?!1:a,!r(o,"undefined")){var u=l(e,o);if(!r(u,"undefined"))return u}for(var p,c,m,v,h,y=["modernizr","tspan"];!T.style;)p=!0,T.modElem=s(y.shift()),T.style=T.modElem.style;for(m=e.length,c=0;m>c;c++)if(v=e[c],h=T.style[v],i(v,"-")&&(v=d(v)),T.style[v]!==t){if(a||r(o,"undefined"))return f(),"pfx"==n?v:!0;try{T.style[v]=o}catch(C){}if(T.style[v]!=h)return f(),"pfx"==n?v:!0}return f(),!1}function c(e,n){return function(){return e.apply(n,arguments)}}function m(e,n,t){var o;for(var i in e)if(e[i]in n)return t===!1?e[i]:(o=n[e[i]],r(o,"function")?c(o,t||n):o);return!1}function v(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+w.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?p(a,n,o,i):(a=(e+" "+b.join(s+" ")+s).split(" "),m(a,n,t))}var h=[],y={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){h.push({name:e,fn:n,options:t})},addAsyncTest:function(e){h.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=y,Modernizr=new Modernizr;var C=[],g="Moz O ms Webkit",w=y._config.usePrefixes?g.split(" "):[];y._cssomPrefixes=w;var S=n.documentElement,x="svg"===S.nodeName.toLowerCase(),_={elem:s("modernizr")};Modernizr._q.push(function(){delete _.elem});var T={style:_.elem.style};Modernizr._q.unshift(function(){delete T.style});var b=y._config.usePrefixes?g.toLowerCase().split(" "):[];y._domPrefixes=b,y.testAllProps=v;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i)return"@"+n;for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i)return"@-"+a.toLowerCase()+"-"+n}return!1};y.atRule=E;var P=y.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.inde xOf("-")&&(e=d(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("websockets","WebSocket"in e&&2===e.WebSocket.CLOSING),Modernizr.addTest("peerconnection",!!P("RTCPeerConnection",e)),Modernizr.addTest("datachannel",function(){if(!Modernizr.peerconnection)return!1;for(var n=0,t=b.length;t>n;n++){var r=e[b[n]+"RTCPeerConnection"];if(r){var o=new r({iceServers:[{url:"stun:0"}]});return"createDataChannel"in o}}return!1}),o(),delete y.addTest,delete y.addAsyncTest;for(var k=0;k<Modernizr._q.length;k++)Modernizr._q[k]();e.Modernizr=Modernizr}(window,document); \ No newline at end of file diff --git a/proxy/static/snowflake.html b/proxy/static/snowflake.html index fb2c0e5..84790ed 100644 --- a/proxy/static/snowflake.html +++ b/proxy/static/snowflake.html @@ -3,7 +3,6 @@ <head> <title>Snowflake</title> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> - <script type="text/javascript" src="modernizr.js"></script> <script type="text/javascript" src="snowflake.js"></script> <style> * {

1 0

[snowflake/master] Make a few object literals classes
by arlo＠torproject.org 08 May '19

08 May '19

commit 898ba5707093f99ec8b5b12f16e0d3c29c697e8e Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 1 10:59:45 2019 -0400 Make a few object literals classes --- proxy/init.coffee | 14 +--------- proxy/proxypair.coffee | 3 +- proxy/util.coffee | 76 +++++++++++++++++++++++++++++--------------------- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/proxy/init.coffee b/proxy/init.coffee index 22176e5..a75f67c 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -48,18 +48,6 @@ log = (msg) -> dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug -snowflakeIsDisabled = -> - cookies = Parse.cookie document.cookie - # Do nothing if snowflake has not been opted in by user. - if cookies[COOKIE_NAME] != '1' - log 'Not opted-in. Please click the badge to change options.' - return true - # Also do nothing if running in Tor Browser. - if mightBeTBB() - log 'Will not run within Tor Browser.' - return true - return false - ### Entry point. @@ -72,7 +60,7 @@ init = (isNode) -> snowflake = new Snowflake broker, ui log '== snowflake proxy ==' - if snowflakeIsDisabled() + if Util.snowflakeIsDisabled() # Do not activate the proxy if any number of conditions are true. log 'Currently not active.' return diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 81ddd41..5a11f9a 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -8,7 +8,6 @@ Broker with an WebRTC answer. ### class ProxyPair - MAX_BUFFER: 10 * 1024 * 1024 pc: null c2rSchedule: [] @@ -29,7 +28,7 @@ class ProxyPair ### constructor: (@relayAddr, @rateLimit) -> @active = false - @id = genSnowflakeID() + @id = Util.genSnowflakeID() # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> diff --git a/proxy/util.coffee b/proxy/util.coffee index 8f4c75f..15b4152 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -4,26 +4,38 @@ A Coffeescript WebRTC snowflake proxy Contains helpers for parsing query strings and other utilities. ### - -# It would not be effective for Tor Browser users to run the proxy. -# Do we seem to be running in Tor Browser? Check the user-agent string and for -# no listing of supported MIME types. -TBB_UAS = [ - 'Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0' - 'Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0' - 'Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0' - 'Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0' -] -mightBeTBB = -> - return TBB_UAS.indexOf(window.navigator.userAgent) > -1 and - (window.navigator.mimeTypes and - window.navigator.mimeTypes.length == 0) - -genSnowflakeID = -> - Math.random().toString(36).substring(2) - - -Query = +class Util + # It would not be effective for Tor Browser users to run the proxy. + # Do we seem to be running in Tor Browser? Check the user-agent string and for + # no listing of supported MIME types. + @TBB_UAS: [ + 'Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0' + ] + @mightBeTBB: -> + return Util.TBB_UAS.indexOf(window.navigator.userAgent) > -1 and + (window.navigator.mimeTypes and + window.navigator.mimeTypes.length == 0) + + @genSnowflakeID: -> + Math.random().toString(36).substring(2) + + @snowflakeIsDisabled = -> + cookies = Parse.cookie document.cookie + # Do nothing if snowflake has not been opted in by user. + if cookies[COOKIE_NAME] != '1' + log 'Not opted-in. Please click the badge to change options.' + return true + # Also do nothing if running in Tor Browser. + if Util.mightBeTBB() + log 'Will not run within Tor Browser.' + return true + return false + + +class Query ### Parse a URL query string or application/x-www-form-urlencoded body. The return type is an object mapping string keys to string values. By design, @@ -34,7 +46,7 @@ Query = Always decodes from UTF-8, not any other encoding. http://dev.w3.org/html5/spec/Overview.html#url-encoded-form-data ### - parse: (qs) -> + @parse: (qs) -> result = {} strings = [] strings = qs.split '&' if qs @@ -53,7 +65,7 @@ Query = result # params is a list of (key, value) 2-tuples. - buildString: (params) -> + @buildString: (params) -> parts = [] for param in params parts.push encodeURIComponent(param[0]) + '=' + @@ -61,11 +73,11 @@ Query = parts.join '&' -Parse = +class Parse # Parse a cookie data string (usually document.cookie). The return type is an # object mapping cookies names to values. Returns null on error. # http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038 - cookie: (cookies) -> + @cookie: (cookies) -> result = {} strings = [] strings = cookies.split ';' if cookies @@ -79,7 +91,7 @@ Parse = # Parse an address in the form 'host:port'. Returns an Object with keys 'host' # (String) and 'port' (int). Returns null on error. - address: (spec) -> + @address: (spec) -> m = null # IPv6 syntax. m = spec.match(/^\[([\0-9a-fA-F:.]+)\]:([0-9]+)$/) if !m @@ -96,7 +108,7 @@ Parse = # Parse a count of bytes. A suffix of 'k', 'm', or 'g' (or uppercase) # does what you would think. Returns null on error. - byteCount: (spec) -> + @byteCount: (spec) -> UNITS = { k: 1024, m: 1024 * 1024, g: 1024 * 1024 * 1024 K: 1024, M: 1024 * 1024, G: 1024 * 1024 * 1024 @@ -115,7 +127,7 @@ Parse = # Parse a connection-address out of the "c=" Connection Data field of a session # description. Return undefined if none is found. # https://tools.ietf.org/html/rfc4566#section-5.7 - ipFromSDP: (sdp) -> + @ipFromSDP: (sdp) -> for pattern in [ /^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |$)/m, /^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |$)/m, @@ -124,8 +136,8 @@ Parse = return m[1] if m? -Params = - getBool: (query, param, defaultValue) -> +class Params + @getBool: (query, param, defaultValue) -> val = query[param] return defaultValue if undefined == val return true if 'true' == val || '1' == val || '' == val @@ -135,21 +147,21 @@ Params = # Get an object value and parse it as a byte count. Example byte counts are # '100' and '1.3m'. Returns |defaultValue| if param is not a key. Return null # on a parsing error. - getByteCount: (query, param, defaultValue) -> + @getByteCount: (query, param, defaultValue) -> spec = query[param] return defaultValue if undefined == spec Parse.byteCount spec # Get an object value and parse it as an address spec. Returns |defaultValue| # if param is not a key. Returns null on a parsing error. - getAddress: (query, param, defaultValue) -> + @getAddress: (query, param, defaultValue) -> val = query[param] return defaultValue if undefined == val Parse.address val # Get an object value and return it as a string. Returns default_val if param # is not a key. - getString: (query, param, defaultValue) -> + @getString: (query, param, defaultValue) -> val = query[param] return defaultValue if undefined == val val

1 0

[snowflake/master] Use some class vars in broker to eliminate globals
by arlo＠torproject.org 08 May '19

08 May '19

commit 7ce3c83a31dc8fd7667af6aa9b0f58defb0192c9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 1 10:48:07 2019 -0400 Use some class vars in broker to eliminate globals --- proxy/broker.coffee | 25 ++++++++++++------------- proxy/spec/broker.spec.coffee | 10 +++++----- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 6154a4b..981a761 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -5,15 +5,14 @@ Browser snowflakes must register with the broker in order to get assigned to clients. ### -STATUS_OK = 200 -STATUS_GONE = 410 -STATUS_GATEWAY_TIMEOUT = 504 - -MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' -MESSAGE_UNEXPECTED = 'Unexpected status.' - # Represents a broker running remotely. class Broker + @STATUS_OK = 200 + @STATUS_GONE = 410 + @STATUS_GATEWAY_TIMEOUT = 504 + + @MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' + @MESSAGE_UNEXPECTED = 'Unexpected status.' clients: 0 @@ -39,15 +38,15 @@ class Broker xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status - when STATUS_OK + when Broker.STATUS_OK fulfill xhr.responseText # Should contain offer. - when STATUS_GATEWAY_TIMEOUT - reject MESSAGE_TIMEOUT + when Broker.STATUS_GATEWAY_TIMEOUT + reject Broker.MESSAGE_TIMEOUT else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText snowflake.ui.setStatus ' failure. Please refresh.' - reject MESSAGE_UNEXPECTED + reject Broker.MESSAGE_UNEXPECTED @_xhr = xhr # Used by spec to fake async Broker interaction @_postRequest id, xhr, 'proxy', id @@ -60,10 +59,10 @@ class Broker xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status - when STATUS_OK + when Broker.STATUS_OK dbg 'Broker: Successfully replied with answer.' dbg xhr.responseText - when STATUS_GONE + when Broker.STATUS_GONE dbg 'Broker: No longer valid to reply with answer.' else dbg 'Broker ERROR: Unexpected ' + xhr.status + diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index aef115f..3532fe1 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -25,7 +25,7 @@ describe 'Broker', -> # fake successful request and response from broker. spyOn(b, '_postRequest').and.callFake -> b._xhr.readyState = b._xhr.DONE - b._xhr.status = STATUS_OK + b._xhr.status = Broker.STATUS_OK b._xhr.responseText = 'fake offer' b._xhr.onreadystatechange() poll = b.getClientOffer() @@ -35,7 +35,7 @@ describe 'Broker', -> expect(desc).toEqual 'fake offer' done() .catch -> - fail 'should not reject on STATUS_OK' + fail 'should not reject on Broker.STATUS_OK' done() it 'rejects if the broker timed-out', (done) -> @@ -43,7 +43,7 @@ describe 'Broker', -> # fake timed-out request from broker spyOn(b, '_postRequest').and.callFake -> b._xhr.readyState = b._xhr.DONE - b._xhr.status = STATUS_GATEWAY_TIMEOUT + b._xhr.status = Broker.STATUS_GATEWAY_TIMEOUT b._xhr.onreadystatechange() poll = b.getClientOffer() expect(poll).not.toBeNull() @@ -52,7 +52,7 @@ describe 'Broker', -> fail 'should not fulfill on GATEWAY_TIMEOUT' done() , (err) -> - expect(err).toBe MESSAGE_TIMEOUT + expect(err).toBe Broker.MESSAGE_TIMEOUT done() it 'rejects on any other status', (done) -> @@ -69,7 +69,7 @@ describe 'Broker', -> fail 'should not fulfill on non-OK status' done() , (err) -> - expect(err).toBe MESSAGE_UNEXPECTED + expect(err).toBe Broker.MESSAGE_UNEXPECTED expect(b._xhr.status).toBe 1337 done()

1 0