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

[snowflake/master] Brace expansion is a bashism
by cohosh＠torproject.org 27 Jul '19

27 Jul '19

commit 5d26f76ba191f4db90a806b6d9741abda80c1af9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jul 26 15:09:05 2019 -0400 Brace expansion is a bashism --- proxy/make.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/make.js b/proxy/make.js index 52ee098..940e980 100755 --- a/proxy/make.js +++ b/proxy/make.js @@ -79,7 +79,7 @@ task('build', 'build the snowflake proxy', function() { task('webext', 'build the webextension', function() { exec('mkdir -p webext'); - exec(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} webext/`); + exec(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} webext/`, { shell: '/bin/bash' }); concatJS('webext', 'webext', 'snowflake.js'); console.log('Webextension prepared.'); });

1 0

[snowflake/master] Clean up some linting errors
by cohosh＠torproject.org 27 Jul '19

27 Jul '19

commit 0f33546fec141b7e7e451d3a15b247f9c8eb472e Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jul 15 09:07:00 2019 +0200 Clean up some linting errors --- proxy/init-badge.js | 8 +++----- proxy/init-webext.js | 2 +- proxy/ui.js | 2 -- proxy/util.js | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index f85be29..b240456 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -1,4 +1,4 @@ -/* global TESTING, Util, Params, Config, DebugUI, BadgeUI, UI, Broker, Snowflake */ +/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse */ /* UI @@ -41,7 +41,7 @@ class BadgeUI extends UI { setActive(connected) { super.setActive(connected); - turnOn(); + this.turnOn(); } } @@ -83,9 +83,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific }; dbg = function(msg) { - if (debug || ((snowflake != null ? snowflake.ui : void 0) instanceof DebugUI)) { - return log(msg); - } + if (debug) { log(msg); } }; update = function() { diff --git a/proxy/init-webext.js b/proxy/init-webext.js index df618e6..0102385 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -1,4 +1,4 @@ -/* global Util, chrome, Config, WebExtUI, Broker, Snowflake */ +/* global Util, chrome, Config, UI, Broker, Snowflake */ /* eslint no-unused-vars: 0 */ /* diff --git a/proxy/ui.js b/proxy/ui.js index f99affa..09d3d07 100644 --- a/proxy/ui.js +++ b/proxy/ui.js @@ -1,5 +1,3 @@ -/* global chrome, log, update */ - /* All of Snowflake's DOM manipulation and inputs. */ diff --git a/proxy/util.js b/proxy/util.js index 88a9bf6..8fa6d9c 100644 --- a/proxy/util.js +++ b/proxy/util.js @@ -1,4 +1,3 @@ -/* global log */ /* exported Params, DummyRateLimit */ /*

1 0

[snowflake/master] Remove Util.mightBeTBB
by cohosh＠torproject.org 27 Jul '19

27 Jul '19

commit 8de6e26c597edadac633ae8bed163893f4d932e2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jul 26 15:10:44 2019 -0400 Remove Util.mightBeTBB Trac 31222 --- proxy/init-badge.js | 5 ----- proxy/util.js | 18 +----------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index b240456..4a331c3 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -114,11 +114,6 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific return; } - if (Util.mightBeTBB()) { - ui.missingFeature("Will not run within Tor Browser."); - return; - } - config = new Config; if ('off' !== query.get('ratelimit')) { config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes); diff --git a/proxy/util.js b/proxy/util.js index 8fa6d9c..42843d7 100644 --- a/proxy/util.js +++ b/proxy/util.js @@ -1,4 +1,4 @@ -/* exported Params, DummyRateLimit */ +/* exported Util, Params, DummyRateLimit */ /* A JavaScript WebRTC snowflake proxy @@ -8,12 +8,6 @@ Contains helpers for parsing query strings and other utilities. class Util { - static mightBeTBB() { - return Util.TBB_UAS.indexOf(window.navigator.userAgent) > -1 && ( - window.navigator.mimeTypes && window.navigator.mimeTypes.length === 0 - ); - } - static genSnowflakeID() { return Math.random().toString(36).substring(2); } @@ -28,16 +22,6 @@ 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. -Util.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' -]; - class Parse {

1 0

[snowflake/master] Add a "Deploying" section to proxy/README.md.
by dcf＠torproject.org 27 Jul '19

27 Jul '19

commit 0bded511b99a396df2172c89f0ac9a9ae21a2115 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 27 09:53:09 2019 -0600 Add a "Deploying" section to proxy/README.md. --- proxy/README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/proxy/README.md b/proxy/README.md index 409d753..70ea273 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -26,6 +26,48 @@ To run locally, either: - For a more fully featured "debug" version, start a webserver and navigate to `snowflake.html`. +### Preparing to deploy + +Background information: + * https://bugs.torproject.org/23947#comment:8 + * https://help.torproject.org/tsa/doc/static-sites/ + * https://help.torproject.org/tsa/doc/ssh-jump-host/ + +You need to be in LDAP group "snowflake" and have set up an SSH key with your LDAP account. +In your ~/.ssh/config file, you should have something like: + +``` +Host staticiforme +HostName staticiforme.torproject.org +User <your user name> +ProxyJump people.torproject.org +IdentityFile ~/.ssh/tor +``` + +### Deploying + +``` +npm run build +``` + +Do a "dry run" rsync with `-n` to check that only expected files are being changed. If you don't understand why a file would be updated, you can add the `-i` option to see the reason. + +``` +rsync -n --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ +``` + +If it looks good, then repeat the rsync without `-n`. + +``` +rsync --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ +``` + +Then run the command to copy the new files to the live web servers: + +``` +ssh staticiforme 'static-update-component snowflake.torproject.org' +``` + ### Parameters With no parameters,

1 0

[snowflake/master] Make "npm run build" include .htaccess.
by dcf＠torproject.org 27 Jul '19

27 Jul '19

commit 695554cbc5fc2af18fd978c15f38706b42b9d842 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 27 09:42:12 2019 -0600 Make "npm run build" include .htaccess. Formerly it was copying static/*, and the wildcard skipped the dotfile. --- proxy/make.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/proxy/make.js b/proxy/make.js index b614864..5d6e013 100755 --- a/proxy/make.js +++ b/proxy/make.js @@ -30,10 +30,6 @@ var OUTFILE = 'snowflake.js'; var STATIC = 'static'; -var copyStaticFiles = function() { - exec('cp ' + STATIC + '/* build/'); -}; - var concatJS = function(outDir, init) { var files; files = FILES.concat(`init-${init}.js`); @@ -70,8 +66,8 @@ task('test', 'snowflake unit tests', function() { }); task('build', 'build the snowflake proxy', function() { - exec('mkdir -p build'); - copyStaticFiles(); + exec('rm -r build'); + exec('cp -r ' + STATIC + '/ build/'); concatJS('build', 'badge'); console.log('Snowflake prepared.'); });

1 0

[snowflake/master] bamsoftware.com -> freehaven.net in proxy/README.md.
by dcf＠torproject.org 27 Jul '19

27 Jul '19

commit 905f8b78c122dc7cddfe1094711151fd89663c1c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 27 09:30:29 2019 -0600 bamsoftware.com -> freehaven.net in proxy/README.md. https://bugs.torproject.org/31250 --- proxy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index bd1f819..409d753 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -29,6 +29,6 @@ To run locally, either: ### Parameters With no parameters, -snowflake uses the default relay `snowflake.bamsoftware.com:443` and +snowflake uses the default relay `snowflake.freehaven.net:443` and uses automatic signaling with the default broker at -`https://snowflake-broker.bamsoftware.com/`. +`https://snowflake-broker.freehaven.net/`.

1 0

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

27 Jul '19

commit 5d8a6c5aaba0cae744afd8eea26c3836976f38b5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 27 12:21:19 2019 +0000 Update translations for support-portal_completed --- contents+de.po | 7 +++++-- contents+fr.po | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/contents+de.po b/contents+de.po index 5caac437b..ccf4c09e0 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4,8 +4,8 @@ # Oliver Baumann <inactive+baumanno(a)transifex.com>, 2019 # erinm, 2019 # Emma Peel, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # Marcel Haring <getting(a)autistici.org>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-23 12:34+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Marcel Haring <getting(a)autistici.org>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -453,6 +453,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -678,6 +680,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index e7f7f6ba0..62646bc95 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,8 +2,8 @@ # erinm, 2019 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019 # Emma Peel, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # AO <ao(a)localizationlab.org>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-23 12:34+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -447,6 +447,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -668,6 +670,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

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

27 Jul '19

commit 23e6e00eb3a72e9b901b96e573d8cf01c3feef90 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 27 12:21:09 2019 +0000 Update translations for support-portal --- contents+de.po | 7 +++++-- contents+fr.po | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/contents+de.po b/contents+de.po index 5caac437b..ccf4c09e0 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4,8 +4,8 @@ # Oliver Baumann <inactive+baumanno(a)transifex.com>, 2019 # erinm, 2019 # Emma Peel, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # Marcel Haring <getting(a)autistici.org>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-23 12:34+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Marcel Haring <getting(a)autistici.org>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -453,6 +453,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -678,6 +680,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index e7f7f6ba0..62646bc95 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,8 +2,8 @@ # erinm, 2019 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019 # Emma Peel, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # AO <ao(a)localizationlab.org>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-23 12:34+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -447,6 +447,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -668,6 +670,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[snowflake/master] Version bump to fix issue with addon update
by cohosh＠torproject.org 26 Jul '19

26 Jul '19

commit 299c12b2e91454d2ef4f2c5203cc212a2674a23e Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jul 26 10:45:50 2019 -0400 Version bump to fix issue with addon update --- proxy/webext/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index fa96a99..75475ae 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.0.7", + "version": "0.0.8", "description": "Snowflake is a WebRTC pluggable transport for Tor.", "background": { "scripts": ["snowflake.js"],

1 0

[snowflake/master] Made manifest icon square
by cohosh＠torproject.org 26 Jul '19

26 Jul '19

commit b00d1b7fd7f7cb87c6cd9d60deeded3657897dc0 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jul 26 10:09:32 2019 -0400 Made manifest icon square The mozilla addon update failed with an error `Error: Icon at "icons/status-on.png" must be square.` I fixed the icon in the manifest to be 60x60 pixels. --- proxy/webext/icons/status-on.png | Bin 4791 -> 4250 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/webext/icons/status-on.png b/proxy/webext/icons/status-on.png index 688debf..ee1856b 100644 Binary files a/proxy/webext/icons/status-on.png and b/proxy/webext/icons/status-on.png differ

1 0