tor-commits August 2012

tor-commits@lists.torproject.org

19 participants
901 discussions

[tor/maint-0.2.3] Avoid possible segfault when handling networkstatus vote with bad flavor
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 57e35ad3d91724882c345ac709666a551a977f0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 10:53:00 2012 -0400 Avoid possible segfault when handling networkstatus vote with bad flavor Fix for 6530; fix on 0.2.2.6-alpha. --- changes/bug6530 | 4 ++++ src/or/routerparse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug6530 b/changes/bug6530 new file mode 100644 index 0000000..a6b7caa --- /dev/null +++ b/changes/bug6530 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid a read of uninitializd RAM when reading a vote or consensus + document with an unrecognized flavor name. Fixes bug 6530; bugfix on + 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 8c4f582..2ff546b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2821,7 +2821,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, int flavor = networkstatus_parse_flavor_name(tok->args[1]); if (flavor < 0) { log_warn(LD_DIR, "Can't parse document with unknown flavor %s", - escaped(tok->args[2])); + escaped(tok->args[1])); goto err; } ns->flavor = flav = flavor;

1 0

[tor/maint-0.2.3] Clarify security impact of bug 6530
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 55f635745afacefffdaafc72cc176ca7ab817546 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 11:16:13 2012 -0400 Clarify security impact of bug 6530 --- changes/bug6530 | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug6530 b/changes/bug6530 index a6b7caa..825bbb7 100644 --- a/changes/bug6530 +++ b/changes/bug6530 @@ -1,4 +1,5 @@ - o Major bugfixes: + o Major security fixes: - Avoid a read of uninitializd RAM when reading a vote or consensus - document with an unrecognized flavor name. Fixes bug 6530; bugfix on - 0.2.2.6-alpha. + document with an unrecognized flavor name. This could lead to a + remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha. +

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 1040afb2425a8056dc41b35e6d825fc329663ee6 Merge: 122c8ef 55f6357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 11:18:40 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug6530 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Avoid possible segfault when handling networkstatus vote with bad flavor
by nickm＠torproject.org 03 Aug '12

03 Aug '12

1 0

[tor/maint-0.2.2] Clarify security impact of bug 6530
by nickm＠torproject.org 03 Aug '12

03 Aug '12

1 0

[tor/master] Updated docs for new connections.
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit b50eb14bbf4da25ef43efe91851b239a04383c8e Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Thu Aug 2 16:15:23 2012 -0400 Updated docs for new connections. --- src/or/connection.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 2520c54..a1d5354 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -239,7 +239,16 @@ dir_connection_new(int socket_family) } /** Allocate and return a new or_connection_t, initialized as by - * connection_init(). */ + * connection_init(). + * + * Set timestamp_last_added_nonpadding to now. + * + * Assign a pseudorandom next_circ_id between 0 and 2**15. + * + * Initialize active_circuit_pqueue. + * + * Set active_circuit_pqueue_last_recalibrated to current cell_ewma tick. + */ or_connection_t * or_connection_new(int socket_family) { @@ -257,7 +266,10 @@ or_connection_new(int socket_family) } /** Allocate and return a new entry_connection_t, initialized as by - * connection_init(). */ + * connection_init(). + * + * Allocate space to store the socks_request. + */ entry_connection_t * entry_connection_new(int type, int socket_family) { @@ -339,14 +351,11 @@ connection_new(int type, int socket_family) /** Initializes conn. (you must call connection_add() to link it into the main * array). * + * Set conn-\>magic to the correct value. + * * Set conn-\>type to <b>type</b>. Set conn-\>s and conn-\>conn_array_index to * -1 to signify they are not yet assigned. * - * If conn is not a listener type, allocate buffers for it. If it's - * an AP type, allocate space to store the socks_request. - * - * Assign a pseudorandom next_circ_id between 0 and 2**15. - * * Initialize conn's timestamps to now. */ static void

1 0

[metrics-web/master] Put #6498 graphs on a new page on the metrics website.
by karsten＠torproject.org 03 Aug '12

03 Aug '12

commit f0c1411185567bc8bbae9db7fefc75930df6979a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 3 15:28:04 2012 +0200 Put #6498 graphs on a new page on the metrics website. Requires running metrics-tasks.git/task-6498 locally. --- etc/web.xml | 12 ++++ rserve/graphs.R | 59 ++++++++++++++++++++ .../ernie/web/GraphsSubpagesServlet.java | 2 + src/org/torproject/ernie/web/RObjectGenerator.java | 3 + web/WEB-INF/banner.jsp | 4 + 5 files changed, 80 insertions(+), 0 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index cc9c3d5..1425d2b 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -40,6 +40,10 @@ </servlet-mapping> <servlet-mapping> <servlet-name>GraphsSubpages</servlet-name> + <url-pattern>/fast-exits.html</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GraphsSubpages</servlet-name> <url-pattern>/users.html</url-pattern> </servlet-mapping> <servlet-mapping> @@ -217,6 +221,14 @@ <servlet-name>GraphImage</servlet-name> <url-pattern>/connbidirect.png</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>GraphImage</servlet-name> + <url-pattern>/fast-exits.png</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GraphImage</servlet-name> + <url-pattern>/almost-fast-exits.png</url-pattern> + </servlet-mapping> <servlet> <servlet-name>Csv</servlet-name> diff --git a/rserve/graphs.R b/rserve/graphs.R index fac88a7..a441d86 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -957,3 +957,62 @@ plot_connbidirect <- function(start, end, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } +plot_fast_exits <- function(start, end, path, dpi) { + r <- read.csv(paste("/srv/metrics.torproject.org/task-6498-graphs/", + "task-6498/task-6498-results.csv", sep = ""), + stringsAsFactors = FALSE) + r <- r[r$valid_after >= paste(start, "00:00:00") & + r$valid_after <= paste(end, "23:59:59") & + r$valid_after < paste(Sys.Date() - 1, "23:59:59"), ] + r <- r[r$min_rate == 11875 & r$ports == "80-443-554-1755" & + r$min_advbw == 5000, ] + r <- aggregate(list(relays = r$relays, P_exit = 100 * r$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(r$valid_after), "day"))), + FUN = median) + r <- melt(r, id.vars = c("date")) + r <- data.frame(r, type = ifelse(r$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) + ggplot(r, aes(x = date, y = value)) + + geom_line(colour = "purple", size = 0.75) + + facet_grid(type ~ ., scales = "free_y") + + scale_x_date(name = "") + + scale_y_continuous(name = "") + + scale_colour_manual(values = c("purple", "orange")) + + opts(title = paste("Fast exits (95+ Mbit/s configured bandwidth", + "rate,\n5000+ KB/s advertised bandwidth capacity,\n", + "exit to ports 80, 443, 554, and 1755,\n", + "at most 2 relays per /24 network)\n", sep = "")) + ggsave(filename = path, width = 8, height = 6, dpi = as.numeric(dpi)) +} + +plot_almost_fast_exits <- function(start, end, path, dpi) { + t <- read.csv(paste("/srv/metrics.torproject.org/task-6498-graphs/", + "task-6498/task-6498-results.csv", sep = ""), + stringsAsFactors = FALSE) + t <- t[t$valid_after >= paste(start, "00:00:00") & + t$valid_after <= paste(end, "23:59:59") & + t$valid_after < paste(Sys.Date() - 1, "23:59:59"), ] + t1 <- t[t$min_rate == 11875 & t$ports == "80-443-554-1755" & + t$min_advbw == 5000, ] + t2 <- t[t$min_rate == 10000 & t$ports == "80-443" & + t$min_advbw == 2000, ] + t <- rbind( + data.frame(t1, var = "95+ Mbit/s, 5000+ KB/s, 80/443/554/1755"), + data.frame(t2, var = "80+ Mbit/s, 2000+ KB/s, 80/443")) + t <- aggregate(list(relays = t$relays, P_exit = 100 * t$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(t$valid_after), "day")), + var = t$var), FUN = median) + t <- melt(t, id.vars = c("date", "var")) + t <- data.frame(t, type = ifelse(t$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) + ggplot(t, aes(x = date, y = value, colour = var)) + + geom_line(size = 0.75) + + facet_grid(type ~ ., scales = "free_y") + + scale_x_date(name = "") + + scale_y_continuous(name = "") + + scale_colour_manual(name = "", values = c("purple", "orange")) + + opts(title = "Relays almost meeting the fast-exit requirements", + legend.position = "top") + ggsave(filename = path, width = 8, height = 6, dpi = as.numeric(dpi)) +} + diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index d557ce5..b7172f2 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -39,6 +39,8 @@ public class GraphsSubpagesServlet extends HttpServlet { this.availableGraphsSubpages = new HashMap<String, String>(); this.availableGraphsSubpages.put("network.html", "WEB-INF/network.jsp"); + this.availableGraphsSubpages.put("fast-exits.html", + "WEB-INF/fast-exits.jsp"); this.availableGraphsSubpages.put("users.html", "WEB-INF/users.jsp"); this.availableGraphsSubpages.put("packages.html", "WEB-INF/packages.jsp"); diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index aea9389..3a856c6 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -101,6 +101,9 @@ public class RObjectGenerator implements ServletContextListener { this.availableGraphs.put("torperf-failures", "start,end,source,filesize,filename,dpi"); this.availableGraphs.put("connbidirect", "start,end,filename,dpi"); + this.availableGraphs.put("fast-exits", "start,end,filename,dpi"); + this.availableGraphs.put("almost-fast-exits", + "start,end,filename,dpi"); GraphParameterChecker.getInstance().setAvailableGraphs( availableGraphs); diff --git a/web/WEB-INF/banner.jsp b/web/WEB-INF/banner.jsp index 38ed77f..21d6bfb 100644 --- a/web/WEB-INF/banner.jsp +++ b/web/WEB-INF/banner.jsp @@ -16,6 +16,7 @@ %>class="current"<%} else {%>href="/status.html"<%}%>>Status</a> <%if (currentPage.endsWith("graphs.jsp") || currentPage.endsWith("network.jsp") || + currentPage.endsWith("fast-exits.jsp") || currentPage.endsWith("users.jsp") || currentPage.endsWith("performance.jsp")) { %><br> @@ -23,6 +24,9 @@ <a <%if (currentPage.endsWith("network.jsp")){ %>class="current"<%} else {%>href="/network.html"<%} %>>Network</a> + <a <%if (currentPage.endsWith("fast-exits.jsp")){ + %>class="current"<%} else {%>href="/fast-exits.html"<%} + %>>Fast Exits</a> <a <%if (currentPage.endsWith("users.jsp")) { %>class="current"<%} else {%>href="/users.html"<%} %>>Users</a>

1 0

[metrics-tasks/master] Tweak #6498 graphing code for running in a cronjob.
by karsten＠torproject.org 03 Aug '12

03 Aug '12

commit a79786a17f7ec1626322e87b165c0e71e782391c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 3 14:19:07 2012 +0200 Tweak #6498 graphing code for running in a cronjob. --- task-6498/src/Main.java | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/task-6498/src/Main.java b/task-6498/src/Main.java index 2a59a13..99e991b 100644 --- a/task-6498/src/Main.java +++ b/task-6498/src/Main.java @@ -32,8 +32,6 @@ public class Main { /* Parse server descriptors in in/server-descriptors/, not keeping a * parse history, and memorize bandwidth rate, burst, and observed * bandwidth for every server descriptor. */ - System.out.print(new Date() + ": Parsing server descriptors"); - int parsedServerDescriptors = 0; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); descriptorReader.addDirectory(new File("in/server-descriptors")); @@ -46,10 +44,6 @@ public class Main { if (!(descriptor instanceof ServerDescriptor)) { continue; } - if (++parsedServerDescriptors >= 1000) { - System.out.print("."); - parsedServerDescriptors = 0; - } ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; String digest = serverDescriptor.getServerDescriptorDigest(); int[] bandwidths = new int[] { @@ -61,15 +55,17 @@ public class Main { } /* Parse consensuses in in/consensuses/, keeping a parse history. */ - System.out.print("\n" + new Date() + ": Parsing consensuses"); descriptorReader = DescriptorSourceFactory.createDescriptorReader(); descriptorReader.addDirectory(new File("in/consensuses")); - /* TODO When running this program in a cronjob, add a history file - * using descriptorReader.setExcludeFiles() and set the file writer - * below to append mode instead of overwrite mode. */ + descriptorReader.setExcludeFiles(new File("parsed-consensuses")); descriptorFiles = descriptorReader.readDescriptors(); - BufferedWriter bw = new BufferedWriter(new FileWriter("results.csv")); - bw.write("valid_after,min_rate,min_advbw,ports,relays,exit_prob\n"); + File resultsFile = new File("task-6498-results.csv"); + boolean writeHeader = !resultsFile.exists(); + BufferedWriter bw = new BufferedWriter(new FileWriter(resultsFile, + true)); + if (writeHeader) { + bw.write("valid_after,min_rate,min_advbw,ports,relays,exit_prob\n"); + } while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next(); for (Descriptor descriptor : descriptorFile.getDescriptors()) { @@ -83,7 +79,6 @@ public class Main { dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String validAfter = dateTimeFormat.format( consensus.getValidAfterMillis()); - System.out.print("."); SortedMap<String, Integer> bandwidthWeights = consensus.getBandwidthWeights(); if (bandwidthWeights == null) { @@ -273,7 +268,6 @@ public class Main { } } bw.close(); - System.out.println("\n" + new Date() + ": Terminating."); } }

1 0

[metrics-web/master] The order is SELECT-FROM-WHERE...
by karsten＠torproject.org 03 Aug '12

03 Aug '12

commit 1bf662cbf57dc65e5730f9bbf1624141babdf4ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 3 14:49:43 2012 +0200 The order is SELECT-FROM-WHERE... --- rserve/csv.R | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rserve/csv.R b/rserve/csv.R index 57f728d..280d7b6 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -284,8 +284,8 @@ export_connbidirect <- function(path) { con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT DATE(statsend) AS date, source, belownum AS below,", "readnum AS read, writenum AS write, bothnum AS \"both\"", - "WHERE DATE(statsend) < current_date - 1", - "FROM connbidirect ORDER BY 1, 2") + "FROM connbidirect WHERE DATE(statsend) < current_date - 1", + "ORDER BY 1, 2") rs <- dbSendQuery(con, q) c <- fetch(rs, n = -1) dbDisconnect(con)

1 0

[metrics-tasks/master] Select family by fingerprint or nickname (for named relays) (#6329)
by karsten＠torproject.org 03 Aug '12

03 Aug '12

commit 1a40e101d09223e09132f3eea5c20074318b69ce Author: Michael Zeltner <m(a)niij.org> Date: Sat Jul 28 21:19:02 2012 +0200 Select family by fingerprint or nickname (for named relays) (#6329) --- task-6329/tor-relays-stats.py | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 1e4159e..b6dd24c 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -12,6 +12,7 @@ import sys import os.path from optparse import OptionParser, OptionGroup import urllib +import re class RelayStats(object): def __init__(self): @@ -23,13 +24,40 @@ class RelayStats(object): self._data = json.load(file('details.json')) return self._data - def get_relays(self, countries=[], as_sets=[], exits_only=False, guards_only=False, inactive=False, fast_exits_only=False): + def get_relays(self, countries=[], as_sets=[], exits_only=False, guards_only=False, inactive=False, fast_exits_only=False, family=None): relays = [] + family_fingerprint = None + family_nickname = None + family_relays = [] if countries: countries = [x.lower() for x in countries] if as_sets: as_sets = [x if not x.isdigit() else "AS" + x for x in as_sets] + if family: + fingerprint = family if len(family) == 40 else None + nickname = family if len(family) < 20 else None + found_relay = None + for relay in self.data['relays']: + if fingerprint and relay['fingerprint'] == fingerprint: + found_relay = relay + break + if nickname and 'Named' in relay['flags'] and relay['nickname'] == nickname: + found_relay = relay + break + if found_relay: + family_fingerprint = '$%s' % found_relay.get('fingerprint') + family_nickname = found_relay['nickname'] if 'Named' in found_relay['flags'] else None + family_relays = found_relay.get('family', []) + family_relays.append(family_fingerprint) for relay in self.data['relays']: + if family: + mentions = relay.get('family', []) + mentions.append('%s' % relay['fingerprint']) + if ('$%s' % relay['fingerprint'] not in family_relays and \ + relay['nickname'] not in family_relays if 'Named' in relay['flags'] else '') or \ + (family_fingerprint not in mentions and \ + family_nickname not in mentions): + continue if not inactive and inactive == relay['running']: continue if countries and not relay.get('country', ' ') in countries: @@ -185,6 +213,8 @@ if '__main__' == __name__: help="select only relays from country with code CC", metavar="CC") group.add_option("-e", "--exits-only", action="store_true", help="select only relays suitable for exit position") + group.add_option("-f", "--family", action="store", type="string", metavar="RELAY", + help="select family by fingerprint or nickname (for named relays)") group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") group.add_option("-x", "--fast-exits-only", action="store_true", @@ -208,6 +238,8 @@ if '__main__' == __name__: if len(args) > 0: parser.error("Did not understand positional argument(s), use options instead.") + if options.family and not re.match(r'^[A-F0-9]{40}$', options.family) and not re.match(r'^[A-Za-z0-9]{1,19}$', options.family): + parser.error("Not a valid fingerprint or nickname: %s" % options.family) if options.download: download_details_file() print "Downloaded details.json. Re-run without --download option." @@ -222,7 +254,8 @@ if '__main__' == __name__: exits_only=options.exits_only, guards_only=options.guards_only, inactive=options.inactive, - fast_exits_only=options.fast_exits_only) + fast_exits_only=options.fast_exits_only, + family=options.family) grouped_relays = stats.group_relays(relays, by_country=options.by_country, by_as_number=options.by_as)

1 0

← Newer
1
...
78
79
80
81
82
83
84
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2012