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

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 05 Mar '20

05 Mar '20

commit 250cf9385025b6f6b42f982b21d52d7bc961d886 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 05:22:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+zh-CN.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index e4fa1d88b1..26f6324c50 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -13,6 +13,7 @@ # YFdyh000 <yfdyh000(a)gmail.com>, 2020 # erinm, 2020 # ciaran <ciaranchen(a)qq.com>, 2020 +# Runzhe Liang <18051080098(a)163.com>, 2020 # msgid "" msgstr "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: ciaran <ciaranchen(a)qq.com>, 2020\n" +"Last-Translator: Runzhe Liang <18051080098(a)163.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1115,7 +1116,7 @@ msgstr "查看%s来获得更多解决问题的提示。" #: templates/download.html:49 msgid "How can I verify Tor Browser signature?" -msgstr "" +msgstr "如何验证Tor 浏览器的签名？" #: templates/download.html:54 msgid "Stand up for privacy and freedom online." @@ -1142,7 +1143,7 @@ msgstr "保护你自己" #: templates/hero-download.html:32 msgid "Download for" -msgstr "" +msgstr "下载" #: templates/hero-download.html:33 msgid "Signature" @@ -1150,7 +1151,7 @@ msgstr "签名" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "下载安卓版本" #: templates/hero-download.html:49 msgid "Download in another language or platform"

1 0

[stem/master] Extrainfo descriptor transport lines fail validation
by atagar＠torproject.org 05 Mar '20

05 Mar '20

commit 7a0a8dd8d4218d5dabec3c2e47bebc4d1771236e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 4 17:49:09 2020 -0800 Extrainfo descriptor transport lines fail validation Oops! Transport lines effectviely never appear aside from raw bridge descriptors (which we never see), so I didn't have a live example to test with. Now we have one. DocTor's descriptor validation check is failing with... 03/05/2020 00:35:33 [WARNING] Unable to retrieve the extrainfo descriptors: Transport line has a malformed address: transport obfs4 [2001:985:e77:5:fd34:f56b:c2d1:e98c]:10394 cert=dJ/a+vnP+eFv7FDaVUqWCVlyrqf8FlOva2YAEkDUwiGQuorZf4Oc6FXSdyn8b4pUmZj/WA,iat-mode=0 Caught thanks to GeKo. --- docs/change_log.rst | 4 ++++ stem/descriptor/extrainfo_descriptor.py | 2 +- test/unit/descriptor/extrainfo_descriptor.py | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 792baaca..8f306b44 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -50,6 +50,10 @@ The following are only available within Stem's `git repository * Socket based control connections often raised BrokenPipeError when closed + * **Descriptors** + + * *transport* lines within extrainfo descriptors failed to validate + .. _version_1.8: Version 1.8 (December 29th, 2019) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index dcca9d14..d92bb770 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -286,7 +286,7 @@ def _parse_transport_line(descriptor, entries): name = value_comp[0] address, port_str = value_comp[1].rsplit(':', 1) - if not stem.util.connection.is_valid_ipv4_address(address) or \ + if not stem.util.connection.is_valid_ipv4_address(address) and not \ stem.util.connection.is_valid_ipv6_address(address, allow_brackets = True): raise ValueError('Transport line has a malformed address: transport %s' % value) elif not stem.util.connection.is_valid_port(port_str): diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 25cbf489..2dae4de7 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -643,6 +643,23 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw expect_invalid_attr(self, {keyword: entry}, stat_attr) expect_invalid_attr(self, {keyword: entry}, extra_attr, {}) + def test_transport(self): + """ + These lines are only applicable in raw bridge descriptors, which are + unavailable to the public. That said, misconfigured relays can occasionally + emit these. + """ + + desc = RelayExtraInfoDescriptor.create({'transport': 'obfs4 [2001:985:e77:5:fd34:f56b:c2d1:e98c]:10394 cert=dJ/a+vnP/WA,iat-mode=0'}) + + self.assertEqual({'obfs4': ( + '[2001:985:e77:5:fd34:f56b:c2d1:e98c]', + 10394, + ['cert=dJ/a+vnP/WA,iat-mode=0'], + )}, desc.transport) + + expect_invalid_attr(self, {'transport': 'obfs4 invalid_address:123'}, 'transport', {}) + def test_padding_counts(self): """ Check the 'hidserv-dir-onions-seen' lines.

1 0

[translation/tails-persistence-setup_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup_completed
by translation＠torproject.org 04 Mar '20

04 Mar '20

commit adc2e6a2478394c1251fb463816398b66686983c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 22:19:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- fr/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 9b24c8c344..ed9eb99486 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -36,7 +36,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2020-03-02 19:39+0000\n" +"PO-Revision-Date: 2020-03-04 21:56+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgstr "Client bitcoin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:167 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Portefeuille bitcoin et configuration d’Electrum" +msgstr "Porte-monnaie Bitcoin et configuration d’Electrum" #: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "Pidgin"

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 04 Mar '20

04 Mar '20

commit ef31013032d31c7309dda4a86f94d47be039c4f6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 22:19:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- fr/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 9b24c8c344..ed9eb99486 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -36,7 +36,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2020-03-02 19:39+0000\n" +"PO-Revision-Date: 2020-03-04 21:56+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgstr "Client bitcoin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:167 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Portefeuille bitcoin et configuration d’Electrum" +msgstr "Porte-monnaie Bitcoin et configuration d’Electrum" #: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "Pidgin"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Mar '20

04 Mar '20

commit 5c714758cb38232f075f0f19ca13c8757aa2366f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 22:18:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index f0384f5df9..a1eb9dc1d9 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-03-02 19:40+0000\n" +"PO-Revision-Date: 2020-03-04 21:58+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "La persistance est désactivée pour Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "Lorsque vous redémarrerez Tails, toutes les données d’Electrum seront perdues, incluant votre portefeuille Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." +msgstr "Quand vous redémarrerez Tails, toutes les données d’Electrum seront perdues, dont votre porte-monnaie Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?"

1 0

[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation＠torproject.org 04 Mar '20

04 Mar '20

commit cfc2fa8315c4504bdf37c525acb61bd60b0a387c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 22:17:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index f0384f5df9..a1eb9dc1d9 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-03-02 19:40+0000\n" +"PO-Revision-Date: 2020-03-04 21:58+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "La persistance est désactivée pour Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "Lorsque vous redémarrerez Tails, toutes les données d’Electrum seront perdues, incluant votre portefeuille Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." +msgstr "Quand vous redémarrerez Tails, toutes les données d’Electrum seront perdues, dont votre porte-monnaie Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 Mar '20

04 Mar '20

commit 09372304f3f103682f456dde3cad98c69e17397c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 22:17:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index f0384f5df9..a1eb9dc1d9 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-03-02 19:40+0000\n" +"PO-Revision-Date: 2020-03-04 21:58+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "La persistance est désactivée pour Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "Lorsque vous redémarrerez Tails, toutes les données d’Electrum seront perdues, incluant votre portefeuille Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." +msgstr "Quand vous redémarrerez Tails, toutes les données d’Electrum seront perdues, dont votre porte-monnaie Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?"

1 0

[snowflake/master] bump version to 0.2.2
by cohosh＠torproject.org 04 Mar '20

04 Mar '20

commit 03315dde029d37d93f894c6ae4932851fd1460a1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Mar 4 16:20:34 2020 -0500 bump version to 0.2.2 --- proxy/translation | 2 +- proxy/webext/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/translation b/proxy/translation index 2d92ad1..9ce163a 160000 --- a/proxy/translation +++ b/proxy/translation @@ -1 +1 @@ -Subproject commit 2d92ad194c9d54bd7164b680f5c41c80e1aab87d +Subproject commit 9ce163a282fcd35e3cc6b642b0236e237dc56159 diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 9578bc0..c3ccfa7 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.2.1", + "version": "0.2.2", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[metrics-web/master] Update directory bytes graph to include authorities.
by karsten＠torproject.org 04 Mar '20

04 Mar '20

commit c52b7ce61c86ddd6a0aac62272c439e54bff9a70 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 3 13:03:09 2020 +0100 Update directory bytes graph to include authorities. Implements #33065. --- src/main/R/rserver/rserve-init.R | 21 ++++++++++++++++----- src/main/resources/web/json/metrics.json | 2 +- .../resources/web/jsps/reproducible-metrics.jsp | 2 +- src/main/resources/web/jsps/stats.jsp | 2 ++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R index 46abc8a..6d4c571 100644 --- a/src/main/R/rserver/rserve-init.R +++ b/src/main/R/rserver/rserve-init.R @@ -467,22 +467,31 @@ prepare_dirbytes <- function(start_p = NULL, end_p = NULL) { bwread = col_skip(), bwwrite = col_skip(), dirread = col_double(), - dirwrite = col_double())) %>% + dirwrite = col_double(), + dirauthread = col_double(), + dirauthwrite = col_double())) %>% filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% filter(is.na(isexit)) %>% filter(is.na(isguard)) %>% mutate(dirread = dirread * 8 / 1e9, - dirwrite = dirwrite * 8 / 1e9) %>% - select(date, dirread, dirwrite) + dirwrite = dirwrite * 8 / 1e9, + dirauthread = dirauthread * 8 / 1e9, + dirauthwrite = dirauthwrite * 8 / 1e9) %>% + select(date, dirread, dirwrite, dirauthread, dirauthwrite) } plot_dirbytes <- function(start_p, end_p, path_p) { prepare_dirbytes(start_p, end_p) %>% gather(variable, value, -date) %>% + mutate(readwrite = ifelse(grepl("read", variable), "dirread", "dirwrite"), + authority = factor( + ifelse(grepl("auth", variable), "authorities", "mirrors"), + levels = c("authorities", "mirrors"))) %>% complete(date = full_seq(date, period = 1), nesting(variable)) %>% - ggplot(aes(x = date, y = value, colour = variable)) + + ggplot(aes(x = date, y = value, colour = readwrite)) + geom_line() + + facet_grid(authority ~ ., scales = "free_y", space = "free_y") + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = function(x) sprintf("%.1f Gbit/s", x), @@ -492,7 +501,9 @@ plot_dirbytes <- function(start_p, end_p, path_p) { labels = c("Written dir bytes", "Read dir bytes")) + ggtitle("Number of bytes spent on answering directory requests") + labs(caption = copyright_notice) + - theme(legend.position = "top") + theme(legend.position = "top", + strip.text.y = element_text(angle = 0, hjust = 0), + strip.background = element_rect(fill = NA)) ggsave(filename = path_p, width = 8, height = 5, dpi = 150) } diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index be40bdc..6dd7e94 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -92,7 +92,7 @@ "id": "dirbytes", "title": "Bandwidth spent on answering directory requests", "type": "Graph", - "description": "This graph shows the portion of <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a href=\"glossary.html#directory-mirror\">directory mirrors</a> have spent on answering directory requests.", + "description": "This graph shows the portion of <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a href=\"glossary.html#directory-authority\">directory authorities</a> and <a href=\"glossary.html#directory-mirror\">directory mirrors</a> have spent on answering directory requests.", "function": "dirbytes", "parameters": [ "start", diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index 0058ab6..98b9784 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/src/main/resources/web/jsps/reproducible-metrics.jsp @@ -598,7 +598,7 @@ For both graphs we sum up all read and written bytes on a given day and divide t However, we only include bandwidth histories for a given day if a relay was listed as running in a consensus at least once on that day. We attribute bandwidth to guards and/or exits if a relay was a guard and/or exit at least in one consensus on a day. -The third graph, <a href="/dirbytes.html">Bandwidth spent on answering directory requests</a>, shows bytes spent by <a href="/glossary.html#directory-mirror">directory mirrors</a> on answering directory requests. +The third graph, <a href="/dirbytes.html">Bandwidth spent on answering directory requests</a>, shows bytes spent by <a href="/glossary.html#directory-authority">directory authorities</a> and <a href="/glossary.html#directory-mirror">directory mirrors</a> on answering directory requests. As opposed to the first two graphs, all bandwidth histories are included, regardless of whether a relay was listed as running in a consensus. Also, we compute total read directory and total written directory bytes for this fourth graph, not an average of the two. diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 25eb239..886ec89 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -505,6 +505,8 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <li>date: UTC date (YYYY-MM-DD) that relays reported bandwidth data for.</li> <li>dirread: Bandwidth in Gbit/s that directory mirrors have read when serving directory data.</li> <li>dirwrite: Bandwidth in Gbit/s that directory mirrors have written when serving directory data.</li> +<li>dirauthread: Bandwidth in Gbit/s that directory authorities have read when serving directory data.</li> +<li>dirauthwrite: Bandwidth in Gbit/s that directory authorities have written when serving directory data.</li> </ul> <h3>Fraction of connections used uni-/bidirectionally

1 0

[metrics-web/master] Extract directory authority bytes per day.
by karsten＠torproject.org 04 Mar '20

04 Mar '20

commit efa490efdfd8669b7ca246f142e9c8170319753c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 27 21:12:21 2020 +0100 Extract directory authority bytes per day. Implements #33065. --- CHANGELOG.md | 1 + .../stats/bwhist/RelayDescriptorDatabaseImporter.java | 6 ++++-- src/main/sql/bwhist/tordir.sql | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5731bad..43b7e75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Improve runtime performance of the hidserv module by storing extrapolated statistics even if computed network fractions are zero, to avoid re-processing these statistics over and over. + - Extract directory authority bytes per day in the bwhist module. * Minor changes - Make Jetty host configurable. diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java index 91cd559..7b08f77 100644 --- a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java @@ -583,13 +583,13 @@ public final class RelayDescriptorDatabaseImporter { List<String[]> queryBandwidth() throws SQLException { List<String[]> statistics = new ArrayList<>(); String columns = "date, isexit, isguard, bwread, bwwrite, dirread, " - + "dirwrite"; + + "dirwrite, dirauthread, dirauthwrite"; statistics.add(columns.split(", ")); Statement st = this.conn.createStatement(); String queryString = "SELECT " + columns + " FROM stats_bandwidth"; try (ResultSet rs = st.executeQuery(queryString)) { while (rs.next()) { - String[] outputLine = new String[7]; + String[] outputLine = new String[9]; outputLine[0] = rs.getDate("date").toLocalDate().toString(); outputLine[1] = getBooleanFromResultSet(rs, "isexit"); outputLine[2] = getBooleanFromResultSet(rs, "isguard"); @@ -597,6 +597,8 @@ public final class RelayDescriptorDatabaseImporter { outputLine[4] = getLongFromResultSet(rs, "bwwrite"); outputLine[5] = getLongFromResultSet(rs, "dirread"); outputLine[6] = getLongFromResultSet(rs, "dirwrite"); + outputLine[7] = getLongFromResultSet(rs, "dirauthread"); + outputLine[8] = getLongFromResultSet(rs, "dirauthwrite"); statistics.add(outputLine); } } diff --git a/src/main/sql/bwhist/tordir.sql b/src/main/sql/bwhist/tordir.sql index a2c3b65..fad5d2f 100644 --- a/src/main/sql/bwhist/tordir.sql +++ b/src/main/sql/bwhist/tordir.sql @@ -66,7 +66,9 @@ CREATE TABLE bwhist_flags ( CREATE TABLE user_stats ( date DATE NOT NULL, dw BIGINT, - dr BIGINT + dr BIGINT, + daw BIGINT, + dar BIGINT ); -- Dates to be included in the next refresh run. @@ -199,13 +201,17 @@ CREATE OR REPLACE FUNCTION refresh_user_stats() RETURNS INTEGER AS $$ DELETE FROM user_stats WHERE date IN (SELECT date FROM updates); -- Now insert new user statistics. EXECUTE ' - INSERT INTO user_stats (date, dw, dr) + INSERT INTO user_stats (date, dw, dr, daw, dar) SELECT bwhist_by_relay.date AS date, SUM(CASE WHEN authority IS NOT NULL THEN NULL ELSE dirwritten END) AS dw, SUM(CASE WHEN authority IS NOT NULL - THEN NULL ELSE dirread END) AS dr + THEN NULL ELSE dirread END) AS dr, + SUM(CASE WHEN authority IS NULL + THEN NULL ELSE dirwritten END) AS daw, + SUM(CASE WHEN authority IS NULL + THEN NULL ELSE dirread END) AS dar FROM ( -- Retrieve aggregate bandwidth histories of all relays in the given -- time frame. @@ -263,14 +269,16 @@ CREATE VIEW stats_bandwidth AS (SELECT date, isexit, isguard, read / 86400 AS bwread, written / 86400 AS bwwrite, - NULL AS dirread, NULL AS dirwrite + NULL AS dirread, NULL AS dirwrite, NULL AS dirauthread, NULL AS dirauthwrite FROM bwhist_flags WHERE date < current_date - 2) UNION ALL (SELECT date, NULL AS isexit, NULL AS isguard, NULL AS bwread, NULL AS bwwrite, FLOOR(CAST(dr AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirread, - FLOOR(CAST(dw AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirwrite + FLOOR(CAST(dw AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirwrite, + FLOOR(CAST(dar AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirauthread, + FLOOR(CAST(daw AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirauthwrite FROM user_stats WHERE date < current_date - 2) ORDER BY date, isexit, isguard;

1 0