April 2020 - tor-commits - lists.torproject.org

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit 9ac5b94ac20fcd74009847af472b0d1ecbcd6489 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 23:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index df206fd01a..8b41bbce3b 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline ""> <!ENTITY aboutTor.newsletter.link_text ""> -<!ENTITY aboutTor.donationBanner.line2e ""> +<!ENTITY aboutTor.donationBanner.freeToUse ""> <!ENTITY aboutTor.donationBanner.buttonA "">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit c568a0bb17c309e90dfb0276935716ad6fe11d69 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 23:15:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index ea83fa8ea8..14bad9ac5a 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">

1 0

[collector/master] Prepare for 1.15.1 release.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit e3ae1ee8684c014323ca7979c4c6815cbf52f490 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:21:27 2020 +0200 Prepare for 1.15.1 release. --- CHANGELOG.md | 5 ++++- build.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1fc4c0..12ca280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 1.??.? - 2020-??-?? +# Changes in version 1.15.1 - 2020-04-30 + + * Medium changes + - Update to metrics-lib 2.12.2. # Changes in version 1.15.0 - 2020-04-30 diff --git a/build.xml b/build.xml index 02e1564..45b1b3d 100644 --- a/build.xml +++ b/build.xml @@ -9,10 +9,10 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.15.0-dev" /> + <property name="release.version" value="1.15.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.12.1" /> + <property name="metricslibversion" value="2.12.2" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[collector/master] Bump version to 1.15.1-dev.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 9b293ee35f4d457dce4f7775e19401c22d51606c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:25:57 2020 +0200 Bump version to 1.15.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ca280..8ebda3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.??.? - 2020-??-?? + + # Changes in version 1.15.1 - 2020-04-30 * Medium changes diff --git a/build.xml b/build.xml index 45b1b3d..38022fc 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.15.1" /> + <property name="release.version" value="1.15.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.12.2" />

1 0

[metrics-lib/master] Bump version to 2.12.2-dev.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 95771bfb9fa745849673ae11bfe4d5d422111a26 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:15:10 2020 +0200 Bump version to 2.12.2-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b2722c..af5a7f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.??.? - 2020-??-?? + + # Changes in version 2.12.2 - 2020-04-30 * Minor changes diff --git a/build.xml b/build.xml index d3d78ea..978ed37 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.2" /> + <property name="release.version" value="2.12.2-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Change order of detecting descriptor types.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 1c3bcae76d92781fa7f7de86a3dcb6449bd3579d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:06:53 2020 +0200 Change order of detecting descriptor types. We are detecting descriptor types of parsed descriptors by either content or file name. In some cases, if we downloaded descriptors from web servers, there is no file name. In other cases the file name can match more than one descriptor type. It seems most robust to move the file name checks to the end, which includes web server access logs and OnionPerf analysis files. --- .../torproject/descriptor/impl/DescriptorParserImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 7dcd9d2..e008e7a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -131,9 +131,6 @@ public class DescriptorParserImpl implements DescriptorParser { } else if (firstLines.startsWith("@type torperf 1.")) { return TorperfResultImpl.parseTorperfResults(rawDescriptorBytes, sourceFile); - } else if (fileName.endsWith(".onionperf.analysis.json.xz")) { - return new OnionPerfAnalysisConverter(rawDescriptorBytes, sourceFile) - .asTorperfResults(); } else if (firstLines.startsWith("@type snowflake-stats 1.") || firstLines.startsWith(Key.SNOWFLAKE_STATS_END.keyword + SP) || firstLines.contains(NL + Key.SNOWFLAKE_STATS_END.keyword + SP)) { @@ -144,8 +141,6 @@ public class DescriptorParserImpl implements DescriptorParser { || firstLines.contains(NL + Key.BRIDGEDB_METRICS_END.keyword + SP)) { return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.BRIDGEDB_METRICS_END, BridgedbMetricsImpl.class); - } else if (fileName.contains(LogDescriptorImpl.MARKER)) { - return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName); } else if (firstLines.startsWith("@type bandwidth-file 1.") || firstLines.matches("(?s)[0-9]{10}\\n.*")) { /* Identifying bandwidth files by a 10-digit timestamp in the first line @@ -156,6 +151,14 @@ public class DescriptorParserImpl implements DescriptorParser { parsedDescriptors.add(new BandwidthFileImpl(rawDescriptorBytes, sourceFile)); return parsedDescriptors; + } else if (null != fileName + && fileName.contains(LogDescriptorImpl.MARKER)) { + return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, + fileName); + } else if (null != fileName + && fileName.endsWith(".onionperf.analysis.json.xz")) { + return new OnionPerfAnalysisConverter(rawDescriptorBytes, sourceFile) + .asTorperfResults(); } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'.");

1 0

[metrics-lib/master] Prepare for 2.12.2 release.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 7a5115dd76bb22835f931295b65d58dc0117367b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:11:52 2020 +0200 Prepare for 2.12.2 release. --- CHANGELOG.md | 6 +++++- build.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb8430d..6b2722c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Changes in version 2.??.? - 2020-??-?? +# Changes in version 2.12.2 - 2020-04-30 + + * Minor changes + - Change the order of detecting descriptor types by content and/ + file name. # Changes in version 2.12.1 - 2020-04-30 diff --git a/build.xml b/build.xml index ac4a3ed..d3d78ea 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.1-dev" /> + <property name="release.version" value="2.12.2" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[snowflake-webext/master] Remove proxy/ prefix from .gitignore
by arlo＠torproject.org 30 Apr '20

30 Apr '20

commit 58406af560b78a807fd6dc70087c07157cf54eef Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Apr 30 16:07:10 2020 -0400 Remove proxy/ prefix from .gitignore --- .gitignore | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 448d843..cbd3202 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,16 @@ *.swn *.swm .DS_Store -proxy/test -proxy/build -proxy/node_modules -proxy/snowflake-library.js -proxy/spec/support -proxy/webext/snowflake.js -proxy/webext/popup.js -proxy/webext/embed.html -proxy/webext/embed.css -proxy/webext/assets/ -proxy/webext/_locales/ +test +build +node_modules +snowflake-library.js +spec/support +webext/snowflake.js +webext/popup.js +webext/embed.html +webext/embed.css +webext/assets/ +webext/_locales/ ignore/ npm-debug.log

1 0

[snowflake-webext/master] Move getMessage inside missingFeature
by arlo＠torproject.org 30 Apr '20

30 Apr '20

commit 11f3d871f34ccb0ab732ac943ac7af6416830a3b Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Apr 15 13:51:35 2020 -0400 Move getMessage inside missingFeature --- init-badge.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init-badge.js b/init-badge.js index cb066e8..e676323 100644 --- a/init-badge.js +++ b/init-badge.js @@ -32,7 +32,7 @@ class BadgeUI extends UI { this.popup.setActive(false); this.popup.setStatusText(messages.getMessage('popupStatusOff')); this.setIcon('off'); - this.popup.setStatusDesc(missing, true); + this.popup.setStatusDesc(messages.getMessage(missing), true); this.popup.hideButton(); } @@ -139,7 +139,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific } if (!Util.hasWebRTC()) { - ui.missingFeature(messages.getMessage('popupWebRTCOff')); + ui.missingFeature('popupWebRTCOff'); snowflake.disable(); return; } @@ -154,7 +154,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific snowflake.beginWebRTC(); }, () => { - ui.missingFeature(messages.getMessage('popupBridgeUnreachable')); + ui.missingFeature('popupBridgeUnreachable'); snowflake.disable(); log('Could not connect to bridge.'); } @@ -165,7 +165,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific ui = new BadgeUI(); if (!Util.hasCookies()) { - ui.missingFeature(messages.getMessage('badgeCookiesOff')); + ui.missingFeature('badgeCookiesOff'); return; }

1 0

[snowflake-webext/master] Refactor popup on/off to be shared between webext and badge
by arlo＠torproject.org 30 Apr '20

30 Apr '20

commit dc9d4fab26e788f6a4b5bd4f3cf40f2a31b3a78a Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Apr 15 14:21:48 2020 -0400 Refactor popup on/off to be shared between webext and badge --- init-badge.js | 23 +++++------------------ static/popup.js | 25 ++++++++++++++++++++++++- webext/embed.js | 22 ++++------------------ 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/init-badge.js b/init-badge.js index e676323..4beceb1 100644 --- a/init-badge.js +++ b/init-badge.js @@ -22,43 +22,30 @@ class BadgeUI extends UI { constructor() { super(); - this.popup = new Popup(); + this.popup = new Popup((...args) => messages.getMessage(...args)); } setStatus() {} missingFeature(missing) { - this.popup.setEnabled(false); - this.popup.setActive(false); - this.popup.setStatusText(messages.getMessage('popupStatusOff')); this.setIcon('off'); - this.popup.setStatusDesc(messages.getMessage(missing), true); - this.popup.hideButton(); + this.popup.missingFeature(missing); } turnOn() { const clients = this.active ? 1 : 0; - this.popup.setChecked(true); if (clients > 0) { - this.popup.setStatusText(messages.getMessage('popupStatusOn', String(clients))); this.setIcon('running'); } else { - this.popup.setStatusText(messages.getMessage('popupStatusReady')); this.setIcon('on'); } - // FIXME: Share stats from webext - this.popup.setStatusDesc(''); - this.popup.setEnabled(true); - this.popup.setActive(this.active); + const total = 0; // FIXME: Share stats from webext + this.popup.turnOn(clients, total); } turnOff() { - this.popup.setChecked(false); - this.popup.setStatusText(messages.getMessage('popupStatusOff')); this.setIcon('off'); - this.popup.setStatusDesc(''); - this.popup.setEnabled(false); - this.popup.setActive(false); + this.popup.turnOff(); } setActive(connected) { diff --git a/static/popup.js b/static/popup.js index 80cbcc6..5223350 100644 --- a/static/popup.js +++ b/static/popup.js @@ -10,7 +10,8 @@ function setClass(elem, className, cond) { } class Popup { - constructor() { + constructor(getMsgFunc) { + this.getMsgFunc = getMsgFunc; this.div = document.getElementById('active'); this.statustext = document.getElementById('statustext'); this.statusdesc = document.getElementById('statusdesc'); @@ -47,4 +48,26 @@ class Popup { break; } } + turnOn(clients, total) { + this.setChecked(true); + if (clients > 0) { + this.setStatusText(this.getMsgFunc('popupStatusOn', String(clients))); + } else { + this.setStatusText(this.getMsgFunc('popupStatusReady')); + } + this.setStatusDesc((total > 0) ? this.getMsgFunc('popupDescOn', String(total)) : ''); + this.setEnabled(true); + this.setActive(this.active); + } + turnOff(desc, error) { + this.setChecked(false); + this.setStatusText(this.getMsgFunc('popupStatusOff')); + this.setStatusDesc(desc ? this.getMsgFunc(desc) : '', error); + this.setEnabled(false); + this.setActive(false); + } + missingFeature(desc) { + this.turnOff(desc, true); + this.hideButton(); + } } diff --git a/webext/embed.js b/webext/embed.js index eae482f..7371005 100644 --- a/webext/embed.js +++ b/webext/embed.js @@ -13,34 +13,20 @@ const port = chrome.runtime.connect({ port.onMessage.addListener((m) => { const { active, enabled, total, missingFeature } = m; - const popup = new Popup(); + const popup = new Popup((...args) => chrome.i18n.getMessage(...args)); if (missingFeature) { - popup.setEnabled(false); - popup.setActive(false); - popup.setStatusText(chrome.i18n.getMessage('popupStatusOff')); - popup.setStatusDesc(chrome.i18n.getMessage(missingFeature), true); - popup.hideButton(); + popup.missingFeature(missingFeature); return; } const clients = active ? 1 : 0; if (enabled) { - popup.setChecked(true); - if (clients > 0) { - popup.setStatusText(chrome.i18n.getMessage('popupStatusOn', String(clients))); - } else { - popup.setStatusText(chrome.i18n.getMessage('popupStatusReady')); - } - popup.setStatusDesc((total > 0) ? chrome.i18n.getMessage('popupDescOn', String(total)) : ''); + popup.turnOn(clients, total); } else { - popup.setChecked(false); - popup.setStatusText(chrome.i18n.getMessage('popupStatusOff')); - popup.setStatusDesc(""); + popup.turnOff(); } - popup.setEnabled(enabled); - popup.setActive(active); }); document.addEventListener('change', (event) => {

1 0