- tor-commits - lists.torproject.org

r25066: {} add infield label to the right directory. (website/trunk/js)
by Andrew Lewman 13 Sep '11

13 Sep '11

Author: phobos Date: 2011-09-13 19:28:18 +0000 (Tue, 13 Sep 2011) New Revision: 25066 Added: website/trunk/js/jquery.infieldlabel.min.js Log: add infield label to the right directory. Added: website/trunk/js/jquery.infieldlabel.min.js =================================================================== --- website/trunk/js/jquery.infieldlabel.min.js (rev 0) +++ website/trunk/js/jquery.infieldlabel.min.js 2011-09-13 19:28:18 UTC (rev 25066) @@ -0,0 +1,12 @@ +/* + * In-Field Label jQuery Plugin + * http://fuelyourcoding.com/scripts/infield.html + * + * Copyright (c) 2009 Doug Neiner + * Dual licensed under the MIT and GPL licenses. + * Uses the same license as jQuery, see: + * http://docs.jquery.com/License + * + * @version 0.1 + */ +(function($){$.InFieldLabels=function(b,c,d){var f=this;f.$label=$(b);f.label=b;f.$field=$(c);f.field=c;f.$label.data("InFieldLabels",f);f.showing=true;f.init=function(){f.options=$.extend({},$.InFieldLabels.defaultOptions,d);if(f.$field.val()!=""){f.$label.hide();f.showing=false};f.$field.focus(function(){f.fadeOnFocus()}).blur(function(){f.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){f.hideOnChange(e)}).change(function(e){f.checkForEmpty()}).bind('onPropertyChange',function(){f.checkForEmpty()})};f.fadeOnFocus=function(){if(f.showing){f.setOpacity(f.options.fadeOpacity)}};f.setOpacity=function(a){f.$label.stop().animate({opacity:a},f.options.fadeDuration);f.showing=(a>0.0)};f.checkForEmpty=function(a){if(f.$field.val()==""){f.prepForShow();f.setOpacity(a?1.0:f.options.fadeOpacity)}else{f.setOpacity(0.0)}};f.prepForShow=function(e){if(!f.showing){f.$label.css({opacity:0.0}).show();f.$field.bind('keydown.infieldlabel',function(e){f.hideOnChange(e)})}};f.hide OnChange=function(e){if((e.keyCode==16)||(e.keyCode==9))return;if(f.showing){f.$label.hide();f.showing=false};f.$field.unbind('keydown.infieldlabel')};f.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.0,fadeDuration:300};$.fn.inFieldLabels=function(c){return this.each(function(){var a=$(this).attr('for');if(!a)return;var b=$("input#"+a+"[type='text'],"+"input#"+a+"[type='password'],"+"textarea#"+a);if(b.length==0)return;(new $.InFieldLabels(this,b[0],c))})}})(jQuery); \ No newline at end of file Property changes on: website/trunk/js/jquery.infieldlabel.min.js ___________________________________________________________________ Added: svn:mime-type + text/javascript

1 0

[arm/master] fix: readline buggy with a color prompt
by atagar＠torproject.org 13 Sep '11

13 Sep '11

commit e27909a69220557611c0cb8a8e98889fe64433c2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 13 08:42:56 2011 -0700 fix: readline buggy with a color prompt When providing a color prompt and history completion via the readline module the prompt can be screwed up by cycling to a command longer than the non-displayed length of the prompt string. Unfortunatley I'm not finding a workaround so removing formatting from the prompt. For more information see: http://bugs.python.org/issue12972 --- src/util/torInterpretor.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d6f9340..fc217f3 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -492,7 +492,12 @@ class ControlInterpretor: return (inputLines, outputLines) def prompt(): - prompt = format(">>> ", Color.GREEN, Attr.BOLD) + # Cycling history via the readline module with up/down is buggy with a color + # prompt. For more information see: + # http://bugs.python.org/issue12972 + #prompt = format(">>> ", Color.GREEN, Attr.BOLD) + + prompt = ">>> " input = "" # sets up tab autocompetion

1 0

[arm/master] Adding back the color prompt, with padded prompt
by atagar＠torproject.org 13 Sep '11

13 Sep '11

commit 0fb7dd674c9969d55c21fca9040f7f7bcfd09950 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 13 08:58:29 2011 -0700 Adding back the color prompt, with padded prompt This is a hack to maintain a color prompt while sidestepping the 'http://bugs.python.org/issue12972' bug in *most* use cases. This pads the prompt so the original issue doesn't manifest unless the user's input exceeds around sixty characters or so. However, it introduces a new bug where tiny terminals (smaller than the padded width) get screwed up. This obviously isn't a great situation and it could be argued that a colored prompt isn't worth these issues. However, the problem use cases strike me as being fairly rare (and I much prefer the green and bolded '>>>') so going with this for now. Patches welcome if someone has a better solution. --- src/util/torInterpretor.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index fc217f3..2c4e7fa 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -495,9 +495,18 @@ def prompt(): # Cycling history via the readline module with up/down is buggy with a color # prompt. For more information see: # http://bugs.python.org/issue12972 - #prompt = format(">>> ", Color.GREEN, Attr.BOLD) + # + # To work around this while keeping a color prompt I'm padding the prompt + # with extra reset encodings so its length is non-rendered higher (around + # sixty characters). There's two ways that this can go wrong... + # - if the user uses up/down to display input longer than this non-rendered + # length then the original bug will manifest (screwed up prompt) + # - if the terminal's width is smaller than the non-rendered prompt length + # then the cursor and some movement will be displaced + + prompt = format(">>> ", Color.GREEN, Attr.BOLD) + prompt += "\x1b[0m" * 10 - prompt = ">>> " input = "" # sets up tab autocompetion

1 0

[arm/master] Source flags for color prompt and hostname lookups
by atagar＠torproject.org 13 Sep '11

13 Sep '11

commit 6e88a85a7a8c45d798e8471e9ce27295aa0b122e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 13 09:34:30 2011 -0700 Source flags for color prompt and hostname lookups Adding source flags for portions of the interpretor that include substantial tradeoffs. For color prompts there's bugs in small displays/huge input, and hostname lookups add a second or two to the runtime of /info queries (otherwise the lookup is instantanious). Defaulting the hostname lookups to be disabled for now. There's plans for having cached results with... https://trac.torproject.org/projects/tor/wiki/doc/arm#CircuitDetails though I haven't a clue if it'll ever be implemented. --- src/util/torInterpretor.py | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 2c4e7fa..fbb33da 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -11,6 +11,9 @@ import version from util import connections, enum, hostnames, torTools +COLOR_PROMPT = True # provides a colored interpretor prompt +INFO_HOSTNAMES = False # hostname lookups in /info results + INIT_MSG = """Arm %s Control Interpretor Enter \"/help\" for usage information and \"/quit\" to stop. """ % version.VERSION @@ -325,7 +328,11 @@ class ControlInterpretor: if not address or not port: return locale = conn.getInfo("ip-to-country/%s" % address, "??") - hostname = hostnames.resolve(address, 10) + + if INFO_HOSTNAMES: + hostname = hostnames.resolve(address, 10) + else: + hostname = None # TODO: Most of the following is copied from the _getDetailContent method # of cli/connections/connEntry.py - useful bits should be refactored. @@ -370,8 +377,9 @@ class ControlInterpretor: outputEntry.append(("%s (%s)\n" % (nickname, fingerprint), infoAttr)) + hostnameLabel = ", %s" % hostname if hostname else "" outputEntry.append(("address: ", headingAttr)) - outputEntry.append(("%s:%s (%s, %s)\n" % (address, port, locale, hostname), infoAttr)) + outputEntry.append(("%s:%s (%s%s)\n" % (address, port, locale, hostnameLabel), infoAttr)) outputEntry.append(("published: ", headingAttr)) outputEntry.append(("%s %s" % (pubTime, pubDate) + "\n", infoAttr)) @@ -504,8 +512,11 @@ def prompt(): # - if the terminal's width is smaller than the non-rendered prompt length # then the cursor and some movement will be displaced - prompt = format(">>> ", Color.GREEN, Attr.BOLD) - prompt += "\x1b[0m" * 10 + if COLOR_PROMPT: + prompt = format(">>> ", Color.GREEN, Attr.BOLD) + prompt += "\x1b[0m" * 10 + else: + prompt = ">>> " input = ""

1 0

[metrics-web/master] Add directory listing for /csv.
by karsten＠torproject.org 13 Sep '11

13 Sep '11

commit 4f6c4bc456fd2f35588722df161549f903eeafca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 13 17:29:58 2011 +0200 Add directory listing for /csv. See https://metrics.torproject.org/csv/ . --- src/org/torproject/ernie/web/CsvServlet.java | 16 +++++++++++++--- web/WEB-INF/dir.jsp | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 99dc63c..01cdb28 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -18,7 +18,7 @@ public class CsvServlet extends HttpServlet { private RObjectGenerator rObjectGenerator; /* Available CSV files. */ - private Set<String> availableCsvFiles; + private SortedSet<String> availableCsvFiles; private Logger logger; @@ -28,7 +28,7 @@ public class CsvServlet extends HttpServlet { this.logger = Logger.getLogger(CsvServlet.class.toString()); /* Initialize map of available CSV files. */ - this.availableCsvFiles = new HashSet<String>(); + this.availableCsvFiles = new TreeSet<String>(); this.availableCsvFiles.add("bandwidth"); this.availableCsvFiles.add("bridge-users"); this.availableCsvFiles.add("bwhist-flags"); @@ -60,9 +60,19 @@ public class CsvServlet extends HttpServlet { HttpServletResponse response) throws IOException, ServletException { + /* Check if the directory listing was requested. */ + String requestURI = request.getRequestURI(); + if (requestURI.equals("/ernie/csv/")) { + request.setAttribute("directory", "/csv"); + request.setAttribute("extension", ".csv"); + request.setAttribute("files", this.availableCsvFiles); + request.getRequestDispatcher("/WEB-INF/dir.jsp").forward(request, + response); + return; + } + /* Find out which CSV file was requested and make sure we know this * CSV file type. */ - String requestURI = request.getRequestURI(); String requestedCsvFile = requestURI; if (requestedCsvFile.endsWith(".csv")) { requestedCsvFile = requestedCsvFile.substring(0, diff --git a/web/WEB-INF/dir.jsp b/web/WEB-INF/dir.jsp new file mode 100644 index 0000000..1ac1819 --- /dev/null +++ b/web/WEB-INF/dir.jsp @@ -0,0 +1,25 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics Portal: Index of ${directory}</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + <h2>Tor Metrics Portal: Index of ${directory}</h2> + <br> + <c:forEach var="file" items="${files}" > + <a href="${directory}/${file}${extension}">${file}${extension}</a><br> + </c:forEach> + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html>

1 0

[metrics-web/master] Fix an IllegalStateException.
by karsten＠torproject.org 13 Sep '11

13 Sep '11

commit dac09a8ccc2a6a4166c40ccfff89751afc0e7585 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 13 16:36:08 2011 +0200 Fix an IllegalStateException. We're not allowed to forward a request after we started responding to it, here by sending an error code. --- .../torproject/ernie/web/RouterDetailServlet.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/RouterDetailServlet.java b/src/org/torproject/ernie/web/RouterDetailServlet.java index 4a25352..c8c4648 100644 --- a/src/org/torproject/ernie/web/RouterDetailServlet.java +++ b/src/org/torproject/ernie/web/RouterDetailServlet.java @@ -112,6 +112,10 @@ public class RouterDetailServlet extends HttpServlet { /* There were zero results in the set */ /* TODO Handle this case in a more user-friendly way. */ response.sendError(HttpServletResponse.SC_BAD_REQUEST); + this.logger.log(Level.WARNING, "Query with fingerprint = '" + + fingerprintParameter + "' returned zero results. " + + "Returned BAD_REQUEST."); + return; } conn.close();

1 0

[metrics-web/master] Cut off last days in the bandwith graph.
by karsten＠torproject.org 13 Sep '11

13 Sep '11

commit 46009133c21cb7da39ef113d6a3bcdda984b66d9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 13 16:10:30 2011 +0200 Cut off last days in the bandwith graph. --- rserve/graphs.R | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 3c6d72a..7f417a0 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -441,7 +441,8 @@ plot_bandwidth <- function(start, end, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, bwadvertised FROM total_bandwidth ", - "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "' ", + "AND date < (SELECT MAX(date) FROM total_bandwidth) - 1 ", sep = "") rs <- dbSendQuery(con, q) bw_desc <- fetch(rs, n = -1) q <- paste("SELECT date, read, written FROM total_bwhist ",

1 0

[metrics-web/master] Graph GetTor packages by language, not by bundle.
by karsten＠torproject.org 12 Sep '11

12 Sep '11

commit 32bd955ffce9c5ca514fb1cc9a997999d31fed58 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 13 10:33:05 2011 +0200 Graph GetTor packages by language, not by bundle. With the recent renaming of GetTor package names it has become more difficult to decide which packages are a TBB and which are something else. tor-browser-bundle_en is now one out of linux-i386_en, linux-x86_64_en, macosx-i386_en, or windows_en. And in the future there may be a TIMBB and who knows what other packages. Time to give up the guessing game. The language code is something we can identify for certain. Let's graph that. --- rserve/graphs.R | 24 ++++++++++++---- .../ernie/web/GraphParameterChecker.java | 28 ++++++++++---------- web/WEB-INF/packages.jsp | 11 ++++--- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 959fd64..3c6d72a 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -254,6 +254,18 @@ countryname <- function(country) { res } +languagelist <- list( + "en" = "English", + "fa" = "Farsi", + "zh_CN" = "Simplified Chinese") + +languagename <- function(language) { + res <- languagelist[[language]] + if (is.null(res)) + res <- "Gibberish" + res +} + date_breaks <- function(days) { length <- cut(days, c(0, 7, 12, 56, 180, 600, 5000, Inf), labels=FALSE) major <- c("days", "2 days", "weeks", "months", "3 months", "years", @@ -704,11 +716,11 @@ plot_bridge_users <- function(start, end, country, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } -plot_gettor <- function(start, end, bundle, path, dpi) { +plot_gettor <- function(start, end, language, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) - condition <- ifelse(bundle == "all", "<> 'none'", - paste("LIKE 'tor-%browser-bundle_", tolower(bundle), "'", sep = "")) + condition <- ifelse(language == "all", "<> 'none'", + paste("LIKE '%_", tolower(language), "'", sep = "")) q <- paste("SELECT date, SUM(downloads) AS downloads ", "FROM gettor_stats WHERE bundle ", condition, " AND date >= '", start, "' AND date <= '", end, @@ -725,10 +737,10 @@ plot_gettor <- function(start, end, bundle, path, dpi) { downloads <- rbind(downloads, data.frame(date = as.Date(missing, origin = "1970-01-01"), downloads = NA)) - title <- ifelse(bundle == "all", + title <- ifelse(language == "all", "Total packages requested from GetTor per day\n", - paste("Tor Browser Bundles (", bundle, - ") requested from GetTor per day\n", sep = "")) + paste(languagename(language), " (", language, + ") packages requested from GetTor per day\n", sep = "")) date_breaks <- date_breaks( as.numeric(max(as.Date(downloads$date, "%Y-%m-%d")) - min(as.Date(downloads$date, "%Y-%m-%d")))) diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 7349bf9..8189f19 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -53,7 +53,7 @@ public class GraphParameterChecker { "start,end,country,events,filename,dpi"); this.availableGraphs.put("bridge-users", "start,end,country,filename,dpi"); - this.availableGraphs.put("gettor", "start,end,bundle,filename,dpi"); + this.availableGraphs.put("gettor", "start,end,language,filename,dpi"); this.availableGraphs.put("torperf", "start,end,source,filesize,filename,dpi"); this.availableGraphs.put("torperf-failures", @@ -71,7 +71,7 @@ public class GraphParameterChecker { } this.knownParameterValues.put("country", sb.toString()); this.knownParameterValues.put("events", "on,off"); - this.knownParameterValues.put("bundle", "all,en,zh_CN,fa"); + this.knownParameterValues.put("language", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); this.knownParameterValues.put("dpi", "72,150,300"); @@ -218,24 +218,24 @@ public class GraphParameterChecker { recognizedGraphParameters.put("events", eventsParameter); } - /* Parse GetTor bundle if supported by the graph type. Only a single - * bundle can be passed. If no bundle is passed, use "all" as + /* Parse language if supported by the graph type. Only a single + * language can be passed. If no language is passed, use "all" as * default. */ - if (supportedGraphParameters.contains("bundle")) { - String[] bundleParameter = (String[]) requestParameters.get( - "bundle"); + if (supportedGraphParameters.contains("language")) { + String[] languageParameter = (String[]) requestParameters.get( + "language"); List<String> knownBundles = Arrays.asList( - this.knownParameterValues.get("bundle").split(",")); - if (bundleParameter != null) { - if (bundleParameter.length != 1 || - bundleParameter[0].length() == 0 || - !knownBundles.contains(bundleParameter[0])) { + this.knownParameterValues.get("language").split(",")); + if (languageParameter != null) { + if (languageParameter.length != 1 || + languageParameter[0].length() == 0 || + !knownBundles.contains(languageParameter[0])) { return null; } } else { - bundleParameter = new String[] { "all" }; + languageParameter = new String[] { "all" }; } - recognizedGraphParameters.put("bundle", bundleParameter); + recognizedGraphParameters.put("language", languageParameter); } /* Parse torperf data source if supported by the graph type. Only a diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index 9a19aca..9bfee70 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -33,11 +33,12 @@ graph shows the number of packages requested from GetTor per day.</p> <input type="text" name="end" size="10" value="<c:choose><c:when test="${fn:length(gettor_end) == 0}">${default_end_date}</c:when><c:otherwise>${gettor_end[0]}</c:otherwise></c:choose>"> </p><p> - Packages: - <input type="radio" name="bundle" value="all" <c:if test="${fn:length(gettor_bundle) == 0 or gettor_bundle[0] eq 'all'}"> checked</c:if>> Total packages - <input type="radio" name="bundle" value="en" <c:if test="${gettor_bundle[0] eq 'en'}"> checked</c:if>> TBB (en) - <input type="radio" name="bundle" value="zh_CN" <c:if test="${gettor_bundle[0] eq 'zh_CN'}"> checked</c:if>> TBB (zh_CN) - <input type="radio" name="bundle" value="fa" <c:if test="${gettor_bundle[0] eq 'fa'}"> checked</c:if>> TBB (fa) + Language: <select name="language"> + <option value="all"<c:if test="${fn:length(gettor_language) == 0 or gettor_language[0] eq 'all'}"> selected</c:if>>All languages</option> + <option value="en"<c:if test="${gettor_language[0] eq 'en'}"> selected</c:if>>English (en)</option> + <option value="zh_CN"<c:if test="${gettor_language[0] eq 'zh_CN'}"> selected</c:if>>Simplified Chinese (zh_CN)</option> + <option value="fa"<c:if test="${gettor_language[0] eq 'fa'}"> selected</c:if>>Farsi (fa)</option> + </select> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${gettor_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option>

1 0

[arm/master] Util for getting condensed exit policies
by atagar＠torproject.org 12 Sep '11

12 Sep '11

commit 8a40c745ce5f040aef38963b2a047ba2f92ee392 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 19:27:14 2011 -0700 Util for getting condensed exit policies Expanding the ExitPolicy class to provide condensed exit policies like the tor consensus. --- src/util/torTools.py | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 7c14d18..b9d9ac8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2286,6 +2286,21 @@ class Controller(TorCtl.PostEventListener): self.connLock.release() +class ExitPolicyIterator: + """ + Basic iterator for cycling through ExitPolicy entries. + """ + + def __init__(self, head): + self.head = head + + def next(self): + if self.head: + lastHead = self.head + self.head = self.head.nextRule + return lastHead + else: raise StopIteration + class ExitPolicy: """ Single rule from the user's exit policy. These are chained together to form @@ -2301,6 +2316,9 @@ class ExitPolicy: nextRule - next rule to be checked when queries don't match this policy """ + # cached summary string + self.summaryStr = None + # sanitize the input a bit, cleaning up tabs and stripping quotes ruleEntry = ruleEntry.replace("\\t", " ").replace("\"", "") @@ -2405,6 +2423,80 @@ class ExitPolicy: if self.nextRule: return self.nextRule.check(ipAddress, port) else: return True # fell off the chain without a conclusion (shouldn't happen...) + def getSummary(self): + """ + Provides a summary description of the policy chain similar to the + consensus. This excludes entries that don't cover all ips, and is either + a whitelist or blacklist policy based on the final entry. For instance... + accept 80, 443 # just accepts ports 80/443 + reject 1-1024, 5555 # just accepts non-privilaged ports, excluding 5555 + """ + + if not self.summaryStr: + # determines if we're a whitelist or blacklist + isWhitelist = False # default in case we don't have a catch-all policy at the end + + for rule in self: + if rule.isIpWildcard and rule.isPortWildcard: + isWhitelist = not rule.isAccept + break + + # Iterates over the rules and adds the the ports we'll return (ie, allows + # if a whitelist and rejects if a blacklist). Reguardless of a port's + # allow/reject policy, all further entries with that port are ignored since + # policies respect the first matching rule. + + displayPorts, skipPorts = [], [] + + for rule in self: + if not rule.isIpWildcard: continue + + if rule.minPort == rule.maxPort: + portRange = [rule.minPort] + else: + portRange = range(rule.minPort, rule.maxPort + 1) + + for port in portRange: + if port in skipPorts: continue + + # if accept + whitelist or reject + blacklist then add + if rule.isAccept == isWhitelist: + displayPorts.append(port) + + # all further entries with this port are to be ignored + skipPorts.append(port) + + # gets a list of the port ranges + if displayPorts: + displayRanges, tmpRange = [], [] + displayPorts.sort() + displayPorts.append(None) # ending item to include last range in loop + + for port in displayPorts: + if not tmpRange or tmpRange[-1] + 1 == port: + tmpRange.append(port) + else: + if len(tmpRange) > 1: + displayRanges.append("%i-%i" % (tmpRange[0], tmpRange[-1])) + else: + displayRanges.append(str(tmpRange[0])) + + tmpRange = [port] + else: + # everything for the inverse + isWhitelist = not isWhitelist + displayRanges = ["1-65535"] + + # constructs the summary string + labelPrefix = "accept " if isWhitelist else "reject " + + self.summaryStr = (labelPrefix + ", ".join(displayRanges)).strip() + + return self.summaryStr + + def __iter__(self): + return ExitPolicyIterator(self) + def __str__(self): # This provides the actual policy rather than the entry used to construct # it so the 'private' keyword is expanded.

1 0

[arm/master] Replacing displayed consensus policy with util
by atagar＠torproject.org 12 Sep '11

12 Sep '11

commit aa3e3ee7a397edb18595d86dc2652d63053b3584 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 19:44:58 2011 -0700 Replacing displayed consensus policy with util Using the ExitPolicy class' summary rather than the string from the consensus. Unless I'm misunderstanding how the consensus policy is derived, these should be equivilant. However, since this doesn't rely on the policy being in the consensus this will be rendered the same for both new and old versions of tor. --- src/cli/connections/connEntry.py | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 075dfb2..de3fb01 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -711,28 +711,16 @@ class ConnectionLine(entries.ConnectionPanelLine): if len(nsLines) >= 2 and nsLines[1].startswith("s "): flags = nsLines[1][2:] - # The network status exit policy doesn't exist for older tor versions. - # If unavailable we'll need the full exit policy which is on the - # descriptor (if that's available). + exitPolicy = conn.getRelayExitPolicy(fingerprint) - exitPolicy = "unknown" - if len(nsLines) >= 4 and nsLines[3].startswith("p "): - exitPolicy = nsLines[3][2:].replace(",", ", ") - elif descEntry: - # the descriptor has an individual line for each entry in the exit policy - exitPolicyEntries = [] - - for line in descEntry.split("\n"): - if line.startswith("accept") or line.startswith("reject"): - exitPolicyEntries.append(line.strip()) - - exitPolicy = ", ".join(exitPolicyEntries) + if exitPolicy: policyLabel = exitPolicy.getSummary() + else: policyLabel = "unknown" dirPortLabel = "" if dirPort == "0" else "dirport: %s" % dirPort lines[2] = "nickname: %-25s orport: %-10s %s" % (nickname, orPort, dirPortLabel) lines[3] = "published: %s %s" % (pubDate, pubTime) lines[4] = "flags: %s" % flags.replace(" ", ", ") - lines[5] = "exit policy: %s" % exitPolicy + lines[5] = "exit policy: %s" % policyLabel if descEntry: torVersion, platform, contact = "", "", ""

1 0