tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit d44080a09da4cf05c6b2895ef7ac97c65acdd8b8 Merge: 98dd3757b 56857291b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:33:27 2018 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid backport of #25105

1 0

[tor/release-0.3.2] Merge branch 'bug25105_032' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit a877241e6c50cff72503a0179d8e4a9ed6216d57 Merge: 2485f8dea 56857291b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:33:46 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[metrics-web/master] Fix path.
by karsten＠torproject.org 31 Jan '18

31 Jan '18

commit c78da5d11c7c055e6a7264190fca06a3dbb6231a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 31 20:29:56 2018 +0100 Fix path. Related to renaming packages/modules in #24294. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c9005d1..28a6a62 100644 --- a/build.xml +++ b/build.xml @@ -420,7 +420,7 @@ <fileset dir="${modulebase}/onionperf/stats" includes="*.csv" /> <fileset dir="${modulebase}/connbidirect/stats" includes="connbidirect2.csv" /> <fileset dir="${modulebase}/advbwdist/stats" includes="advbwdist.csv" /> - <fileset dir="${modulebase}/legacy/stats" includes="*.csv" /> + <fileset dir="${modulebase}/servers/stats" includes="*.csv" /> <fileset dir="${modulebase}/hidserv/stats" includes="hidserv.csv" /> <fileset dir="${modulebase}/clients/stats" includes="clients*.csv userstats-combined.csv" />

1 0

[metrics-web/master] Avoid sending an error after a (partial) response.
by karsten＠torproject.org 31 Jan '18

31 Jan '18

commit b2f1b3944eb63bd7c3c383e35802a325584e84a8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 9 17:47:15 2018 +0100 Avoid sending an error after a (partial) response. Also take out some unused code. Fixes #24823. --- CHANGELOG.md | 6 +++++ .../metrics/web/ResearchStatsServlet.java | 30 +++++----------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f4adf1..adb518d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version ???? + + * Minor changes + - Avoid sending an error after a (partial) response. + + # Changes in version 1.0.3 - 2017-12-20 * Major changes diff --git a/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java index 415e5b5..4d06241 100644 --- a/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java @@ -56,26 +56,16 @@ public class ResearchStatsServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - String requestUri = request.getRequestURI(); - if (requestUri.equals("/metrics/stats/")) { - this.writeDirectoryListing(request, response); + File statsFile = this.determineStatsFile(request); + if (statsFile == null) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + } else if (!statsFile.exists()) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else { - File statsFile = this.determineStatsFile(request); - if (statsFile == null) { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - return; - } else if (!this.writeStatsFile(statsFile, response)) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } + this.writeStatsFile(statsFile, response); } } - private void writeDirectoryListing(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "/?type=dt&level=ad"); - } - private File determineStatsFile(HttpServletRequest request) { String requestedStatsFile = request.getRequestURI(); if (requestedStatsFile.endsWith(".csv")) { @@ -93,11 +83,8 @@ public class ResearchStatsServlet extends HttpServlet { } } - private boolean writeStatsFile(File statsFile, + private void writeStatsFile(File statsFile, HttpServletResponse response) throws IOException, ServletException { - if (!statsFile.exists()) { - return false; - } response.setContentType("text/csv"); response.setHeader("Content-Length", String.valueOf( statsFile.length())); @@ -112,10 +99,7 @@ public class ResearchStatsServlet extends HttpServlet { while ((length = bis.read(buffer)) > 0) { bos.write(buffer, 0, length); } - } catch (IOException e) { - return false; } - return true; } }

1 0

[tor/maint-0.3.2] ns: Call notify_networkstatus_changed() after the new consensus is set globally
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 3a247ca92a06c864a2cb634fbe2bc23cf48fb977 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 31 11:08:33 2018 -0500 ns: Call notify_networkstatus_changed() after the new consensus is set globally In 0.3.2.1-alpha, we've added this function in order to have a way to notify other subsystems that the consensus just changed. The old consensus and the new one are passed to it. Before this patch, this was done _before_ the new consensus was set globally (thus NOT accessible by getting the latest consensus). The scheduler notification was assuming that it was set and select_scheduler() is looking at the latest consensus to get the parameters it might needs. This was very wrong because at that point it is still the old consensus set globally. With this commit, notify_networkstatus_changed() has been moved _after_ the new consensus is set globally. The main obvious reasons is to fix the bug described above and in #24975. The other reason is that this notify function doesn't return anything which could be allowing the possibility of refusing to set the new consensus on error. In other words, the new consensus is set right after the notification whatever happens. It does no harm or change in behavior to set the new consensus first and then notify the subsystems. The two functions currently used are for the control port using the old and new consensus and sending the diff. The second is the scheduler that needs the new consensus to be set globally before being called. Of course, the function has been documented accordinly to clearly state it is done _after_ the new consensus is set. Fixes #24975 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24975 | 6 ++++++ src/or/networkstatus.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/changes/bug24975 b/changes/bug24975 new file mode 100644 index 000000000..fe937d74d --- /dev/null +++ b/changes/bug24975 @@ -0,0 +1,6 @@ + o Major bugfixes (scheduler, consensus): + - A logic in the code was preventing the scheduler subystem to properly + make a decision based on the latest consensus when it arrives. This lead + to the scheduler failing to notice any consensus parameters that might + change from one consensus to another. Fixes bug 24975; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e0a3e4cdc..4ae114f35 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1564,7 +1564,11 @@ notify_control_networkstatus_changed(const networkstatus_t *old_c, smartlist_free(changed); } -/* Called when the consensus has changed from old_c to new_c. */ +/* Called when the consensus has changed from old_c to new_c. + * + * IMPORTANT: This is called _after_ the new consensus has been set in the + * global state so this is safe for anything getting the latest consensus from + * that state. */ static void notify_networkstatus_changed(const networkstatus_t *old_c, const networkstatus_t *new_c) @@ -1897,9 +1901,6 @@ networkstatus_set_current_consensus(const char *consensus, const int is_usable_flavor = flav == usable_consensus_flavor(); - if (is_usable_flavor) { - notify_networkstatus_changed(networkstatus_get_latest_consensus(), c); - } if (flav == FLAV_NS) { if (current_ns_consensus) { networkstatus_copy_old_consensus_info(c, current_ns_consensus); @@ -1922,6 +1923,13 @@ networkstatus_set_current_consensus(const char *consensus, free_consensus = 0; /* avoid free */ } + /* Called _after_ the consensus is set in its global variable so any + * functions called from this notification can safely get the latest + * consensus being the new one. */ + if (is_usable_flavor) { + notify_networkstatus_changed(networkstatus_get_latest_consensus(), c); + } + waiting = &consensus_waiting_for_certs[flav]; if (waiting->consensus && waiting->consensus->valid_after <= c->valid_after) {

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 0dc1595d0359dbf51ad24fe8bbadb5ab41fb9eb9 Merge: 2294e330b 1c39d969b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 13:47:01 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24975 | 6 ++++++ src/or/networkstatus.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 1c39d969b99b7825a0e2f2db67efb0c0e19d7002 Merge: df312b3cf 3a247ca92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 13:46:58 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 changes/bug24975 | 6 ++++++ src/or/networkstatus.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

1 0

[tor/master] ns: Call notify_networkstatus_changed() after the new consensus is set globally
by nickm＠torproject.org 31 Jan '18

31 Jan '18

1 0

← Newer
1
2
3
4
5
6
7
...
174
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018