July 2012 - tor-commits - lists.torproject.org

[onionoo/master] Stop supporting old-style URLs.
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit df282b4ddc4d89d622d41bf55c1b577229f687b3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 17 18:22:50 2012 +0200 Stop supporting old-style URLs. --- src/org/torproject/onionoo/ResourceServlet.java | 71 ++++------------------- web/index.html | 6 +- 2 files changed, 14 insertions(+), 63 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index ba1d434..43c2110 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -160,21 +160,14 @@ public class ResourceServlet extends HttpServlet { uri = uri.substring("/onionoo".length()); } String resourceType = null; - boolean isOldStyleUri = false; - if (uri.startsWith("/summary/")) { + if (uri.startsWith("/summary") && + !uri.startsWith("/summary/")) { resourceType = "summary"; - isOldStyleUri = true; - } else if (uri.startsWith("/details/")) { + } else if (uri.startsWith("/details") && + !uri.startsWith("/details/")) { resourceType = "details"; - isOldStyleUri = true; - } else if (uri.startsWith("/bandwidth/")) { - resourceType = "bandwidth"; - isOldStyleUri = true; - } else if (uri.startsWith("/summary")) { - resourceType = "summary"; - } else if (uri.startsWith("/details")) { - resourceType = "details"; - } else if (uri.startsWith("/bandwidth")) { + } else if (uri.startsWith("/bandwidth") && + !uri.startsWith("/bandwidth/")) { resourceType = "bandwidth"; } else { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -183,21 +176,11 @@ public class ResourceServlet extends HttpServlet { /* Extract parameters either from the old-style URI or from request * parameters. */ - Map<String, String> parameterMap; - if (isOldStyleUri) { - parameterMap = this.getParameterMapForOldStyleUri(uri, - resourceType); - if (parameterMap == null) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - } else { - parameterMap = new HashMap<String, String>(); - for (Object parameterKey : request.getParameterMap().keySet()) { - String[] parameterValues = - request.getParameterValues((String) parameterKey); - parameterMap.put((String) parameterKey, parameterValues[0]); - } + Map<String, String> parameterMap = new HashMap<String, String>(); + for (Object parameterKey : request.getParameterMap().keySet()) { + String[] parameterValues = + request.getParameterValues((String) parameterKey); + parameterMap.put((String) parameterKey, parameterValues[0]); } /* Make sure that the request doesn't contain any unknown @@ -372,38 +355,6 @@ public class ResourceServlet extends HttpServlet { pw.close(); } - private Map<String, String> getParameterMapForOldStyleUri(String uri, - String resourceType) { - Map<String, String> result = new HashMap<String, String>(); - if (uri.equals("/" + resourceType + "/all")) { - } else if (uri.equals("/" + resourceType + "/running")) { - result.put("running", "true"); - } else if (uri.equals("/" + resourceType + "/relays")) { - result.put("type", "relays"); - } else if (uri.equals("/" + resourceType + "/bridges")) { - result.put("type", "bridges"); - } else if (uri.startsWith("/" + resourceType + "/search/")) { - String[] searchParameters = this.parseSearchParameters( - uri.substring(("/" + resourceType + "/search/").length())); - if (searchParameters == null || searchParameters.length != 1) { - result = null; - } else { - result.put("search", searchParameters[0]); - } - } else if (uri.startsWith("/" + resourceType + "/lookup/")) { - String fingerprintParameter = this.parseFingerprintParameter( - uri.substring(("/" + resourceType + "/lookup/").length())); - if (fingerprintParameter == null) { - result = null; - } else { - result.put("lookup", fingerprintParameter); - } - } else { - result = null; - } - return result; - } - private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ diff --git a/web/index.html b/web/index.html index 5365173..5788bf9 100755 --- a/web/index.html +++ b/web/index.html @@ -91,7 +91,7 @@ document. The method and its parameters determines which relay and/or bridge summaries are included in the response. <font color="red">These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page.</font> </p> <table border="0" cellpadding="4" cellspacing="0" summary=""> @@ -338,7 +338,7 @@ document. The method and its parameters determines which relay and/or bridge details are included in the response. <font color="red">These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page.</font> </p> <table border="0" cellpadding="4" cellspacing="0" summary=""> @@ -500,7 +500,7 @@ The specification of bandwidth history objects is similar to those in the The method and its parameters determines which relay and/or bridge bandwidth documents are included in the response. <font color="red">These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page.</font> </p> <table border="0" cellpadding="4" cellspacing="0" summary="">

1 0

[tor/master] Improve message on spurious SOCKSListenAddress
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:02:55 2012 -0400 Improve message on spurious SOCKSListenAddress --- changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000..0e8662f --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index f5b5c8f..bacb06e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2 Merge: 0b6fb5e 4cac5df Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:03:10 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Improve message on spurious SOCKSListenAddress
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:02:55 2012 -0400 Improve message on spurious SOCKSListenAddress --- changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000..0e8662f --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index f5b5c8f..bacb06e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; }

1 0

[tor/master] Allow TestingTorNetwork when alternate dir and bridge authorities are set.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 21c6c8485367ce66ab0791c153177c17bccd25c5 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jul 11 11:53:07 2012 +0200 Allow TestingTorNetwork when alternate dir and bridge authorities are set. Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not. --- changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6377 b/changes/bug6377 new file mode 100644 index 0000000..a3a3672 --- /dev/null +++ b/changes/bug6377 @@ -0,0 +1,4 @@ + o Testing: + - Make it possible to set the TestingTorNetwork configuration + option using AlternateDirAuthority and AlternateBridgeAuthority + as an alternative to setting DirServer. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..f5b5c8f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options, }); } - if (options->TestingTorNetwork && !options->DirServers) { + if (options->TestingTorNetwork && + !(options->DirServers || + (options->AlternateDirAuthority && + options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServers."); + "a non-default set of DirServer or both of AlternateDirAuthority " + "and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirServers) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 0b6fb5ebcdccd7267e60caf5418b31977c41f12c Merge: 7ac8a4a 21c6c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 09:50:18 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Allow TestingTorNetwork when alternate dir and bridge authorities are set.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 21c6c8485367ce66ab0791c153177c17bccd25c5 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jul 11 11:53:07 2012 +0200 Allow TestingTorNetwork when alternate dir and bridge authorities are set. Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not. --- changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6377 b/changes/bug6377 new file mode 100644 index 0000000..a3a3672 --- /dev/null +++ b/changes/bug6377 @@ -0,0 +1,4 @@ + o Testing: + - Make it possible to set the TestingTorNetwork configuration + option using AlternateDirAuthority and AlternateBridgeAuthority + as an alternative to setting DirServer. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..f5b5c8f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options, }); } - if (options->TestingTorNetwork && !options->DirServers) { + if (options->TestingTorNetwork && + !(options->DirServers || + (options->AlternateDirAuthority && + options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServers."); + "a non-default set of DirServer or both of AlternateDirAuthority " + "and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirServers) {

1 0

[metrics-tasks/master] Plot 'degree of anonymity' instead of entropy.
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit e54b4278361184bf6ff90f189898668160474f2f Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 16 20:13:52 2012 +0200 Plot 'degree of anonymity' instead of entropy. 'Degree of anonymity' should give a more intuitive view of the situation. For more information, see section 3 of 'Towards measuring anonymity' by C. Diaz, S. Stefaan, J. Claessens and B. Preneel. --- task-6232/plot-entropy.R | 2 +- task-6232/pyentropy.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 95dbdcc..87035b9 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -10,7 +10,7 @@ d <- melt(d, "date") ggplot(d, aes(x = date, y = value, colour = variable)) + geom_line() + scale_x_date(name = "\nDate") + -scale_y_continuous(name = "Entropy\n") + +scale_y_continuous(name = "Degree of Anonymity\n") + scale_colour_hue(name = "Relays", breaks = c("all", "exit", "guard", "country"), labels = c("All relays", "All exits", "All guards", "All countries")) diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index b064339..abb716a 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -57,13 +57,16 @@ def run(file_name): router.add(key, values) totalBW, totalExitBW, totalGuardBW = 0, 0, 0 + guards_n, exits_n = 0, 0 bw_countries = {} for router in routers: totalBW += router.bandwidth if router.is_guard: totalGuardBW += router.bandwidth + guards_n += 1 if router.is_exit: totalExitBW += router.bandwidth + exits_n += 1 if bw_countries.has_key(router.country): bw_countries[router.country] += router.bandwidth else: @@ -90,8 +93,18 @@ def run(file_name): p = float(bw_countries[country]) / float(totalBW) if p != 0: entropy_country += -(p * math.log(p, 2)) - - return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard), str(entropy_country)]) + + # Entropy of uniform distribution of 'n' possible values: log(n) + max_entropy = math.log(len(routers), 2) + max_entropy_guard = math.log(guards_n, 2) + max_entropy_exit = math.log(exits_n, 2) + max_entropy_country = math.log(len(bw_countries), 2) + + return ",".join([valid_after, + str(entropy/max_entropy), + str(entropy_exit/max_entropy_exit), + str(entropy_guard/max_entropy_guard), + str(entropy_country/max_entropy_country)]) def usage(): print "Usage - python pyentropy.py <consensus-dir> <output-file>"

1 0

[metrics-tasks/master] Merge remote-tracking branch 'asn/bug6232'
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit be16bde71a5b2e1e054bcf2e31cb2778be424541 Merge: 40eab19 e54b427 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 17 15:24:17 2012 +0200 Merge remote-tracking branch 'asn/bug6232' task-6232/plot-entropy.R | 2 +- task-6232/pyentropy.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

[flashproxy/master] Reset the line-height for the debug output.
by dcf＠torproject.org 17 Jul '12

17 Jul '12

commit 295f9d93d7c3af12c4ea343af2c14e78b56a46a5 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 17 05:44:33 2012 -0700 Reset the line-height for the debug output. I set the line-height to 0 for dimly remembered badge formatting reasons, but this was also taking effect in the textual terminal output, causing output lines to write atop one another. This was noticed by Joseph Hall. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index 678ba01..95821ce 100644 --- a/embed.html +++ b/embed.html @@ -71,6 +71,7 @@ body { overflow: auto; color: #4c4; background-color: #021; + line-height: inherit; } </style> </head>

1 0