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

[bridgedb/develop] Bump version number to 0.8.2.
by phw＠torproject.org 01 Oct '19

01 Oct '19

commit 76526a4f5daac440ab2a857d805d5f7ff8c63262 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Sep 20 11:40:38 2019 -0700 Bump version number to 0.8.2. --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 4d05253..06968d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes in version 0.8.2 - 2019-09-19 +Changes in version 0.8.2 - 2019-09-20 Updated translations for the following languages: bn, da, eo, fa, it, ko, nl, pt_BR, pt_PT, sr, zh_CN.

1 0

[snowflake/master] Add bridge probe to badge
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit 8d81270a9f217a5d0867a5db9237a02c8498eef9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Sep 26 12:31:09 2019 -0400 Add bridge probe to badge --- proxy/init-badge.js | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index ed6dee9..d8d9113 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -1,4 +1,4 @@ -/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse, availableLangs */ +/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse, availableLangs, WS */ /* UI @@ -125,27 +125,39 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific update = function() { const cookies = Parse.cookie(document.cookie); - if (cookies[COOKIE_NAME] === '1') { - ui.turnOn(); - dbg('Contacting Broker at ' + broker.url); - log('Starting snowflake'); - snowflake.setRelayAddr(config.relayAddr); - snowflake.beginWebRTC(); - } else { + if (cookies[COOKIE_NAME] !== '1') { ui.turnOff(); snowflake.disable(); log('Currently not active.'); + return; } - }; - - init = function() { - ui = new BadgeUI(); if (!Util.hasWebRTC()) { ui.missingFeature(messages.getMessage('popupWebRTCOff')); + snowflake.disable(); return; } + WS.probeWebsocket(config.relayAddr) + .then( + () => { + ui.turnOn(); + dbg('Contacting Broker at ' + broker.url); + log('Starting snowflake'); + snowflake.setRelayAddr(config.relayAddr); + snowflake.beginWebRTC(); + }, + () => { + ui.missingFeature(messages.getMessage('popupBridgeUnreachable')); + snowflake.disable(); + log('Could not connect to bridge.'); + } + ); + }; + + init = function() { + ui = new BadgeUI(); + if (!Util.hasCookies()) { ui.missingFeature(messages.getMessage('badgeCookiesOff')); return;

1 0

[snowflake/master] Disable the webext if the bridge is unreachable
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit 685c3bd2626df5c2adc85b79b77624c980e12ef9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 25 22:23:14 2019 -0400 Disable the webext if the bridge is unreachable --- proxy/init-webext.js | 34 +++++++++++++++++++++++-------- proxy/static/_locales/en_US/messages.json | 3 +++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/proxy/init-webext.js b/proxy/init-webext.js index b45f2df..dff1208 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -31,14 +31,32 @@ class WebExtUI extends UI { this.setEnabled(false); return; } - chrome.storage.local.get("snowflake-enabled", (result) => { - let enabled = this.enabled; - if (result['snowflake-enabled'] !== void 0) { - enabled = result['snowflake-enabled']; - } else { - log("Toggle state not yet saved"); - } - this.setEnabled(enabled); + (new Promise((resolve, reject) => { + const ws = WS.makeWebsocket(config.relayAddr); + ws.onopen = () => { + resolve(); + ws.close(); + }; + ws.onerror = () => { + this.missingFeature = 'popupBridgeUnreachable'; + this.setEnabled(false); + reject('Could not connect to bridge.'); + ws.close(); + }; + })) + .then(() => { + chrome.storage.local.get("snowflake-enabled", (result) => { + let enabled = this.enabled; + if (result['snowflake-enabled'] !== void 0) { + enabled = result['snowflake-enabled']; + } else { + log("Toggle state not yet saved"); + } + this.setEnabled(enabled); + }); + }) + .catch((e) => { + log(e); }); } diff --git a/proxy/static/_locales/en_US/messages.json b/proxy/static/_locales/en_US/messages.json index f6ed740..1ac15d9 100644 --- a/proxy/static/_locales/en_US/messages.json +++ b/proxy/static/_locales/en_US/messages.json @@ -23,6 +23,9 @@ "popupWebRTCOff": { "message": "WebRTC feature is not detected." }, + "popupBridgeUnreachable": { + "message": "Could not connect to the bridge." + }, "popupDescOn": { "message": "Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $1" },

1 0

[snowflake/master] Move probe to WS class for reuse in the badge
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit aa107862c5300ce52842f92196a3f1d1527b48b4 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Sep 26 11:38:58 2019 -0400 Move probe to WS class for reuse in the badge --- proxy/init-webext.js | 44 ++++++++++++++++++-------------------------- proxy/websocket.js | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/proxy/init-webext.js b/proxy/init-webext.js index dff1208..f6c0d0f 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -1,4 +1,4 @@ -/* global Util, chrome, Config, UI, Broker, Snowflake */ +/* global Util, chrome, Config, UI, Broker, Snowflake, WS */ /* eslint no-unused-vars: 0 */ /* @@ -31,33 +31,25 @@ class WebExtUI extends UI { this.setEnabled(false); return; } - (new Promise((resolve, reject) => { - const ws = WS.makeWebsocket(config.relayAddr); - ws.onopen = () => { - resolve(); - ws.close(); - }; - ws.onerror = () => { + WS.probeWebsocket(config.relayAddr) + .then( + () => { + chrome.storage.local.get("snowflake-enabled", (result) => { + let enabled = this.enabled; + if (result['snowflake-enabled'] !== void 0) { + enabled = result['snowflake-enabled']; + } else { + log("Toggle state not yet saved"); + } + this.setEnabled(enabled); + }); + }, + () => { + log('Could not connect to bridge.'); this.missingFeature = 'popupBridgeUnreachable'; this.setEnabled(false); - reject('Could not connect to bridge.'); - ws.close(); - }; - })) - .then(() => { - chrome.storage.local.get("snowflake-enabled", (result) => { - let enabled = this.enabled; - if (result['snowflake-enabled'] !== void 0) { - enabled = result['snowflake-enabled']; - } else { - log("Toggle state not yet saved"); - } - this.setEnabled(enabled); - }); - }) - .catch((e) => { - log(e); - }); + } + ); } postActive() { diff --git a/proxy/websocket.js b/proxy/websocket.js index 410fdc0..da7ba94 100644 --- a/proxy/websocket.js +++ b/proxy/websocket.js @@ -54,6 +54,20 @@ class WS { return ws; } + static probeWebsocket(addr) { + return new Promise((resolve, reject) => { + const ws = WS.makeWebsocket(addr); + ws.onopen = () => { + resolve(); + ws.close(); + }; + ws.onerror = () => { + reject(); + ws.close(); + }; + }); + } + } WS.WSS_ENABLED = true;

1 0

[snowflake/master] Reorder enable checks
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit d4aa9ad2b3abd73c13e32a847d5a0247b4364e81 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Sep 26 12:07:24 2019 -0400 Reorder enable checks First check that it is enabled before doing feature testing. This will be useful in the badge so that probing only happens if it is enabled. --- proxy/init-webext.js | 63 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/proxy/init-webext.js b/proxy/init-webext.js index f6c0d0f..6789ffd 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -26,30 +26,40 @@ class WebExtUI extends UI { } initToggle() { - if (!Util.hasWebRTC()) { - this.missingFeature = 'popupWebRTCOff'; - this.setEnabled(false); - return; - } - WS.probeWebsocket(config.relayAddr) - .then( - () => { - chrome.storage.local.get("snowflake-enabled", (result) => { - let enabled = this.enabled; - if (result['snowflake-enabled'] !== void 0) { - enabled = result['snowflake-enabled']; - } else { - log("Toggle state not yet saved"); - } - this.setEnabled(enabled); - }); - }, - () => { - log('Could not connect to bridge.'); - this.missingFeature = 'popupBridgeUnreachable'; + // First, check if we have our status stored + (new Promise((resolve) => { + chrome.storage.local.get(["snowflake-enabled"], resolve); + })) + .then((result) => { + let enabled = this.enabled; + if (result['snowflake-enabled'] !== void 0) { + enabled = result['snowflake-enabled']; + } else { + log("Toggle state not yet saved"); + } + // If it isn't enabled, stop + if (!enabled) { + this.setEnabled(enabled); + return; + } + // Otherwise, do feature checks + if (!Util.hasWebRTC()) { + this.missingFeature = 'popupWebRTCOff'; this.setEnabled(false); + return; } - ); + WS.probeWebsocket(config.relayAddr) + .then( + () => { + this.setEnabled(true); + }, + () => { + log('Could not connect to bridge.'); + this.missingFeature = 'popupBridgeUnreachable'; + this.setEnabled(false); + } + ); + }); } postActive() { @@ -73,11 +83,12 @@ class WebExtUI extends UI { } onMessage(m) { - this.setEnabled(m.enabled); - chrome.storage.local.set({ - "snowflake-enabled": this.enabled - }, function() { + (new Promise((resolve) => { + chrome.storage.local.set({ "snowflake-enabled": m.enabled }, resolve); + })) + .then(() => { log("Stored toggle state"); + this.initToggle(); }); }

1 0

[snowflake/master] Move missingFeature to initToggle in webext
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit 19bc6d88584fc8cd67e5545e8d5f659a0782aa23 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 25 21:33:57 2019 -0400 Move missingFeature to initToggle in webext --- proxy/init-webext.js | 91 ++++++++++++++++++++++++--------------------------- proxy/webext/embed.js | 2 +- 2 files changed, 44 insertions(+), 49 deletions(-) diff --git a/proxy/init-webext.js b/proxy/init-webext.js index fc0a841..b45f2df 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -18,46 +18,52 @@ class WebExtUI extends UI { initStats() { this.stats = [0]; - return setInterval((() => { + setInterval((() => { this.stats.unshift(0); this.stats.splice(24); - return this.postActive(); + this.postActive(); }), 60 * 60 * 1000); } initToggle() { + if (!Util.hasWebRTC()) { + this.missingFeature = 'popupWebRTCOff'; + this.setEnabled(false); + return; + } chrome.storage.local.get("snowflake-enabled", (result) => { + let enabled = this.enabled; if (result['snowflake-enabled'] !== void 0) { - this.enabled = result['snowflake-enabled']; + enabled = result['snowflake-enabled']; } else { log("Toggle state not yet saved"); } - this.setEnabled(this.enabled); + this.setEnabled(enabled); }); } postActive() { - var ref; - return (ref = this.port) != null ? ref.postMessage({ + this.setIcon(); + if (!this.port) { return; } + this.port.postMessage({ active: this.active, total: this.stats.reduce((function(t, c) { return t + c; }), 0), - enabled: this.enabled - }) : void 0; + enabled: this.enabled, + missingFeature: this.missingFeature, + }); } onConnect(port) { this.port = port; port.onDisconnect.addListener(this.onDisconnect); port.onMessage.addListener(this.onMessage); - return this.postActive(); + this.postActive(); } onMessage(m) { - this.enabled = m.enabled; - this.setEnabled(this.enabled); - this.postActive(); + this.setEnabled(m.enabled); chrome.storage.local.set({ "snowflake-enabled": this.enabled }, function() { @@ -75,30 +81,34 @@ class WebExtUI extends UI { this.stats[0] += 1; } this.postActive(); - if (this.active) { - return chrome.browserAction.setIcon({ - path: { - 48: "assets/toolbar-running-48.png", - 96: "assets/toolbar-running-96.png" - } - }); - } else { - return chrome.browserAction.setIcon({ - path: { - 48: "assets/toolbar-on-48.png", - 96: "assets/toolbar-on-96.png" - } - }); - } } setEnabled(enabled) { + this.enabled = enabled; + this.postActive(); update(); - return chrome.browserAction.setIcon({ - path: { - 48: "assets/toolbar-" + (enabled ? "on" : "off") + "-48.png", - 96: "assets/toolbar-" + (enabled ? "on" : "off") + "-96.png" - } + } + + setIcon() { + let path = null; + if (!this.enabled) { + path = { + 48: "assets/toolbar-off-48.png", + 96: "assets/toolbar-off-96.png" + }; + } else if (this.active) { + path = { + 48: "assets/toolbar-running-48.png", + 96: "assets/toolbar-running-96.png" + }; + } else { + path = { + 48: "assets/toolbar-on-48.png", + 96: "assets/toolbar-on-96.png" + }; + } + chrome.browserAction.setIcon({ + path: path, }); } @@ -139,28 +149,13 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific } }; - if (!Util.hasWebRTC()) { - chrome.runtime.onConnect.addListener(function(port) { - return port.postMessage({ - missingFeature: true - }); - }); - chrome.browserAction.setIcon({ - path: { - 48: "assets/toolbar-off-48.png", - 96: "assets/toolbar-off-96.png" - } - }); - return; - } - init = function() { config = new Config; ui = new WebExtUI(); broker = new Broker(config.brokerUrl); snowflake = new Snowflake(config, ui, broker); log('== snowflake proxy =='); - return ui.initToggle(); + ui.initToggle(); }; update = function() { diff --git a/proxy/webext/embed.js b/proxy/webext/embed.js index 7e0dac9..85a3465 100644 --- a/proxy/webext/embed.js +++ b/proxy/webext/embed.js @@ -19,7 +19,7 @@ port.onMessage.addListener((m) => { popup.setEnabled(false); popup.setActive(false); popup.setStatusText(chrome.i18n.getMessage('popupStatusOff')); - popup.setStatusDesc(chrome.i18n.getMessage('popupWebRTCOff'), true); + popup.setStatusDesc(chrome.i18n.getMessage(missingFeature), true); popup.hideButton(); return; }

1 0

[snowflake/master] Add locks to safelog
by cohosh＠torproject.org 30 Sep '19

30 Sep '19

commit 3c28380bc651885ea79deab21c20a40b10c4ac7c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Sep 13 12:26:27 2019 -0400 Add locks to safelog The safelog Write function can be called from multiple go routines, and it was not thread safe. These locks in particular allow us to pass the logscrubber's output io.Writer to other libraries, such as pion. --- common/safelog/log.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/safelog/log.go b/common/safelog/log.go index 1241676..9148e53 100644 --- a/common/safelog/log.go +++ b/common/safelog/log.go @@ -7,6 +7,7 @@ import ( "bytes" "io" "regexp" + "sync" ) const ipv4Address = `\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}` @@ -30,8 +31,13 @@ var addressRegexp = regexp.MustCompile(addressPattern) type LogScrubber struct { Output io.Writer buffer []byte + + lock sync.Mutex } +func (ls *LogScrubber) Lock() { (*ls).lock.Lock() } +func (ls *LogScrubber) Unlock() { (*ls).lock.Unlock() } + func scrub(b []byte) []byte { scrubbedBytes := b for _, pattern := range scrubberPatterns { @@ -45,6 +51,9 @@ func scrub(b []byte) []byte { } func (ls *LogScrubber) Write(b []byte) (n int, err error) { + ls.Lock() + defer ls.Unlock() + n = len(b) ls.buffer = append(ls.buffer, b...) for {

1 0

[snowflake/master] Removed extraneous log messages
by cohosh＠torproject.org 30 Sep '19

30 Sep '19

commit f3be34a45925aaa5b6a1abc305876049a47cceb1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Sep 19 16:48:14 2019 -0400 Removed extraneous log messages Many of our log messages were being used to generate metrics, but are now being aggregated and logged to a separate metrics log file and so we don't need them in the regular logs anymore. This addresses the goal of ticket #30830, to remove unecessary messages and keep broker logs for debugging purposes. --- broker/broker.go | 7 ------- broker/metrics.go | 1 - 2 files changed, 8 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 4a88b94..12b4965 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -121,7 +121,6 @@ func (ctx *BrokerContext) Broker() { go func(request *ProxyPoll) { select { case offer := <-snowflake.offerChannel: - log.Println("Passing client offer to snowflake proxy.") request.offerChannel <- offer case <-time.After(time.Second * ProxyTimeout): // This snowflake is no longer available to serve clients. @@ -164,7 +163,6 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusBadRequest) return } - log.Println("Received snowflake: ", id) // Log geoip stats remoteIP, _, err := net.SplitHostPort(r.RemoteAddr) @@ -177,12 +175,10 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { // Wait for a client to avail an offer to the snowflake, or timeout if nil. offer := ctx.RequestOffer(id) if nil == offer { - log.Println("Proxy " + id + " did not receive a Client offer.") ctx.metrics.proxyIdleCount++ w.WriteHeader(http.StatusGatewayTimeout) return } - log.Println("Passing client offer to snowflake.") w.Write(offer) } @@ -201,7 +197,6 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { } // Immediately fail if there are no snowflakes available. if ctx.snowflakes.Len() <= 0 { - log.Println("Client: No snowflake proxies available.") ctx.metrics.clientDeniedCount++ w.WriteHeader(http.StatusServiceUnavailable) return @@ -215,7 +210,6 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { // Wait for the answer to be returned on the channel or timeout. select { case answer := <-snowflake.answerChannel: - log.Println("Client: Retrieving answer") ctx.metrics.clientProxyMatchCount++ w.Write(answer) // Initial tracking of elapsed time. @@ -249,7 +243,6 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { return } - log.Println("Received answer.") snowflake.answerChannel <- body } diff --git a/broker/metrics.go b/broker/metrics.go index ffa61e2..1b2032a 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -114,7 +114,6 @@ func (m *Metrics) UpdateCountryStats(addr string) { if !ok { country = "??" - log.Println("Unknown geoip") } //update map of unique ips and counts

1 0

[gettor/master] Update check script
by hiro＠torproject.org 30 Sep '19

30 Sep '19

commit 59e215a7727b44e3c22c0113644a494da8a9a9c0 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 30 21:40:47 2019 +0200 Update check script --- scripts/check_service | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/check_service b/scripts/check_service index 3800e86..b070a4b 100644 --- a/scripts/check_service +++ b/scripts/check_service @@ -120,13 +120,13 @@ if __name__ == "__main__": message = repr(e) finally: if status == OK: - status_file.write("0\nOK: %s" % message) + status_file.write("OK\n0: %s" % message) elif status == WARNING: - status_file.write("1\nWARNING: %s" % message) + status_file.write("WARNING\n1: %s" % message) elif status == CRITICAL: - status_file.write("2\nCRITICAL: %s" % message) + status_file.write("CRITICAL\n2: %s" % message) else: - status_file.write("3\nUNKNOWN: %s" % message) + status_file.write("UNKNOWN\n3: %s" % message) status = UNKNOWN sys.exit(status)

1 0

[gettor/master] Update check script
by hiro＠torproject.org 30 Sep '19

30 Sep '19

commit 8a0ff9f4a64f5e0fd72f7d04b6f11d3fb6ece3c3 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 30 20:28:45 2019 +0200 Update check script --- scripts/check_service | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/check_service b/scripts/check_service index 82124bd..3800e86 100644 --- a/scripts/check_service +++ b/scripts/check_service @@ -120,13 +120,13 @@ if __name__ == "__main__": message = repr(e) finally: if status == OK: - status_file.write("OK: 0\n%s" % message) + status_file.write("0\nOK: %s" % message) elif status == WARNING: - status_file.write("WARNING: 1\n%s" % message) + status_file.write("1\nWARNING: %s" % message) elif status == CRITICAL: - status_file.write("CRITICAL: 2\n%s" % message) + status_file.write("2\nCRITICAL: %s" % message) else: - status_file.write("UNKNOWN: 3\n%s" % message) + status_file.write("3\nUNKNOWN: %s" % message) status = UNKNOWN sys.exit(status)

1 0