February 2018 - tor-commits - lists.torproject.org

[torspec/master] control: HSPOST for v3 was never a thing
by dgoulet＠torproject.org 27 Feb '18

27 Feb '18

commit ff4909416aa981e758839c3517407efd78359f14 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 27 08:46:33 2018 -0500 control: HSPOST for v3 was never a thing Mistake introduced with the merge of prop#284, HSPOST does not support v3. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index ed61218..c1110bc 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1730,7 +1730,6 @@ S: 250 OK [HSPOST was added in Tor 0.2.7.1-alpha] - [HS v3 support added 0.3.3.1-alpha] 4. Replies

1 0

[torbirdy/master] Drop support for versioned JavaScript (mozilla57; see bugzilla 1390106)
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit c9d9fa56d8f9eac0c5af0dfebf2d8857ff45e19a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 26 14:41:41 2018 -0500 Drop support for versioned JavaScript (mozilla57; see bugzilla 1390106) --- chrome/content/accountpref.xul | 2 +- chrome/content/firstruninfo.xul | 2 +- chrome/content/preferences.xul | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/content/accountpref.xul b/chrome/content/accountpref.xul index baf419e..f460f64 100644 --- a/chrome/content/accountpref.xul +++ b/chrome/content/accountpref.xul @@ -14,7 +14,7 @@ onload="return org.torbirdy.accountprefs.onLoad();" ondialogaccept="return org.torbirdy.accountprefs.onAccept();"> - <script type="application/x-javascript" + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/accountpref.js"></script> <vbox> diff --git a/chrome/content/firstruninfo.xul b/chrome/content/firstruninfo.xul index 43f1d66..17fd73a 100644 --- a/chrome/content/firstruninfo.xul +++ b/chrome/content/firstruninfo.xul @@ -10,7 +10,7 @@ onload="return org.torbirdy.firstrun.onLoad();" ondialogaccept="window.close();"> - <script type="application/x-javascript" + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/firstruninfo.js"></script> <stringbundleset id="stringbundleset"> diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index 2e3c168..296f220 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -19,7 +19,7 @@ ondialogaccept="return org.torbirdy.prefs.onAccept();" onload="return org.torbirdy.prefs.onLoad();"> - <script type="application/x-javascript" + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/preferences.js"></script> <tabbox>

1 0

[torbirdy/master] Update install.rdf
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit baccc82cc942daeaaeb369e885e1c7b6df40b690 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 26 14:45:41 2018 -0500 Update install.rdf - Bump version to 0.2.4 - Set minVersion to 52.0 and maxVersion to 59.* --- install.rdf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index fefb89f..86d94b1 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.2.3</em:version> + <em:version>0.2.4</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL> <em:optionsURL>chrome://castironthunderbirdclub/content/preferences.xul</em:optionsURL> @@ -13,8 +13,8 @@  <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> - <em:minVersion>45.0</em:minVersion> - <em:maxVersion>52.*</em:maxVersion> + <em:minVersion>52.0</em:minVersion> + <em:maxVersion>59.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[torbirdy/master] Ensure compatibility for Thunderbird 59 (use proper imports)
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit b8e45f597969aa592e23c5f8dd34dfd397e9837f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 26 14:39:03 2018 -0500 Ensure compatibility for Thunderbird 59 (use proper imports) --- components/torbirdy.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 4dafef9..430c15f 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,7 +1,7 @@ var { interfaces: Ci, utils: Cu, classes: Cc } = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/imXPCOMUtils.jsm"); +Cu.import("resource:///modules/imXPCOMUtils.jsm"); Cu.import("resource://gre/modules/AddonManager.jsm"); Cu.import("resource://gre/modules/Preferences.jsm"); @@ -439,7 +439,6 @@ function TorBirdy() { this.setPrefs(); sanitizeDateHeaders(); - dump("TorBirdy registered!\n"); } TorBirdy.prototype = { @@ -471,7 +470,6 @@ TorBirdy.prototype = { onUninstalling: function(addon, needsRestart) { this.onStateChange(); if (addon.id == TB_ID) { - dump("TorBirdy uninstall requested\n"); this._uninstall = true; this.resetUserPrefs(); } @@ -480,7 +478,6 @@ TorBirdy.prototype = { onOperationCancelled: function(addon) { this.onStateChange(); if (addon.id == TB_ID) { - dump("Uninstall requested cancelled\n"); this._uninstall = false; this.setPrefs(); } @@ -491,14 +488,12 @@ TorBirdy.prototype = { }, resetUserPrefs: function() { - dump("Resetting user preferences to default\n"); // Clear the Thunderbird preferences we changed. for (let each in TorBirdyPrefs) { this.prefs.clearUserPref(each); } // Restore the older proxy preferences that were set prior to TorBirdy's install. - dump("Restoring proxy settings\n"); for (let i = 0; i < TorBirdyOldPrefs.length; i++) { var oldPref = TorBirdyOldPrefs[i]; var setValue = kRestoreBranch + oldPref;

1 0

[torbirdy/master] Update the ChangeLog
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit 38a66b01fecc11d188fffafdaf0ec32ddad3db77 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 26 14:48:35 2018 -0500 Update the ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7d6869d..d95c5d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 0.2.4, * Update translations, adding all supported languages from Transifex + * Added support for Thunderbird 58 and Thunderbird 59 0.2.3, 04 Aug 2017 * Bug 21880: Enable encrypted email headers for Enigmail (Memory Hole)

1 0

[torbirdy/master] Add locale for en-US (default English locale)
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit 39bd34681a709db42ad52c16d70daa0cd0f52644 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 26 14:47:33 2018 -0500 Add locale for en-US (default English locale) --- chrome/locale/en-US/torbirdy.dtd | 60 +++++++++++++++++++++++++++++++++ chrome/locale/en-US/torbirdy.properties | 18 ++++++++++ 2 files changed, 78 insertions(+) diff --git a/chrome/locale/en-US/torbirdy.dtd b/chrome/locale/en-US/torbirdy.dtd new file mode 100644 index 0000000..c88803a --- /dev/null +++ b/chrome/locale/en-US/torbirdy.dtd @@ -0,0 +1,60 @@ +<!ENTITY torbirdy.accountprefs.title "Account Configuration"> +<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes"> +<!ENTITY torbirdy.accountprefs.cancel.button "Cancel"> +<!ENTITY torbirdy.accountprefs.save.button "Save"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Preferences"> +<!ENTITY torbirdy.prefs.save.button "Save"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Cancel"> +<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Global"> +<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> +<!ENTITY torbirdy.prefs.imap.key "p"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> +<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.account_specific "Account-Specific"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Choose an account: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router"> +<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/chrome/locale/en-US/torbirdy.properties b/chrome/locale/en-US/torbirdy.properties new file mode 100644 index 0000000..4f645eb --- /dev/null +++ b/chrome/locale/en-US/torbirdy.properties @@ -0,0 +1,18 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Enabled: Tor +torbirdy.enabled.jondo=TorBirdy Enabled: JonDo +torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy +torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification +torbirdy.enabled.whonix=TorBirdy Enabled: Whonix +torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled=TorBirdy: Enabled + +torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. + +torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +torbirdy.email.advanced.nextwarning=Show this warning next time +torbirdy.email.advanced.title=TorBirdy Advanced Settings + +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[torbirdy/master] Update the changelog
by sukhbir＠torproject.org 26 Feb '18

26 Feb '18

commit 30f59fa5df0c6bb22b024ba6e33dfbe16a1ac935 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Feb 13 12:38:59 2018 -0500 Update the changelog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index fcf7a26..7d6869d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +0.2.4, + * Update translations, adding all supported languages from Transifex + 0.2.3, 04 Aug 2017 * Bug 21880: Enable encrypted email headers for Enigmail (Memory Hole) * Bug 22569: Update Enigmail values for custom proxy settings

1 0

[collector/release] Use enum Method from metrics-lib.
by karsten＠torproject.org 26 Feb '18

26 Feb '18

commit 2a0aa8c7f8c956ba15c5780bc078d5330322fcd5 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:24 2018 +0000 Use enum Method from metrics-lib. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 88d62fa..a3d2a7e 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -15,6 +15,7 @@ import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.WebServerAccessLog; import org.torproject.descriptor.log.InternalLogDescriptor; import org.torproject.descriptor.log.InternalWebServerAccessLog; +import org.torproject.descriptor.log.Method; import org.torproject.descriptor.log.WebServerAccessLogImpl; import org.torproject.descriptor.log.WebServerAccessLogLine; @@ -146,8 +147,8 @@ public class SanitizeWeblogs extends CollecTorMain { static Optional<String> sanitize(WebServerAccessLogLine logLine, LocalDate date) { if (!logLine.isValid() - || !("GET".equals(logLine.getMethod()) - || "HEAD".equals(logLine.getMethod())) + || !(Method.GET == logLine.getMethod() + || Method.HEAD == logLine.getMethod()) || !logLine.getProtocol().startsWith("HTTP") || 400 == logLine.getResponse() || 404 == logLine.getResponse()) { return Optional.empty();

1 0

[collector/release] Avoid repeated validation of clean and validated log lines.
by karsten＠torproject.org 26 Feb '18

26 Feb '18

commit 06d1a81d4cfe8ce89caa6cf49124f6700b33f522 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:28 2018 +0000 Avoid repeated validation of clean and validated log lines. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 635457c..53ad118 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -136,7 +136,7 @@ public class SanitizeWeblogs extends CollecTorMain { try { WebServerAccessLogPersistence walp = new WebServerAccessLogPersistence( - new WebServerAccessLogImpl(retainedLines, name)); + new WebServerAccessLogImpl(retainedLines, name, false)); log.debug("Storing {}.", name); walp.storeOut(this.outputPathName); walp.storeRecent(this.recentPathName);

1 0

[collector/release] Optimize parallel processing and use static imports for readability.
by karsten＠torproject.org 26 Feb '18

26 Feb '18

commit bd948070e03ff71503fdba84cff6bc61c9fbe452 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:26 2018 +0000 Optimize parallel processing and use static imports for readability. --- .../torproject/collector/webstats/SanitizeWeblogs.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 4496861..635457c 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -3,6 +3,9 @@ package org.torproject.collector.webstats; +import static java.util.stream.Collectors.groupingByConcurrent; +import static java.util.stream.Collectors.toList; + import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; @@ -37,7 +40,6 @@ import java.util.SortedSet; import java.util.StringJoiner; import java.util.TreeMap; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -106,10 +108,9 @@ public class SanitizeWeblogs extends CollecTorMain { log.info("Processing logs for {} on {}.", virtualHost, physicalHost); Map<LocalDate, List<WebServerAccessLogLine>> linesByDate = physicalEntry.getValue().values().stream().parallel() - .flatMap((LogMetadata metadata) - -> lineStream(metadata).filter((line) -> line.isValid())) - .collect(Collectors.groupingBy(WebServerAccessLogLine::getDate, - Collectors.toList())); + .flatMap((LogMetadata metadata) -> lineStream(metadata) + .filter((line) -> line.isValid())).parallel() + .collect(groupingByConcurrent(WebServerAccessLogLine::getDate)); LocalDate[] interval = determineInterval(linesByDate.keySet()); linesByDate.entrySet().stream() .filter((entry) -> entry.getKey().isAfter(interval[0]) @@ -130,7 +131,7 @@ public class SanitizeWeblogs extends CollecTorMain { List<String> retainedLines = lines .stream().parallel().map((line) -> sanitize(line, date)) .filter((line) -> line.isPresent()).map((line) -> line.get()) - .collect(Collectors.toList()); + .collect(toList()); retainedLines.sort(null); try { WebServerAccessLogPersistence walp @@ -142,6 +143,7 @@ public class SanitizeWeblogs extends CollecTorMain { } catch (DescriptorParseException dpe) { log.error("Cannot store log desriptor {}.", name, dpe); } + lines.clear(); } static Optional<String> sanitize(WebServerAccessLogLine logLine, @@ -188,7 +190,7 @@ public class SanitizeWeblogs extends CollecTorMain { metadata.fileType.decompress(Files.readAllBytes(metadata.path)))))) { return br.lines() .map((String line) -> WebServerAccessLogLine.makeLine(line)) - .collect(Collectors.toList()).stream(); + .collect(toList()).stream(); } catch (Exception ex) { log.debug("Skipping log-file {}.", metadata.path, ex); }

1 0