January 2021 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 28 Jan '21

28 Jan '21

commit fed1627153ae93c6804e0b66288fa9fa0d17bb50 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 03:15:57 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fa.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa.po b/fa.po index 011e804f84..74c6b39501 100644 --- a/fa.po +++ b/fa.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-16 21:48+0000\n" +"PO-Revision-Date: 2021-01-28 02:49+0000\n" "Last-Translator: Reza Ghasemi\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -886,7 +886,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:66 #, python-format msgid "\"%s\" is not a directory" -msgstr "" +msgstr "\"%s\" دایرکتوری نیست" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:77 #, python-format @@ -1077,7 +1077,7 @@ msgstr "ذخيره‌كردن فايل‌ها در پوشه مداوم" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "Welcome Screen" -msgstr "" +msgstr "صفحه خوش‌آمدگویی" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Language, administration password, and additional settings"

1 0

[tpo/master] Add NYTimes to Membership Program page. Fix #150
by gus＠torproject.org 27 Jan '21

27 Jan '21

commit f73cb668357f46c7f64f8fe1cc1a00f4be6bd023 Author: gus <gus(a)torproject.org> Date: Wed Jan 27 14:25:50 2021 -0500 Add NYTimes to Membership Program page. Fix #150 --- templates/membership.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/membership.html b/templates/membership.html index f847dfaa..62c924d5 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -117,6 +117,9 @@ <li class="list-group-item px-0"> <p><a href="https://insurgo.ca" title="Insurgo, Inc" target="_blank">Insurgo</a></p> </li> + <li class="list-group-item px-0"> + <p><a href="https://www.nytimes.com" title="The New York Times" target="_blank">The New York Times</a></p> + </li> </ul> </div> <div class="col-md-6">

1 0

[tpo/master] Merge branch 'new-member-nytimes'
by gus＠torproject.org 27 Jan '21

27 Jan '21

commit 926823903d5657016ac6fdebed5798c52537d660 Merge: 18829205 f73cb668 Author: gus <gus(a)torproject.org> Date: Wed Jan 27 14:36:47 2021 -0500 Merge branch 'new-member-nytimes' templates/membership.html | 3 +++ 1 file changed, 3 insertions(+)

1 0

[status-site/main] remove section output to silence warnings
by anarcat＠torproject.org 27 Jan '21

27 Jan '21

commit 3219ce6b5f844dbbe88611a71a482cae8cfe2ebb Author: Antoine Beaupré <anarcat(a)debian.org> Date: Wed Jan 27 13:38:33 2021 -0500 remove section output to silence warnings Should be a noop, as per https://github.com/cstate/cstate/issues/167 --- config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config.yml b/config.yml index 32963e6..df39c7a 100644 --- a/config.yml +++ b/config.yml @@ -342,10 +342,6 @@ outputs: page: - html - json - section: - - html - - json - - rss home: - html - json

1 0

[snowflake-webext/master] bump version to 0.5.3
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit e298e97d79fbae7875cebee027bdba71f0b71645 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jan 27 12:29:30 2021 -0500 bump version to 0.5.3 --- package.json | 4 ++-- translation | 2 +- webext/manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 89c0e23..2a28ca8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "snowflake-pt", - "version": "0.5.2", + "version": "0.5.3", "description": "Snowflake is a WebRTC pluggable transport for Tor.", "main": "build/snowflake.js", "directories": { @@ -32,4 +32,4 @@ "ws": "^3.3.1", "xmlhttprequest": "^1.8.0" } -} +} \ No newline at end of file diff --git a/translation b/translation index b7a56ac..3628de8 160000 --- a/translation +++ b/translation @@ -1 +1 @@ -Subproject commit b7a56ac0b238ce62bad850b83f4ca43609a771d3 +Subproject commit 3628de8b4e231f1a6a1ae93d665612a807212b17 diff --git a/webext/manifest.json b/webext/manifest.json index e86011f..d8031e8 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.5.2", + "version": "0.5.3", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[snowflake-webext/master] Do not set NAT type to unknown after failed test
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit fa578972db6d69fb9d2763b83c119a57fefe95a7 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jan 21 10:12:05 2021 -0500 Do not set NAT type to unknown after failed test If a previous NAT check has succeeded and we fail to contact the probe server, do not set the NAT type to unknown. Most proxies will probably not change their NAT type frequently, so this will prevent an outage of the probe service from wiping out our unrestricted proxy pool. --- init-badge.js | 1 - init-webext.js | 1 - 2 files changed, 2 deletions(-) diff --git a/init-badge.js b/init-badge.js index 6c4c7a7..784ffc8 100644 --- a/init-badge.js +++ b/init-badge.js @@ -155,7 +155,6 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, initNATType, s _this.natType = type; }).catch((e) => { console.log(e); - _this.natType = "unknown"; }); // reset NAT type every 24 hours in case proxy location changed setTimeout(_this.initNATType, 24 * 60 * 60 * 1000); diff --git a/init-webext.js b/init-webext.js index 0a2c22b..8a756ec 100644 --- a/init-webext.js +++ b/init-webext.js @@ -33,7 +33,6 @@ class WebExtUI extends UI { _this.natType = type; }).catch((e) => { console.log(e); - _this.natType = "unknown"; }); // reset NAT type every 24 hours in case proxy location changed setTimeout(_this.initNATType, 24 * 60 * 60 * 1000);

1 0

[snowflake-webext/master] Increment natFailures when snowflake is restricted
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit 31730750eecb14a2afda5bbf83f21e49357628db Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 25 13:33:16 2021 -0500 Increment natFailures when snowflake is restricted --- snowflake.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snowflake.js b/snowflake.js index 9ac5fad..7d4edb9 100644 --- a/snowflake.js +++ b/snowflake.js @@ -86,9 +86,12 @@ class Snowflake { this.pollInterval = Math.min(this.pollInterval + this.config.pollAdjustment, this.config.slowestBrokerPollInterval); + if (clientNAT == "restricted") { + this.natFailures++; + } // if we fail to connect to a restricted client 3 times in // a row, assume we have a restricted NAT - if ((clientNAT == "restricted") && (this.natFailures > 3)){ + if (this.natFailures >= 3){ this.ui.natType = "restricted"; console.log("Learned NAT type: restricted"); this.natFailures = 0;

1 0

[snowflake-webext/master] Recheck NAT type once every 2 days
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit ac2ad2060b3d49bf8e2411e5a6ba4b8724aab566 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jan 21 10:25:57 2021 -0500 Recheck NAT type once every 2 days --- config.js | 3 +++ init-badge.js | 2 +- init-webext.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index b5db8b5..2e7555a 100644 --- a/config.js +++ b/config.js @@ -28,6 +28,9 @@ Config.prototype.defaultBrokerPollInterval = 60.0 * 1000; //1 poll every minutes Config.prototype.slowestBrokerPollInterval = 6 * 60 * 60.0 * 1000; //1 poll every 6 hours Config.prototype.pollAdjustment = 100.0 * 1000; +// Recheck our NAT type once every 2 days +Config.prototype.natCheckInterval = 2 * 24 * 60 * 60 * 1000; + // Timeout after sending answer before datachannel is opened Config.prototype.datachannelTimeout = 20 * 1000; diff --git a/init-badge.js b/init-badge.js index 784ffc8..6233b10 100644 --- a/init-badge.js +++ b/init-badge.js @@ -157,7 +157,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, initNATType, s console.log(e); }); // reset NAT type every 24 hours in case proxy location changed - setTimeout(_this.initNATType, 24 * 60 * 60 * 1000); + setTimeout(_this.initNATType, config.natCheckInterval); })(this); }; diff --git a/init-webext.js b/init-webext.js index 8a756ec..d9a37d0 100644 --- a/init-webext.js +++ b/init-webext.js @@ -34,8 +34,8 @@ class WebExtUI extends UI { }).catch((e) => { console.log(e); }); - // reset NAT type every 24 hours in case proxy location changed - setTimeout(_this.initNATType, 24 * 60 * 60 * 1000); + // reset NAT type every 2 days in case proxy location changed + setTimeout(_this.initNATType, config.natCheckInterval); })(this); }

1 0

[snowflake-webext/master] Fix a bug in NAT update process
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit 87cdf4546c126151bcc6610386f6ea9dcc885607 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jan 21 17:12:44 2021 -0500 Fix a bug in NAT update process This fixes two bugs in the NAT update process: - one bug wasn't updating the NAT type we advertize to the broker - one bug passed an already evaluated function to setTimeout --- init-badge.js | 33 +++++++++++++++++---------------- init-webext.js | 21 +++++++++++---------- snowflake.js | 3 +++ 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/init-badge.js b/init-badge.js index 6233b10..3de6159 100644 --- a/init-badge.js +++ b/init-badge.js @@ -38,6 +38,21 @@ class BadgeUI extends UI { ); } + checkNAT() { + Util.checkNATType(config.datachannelTimeout).then((type) => { + console.log("Setting NAT type: " + type); + this.natType = type; + }).catch((e) => { + console.log(e); + }); + } + + initNATType() { + this.natType = "unknown"; + this.checkNAT(); + return setInterval(() => {this.checkNAT();}, config.natCheckInterval); + } + setStatus() {} missingFeature(missing) { @@ -105,7 +120,7 @@ function getLang() { return defaultLang; } -var debug, snowflake, config, broker, ui, log, dbg, init, update, initNATType, silenceNotifications, query, tryProbe; +var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotifications, query, tryProbe; (function() { @@ -147,20 +162,6 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, initNATType, s ); }; - initNATType = function() { - this.natType = "unknown"; - (function loop(_this) { - Util.checkNATType(config.datachannelTimeout).then((type) => { - console.log("Setting NAT type: " + type); - _this.natType = type; - }).catch((e) => { - console.log(e); - }); - // reset NAT type every 24 hours in case proxy location changed - setTimeout(_this.initNATType, config.natCheckInterval); - })(this); - }; - update = function() { const cookies = Parse.cookie(document.cookie); if (cookies[COOKIE_NAME] !== '1') { @@ -196,7 +197,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, initNATType, s log('== snowflake proxy =='); update(); - initNATType(); + ui.initNATType(); }; // Notification of closing tab with active proxy. diff --git a/init-webext.js b/init-webext.js index d9a37d0..3b7decf 100644 --- a/init-webext.js +++ b/init-webext.js @@ -25,18 +25,19 @@ class WebExtUI extends UI { }), 60 * 60 * 1000); } + checkNAT() { + Util.checkNATType(config.datachannelTimeout).then((type) => { + console.log("Setting NAT type: " + type); + this.natType = type; + }).catch((e) => { + console.log(e); + }); + } + initNATType() { this.natType = "unknown"; - (function loop(_this) { - Util.checkNATType(config.datachannelTimeout).then((type) => { - console.log("Setting NAT type: " + type); - _this.natType = type; - }).catch((e) => { - console.log(e); - }); - // reset NAT type every 2 days in case proxy location changed - setTimeout(_this.initNATType, config.natCheckInterval); - })(this); + this.checkNAT(); + return setInterval(() => {this.checkNAT();}, config.natCheckInterval); } tryProbe() { diff --git a/snowflake.js b/snowflake.js index 091e046..9ac5fad 100644 --- a/snowflake.js +++ b/snowflake.js @@ -68,6 +68,9 @@ class Snowflake { msg += '[retries: ' + this.retries + ']'; } this.ui.setStatus(msg); + //update NAT type + console.log("NAT type: "+ this.ui.natType); + this.broker.setNATType(this.ui.natType); recv = this.broker.getClientOffer(pair.id); recv.then((resp) => { var clientNAT = resp.NAT;

1 0

[snowflake-webext/master] Set NAT type to restricted after 3 failed connects
by cohosh＠torproject.org 27 Jan '21

27 Jan '21

commit 8bc32f580791c80a671cdb0a22ff56bbb4f244fb Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jan 21 10:20:50 2021 -0500 Set NAT type to restricted after 3 failed connects Only set the NAT type to restricted after we fail to connect to a restricted client 3 times in a row. --- snowflake.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/snowflake.js b/snowflake.js index 1937fdb..091e046 100644 --- a/snowflake.js +++ b/snowflake.js @@ -23,6 +23,7 @@ class Snowflake { this.broker = broker; this.broker.setNATType(ui.natType); this.proxyPairs = []; + this.natFailures = 0; this.pollInterval = this.config.defaultBrokerPollInterval; if (void 0 === this.config.rateLimitBytes) { this.rateLimit = new DummyRateLimit(); @@ -82,10 +83,12 @@ class Snowflake { this.pollInterval = Math.min(this.pollInterval + this.config.pollAdjustment, this.config.slowestBrokerPollInterval); - // if we fail to connect to a restricted client, assume restricted NAT - if (clientNAT == "restricted"){ + // if we fail to connect to a restricted client 3 times in + // a row, assume we have a restricted NAT + if ((clientNAT == "restricted") && (this.natFailures > 3)){ this.ui.natType = "restricted"; console.log("Learned NAT type: restricted"); + this.natFailures = 0; } this.broker.setNATType(this.ui.natType); } else { @@ -93,6 +96,7 @@ class Snowflake { this.pollInterval = Math.max(this.pollInterval - this.config.pollAdjustment, this.config.defaultBrokerPollInterval); + this.natFailures = 0; } return; }), this.config.datachannelTimeout);

1 0