May 2011 - tor-commits - lists.torproject.org

[tor/release-0.2.2] remove some (confusing) dead code
by arma＠torproject.org 21 May '11

21 May '11

commit 0e8949a8fae721e856eebbb4fe401484e3acf45f Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:12:37 2011 -0400 remove some (confusing) dead code --- src/or/router.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 49a986d..0beb960 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -85,7 +85,6 @@ set_onion_key(crypto_pk_env_t *k) tor_mutex_acquire(key_lock); crypto_free_pk_env(onionkey); onionkey = k; - onionkey_set_at = time(NULL); tor_mutex_release(key_lock); mark_my_descriptor_dirty("set onion key"); }

1 0

[tor/maint-0.2.2] remove some (confusing) dead code
by arma＠torproject.org 21 May '11

21 May '11

commit 0e8949a8fae721e856eebbb4fe401484e3acf45f Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:12:37 2011 -0400 remove some (confusing) dead code --- src/or/router.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 49a986d..0beb960 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -85,7 +85,6 @@ set_onion_key(crypto_pk_env_t *k) tor_mutex_acquire(key_lock); crypto_free_pk_env(onionkey); onionkey = k; - onionkey_set_at = time(NULL); tor_mutex_release(key_lock); mark_my_descriptor_dirty("set onion key"); }

1 0

[tor/maint-0.2.2] Don't recreate descriptor on sighup
by arma＠torproject.org 21 May '11

21 May '11

commit 3ff7925a7027b81cb9f14b0863972b4d4e5b46a4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat May 21 19:10:11 2011 +0200 Don't recreate descriptor on sighup We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix. --- changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug1810 b/changes/bug1810 new file mode 100644 index 0000000..11e561f --- /dev/null +++ b/changes/bug1810 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Don't decide to make a new descriptor when receiving a HUP signal. + This bug has caused a lot of relays to disappear from the consensus + periodically. Fixes the most common case of triggering bug 1810; + bugfix on 0.2.2.7-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 68a6b29..36fb991 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->ServerDNSSearchDomains != new_options->ServerDNSSearchDomains || - old_options->SafeLogging != new_options->SafeLogging || + old_options->_SafeLogging != new_options->_SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) ||

1 0

[tor/maint-0.2.2] Merge branch 'bug1810' into maint-0.2.2
by arma＠torproject.org 21 May '11

21 May '11

commit 0235fe34d2c915f46933ead253192b042c713af0 Merge: a2851d3 3ff7925 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:09:55 2011 -0400 Merge branch 'bug1810' into maint-0.2.2 changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[vidalia/alpha] Center the "Connected to the Tor network" message
by chiiph＠torproject.org 21 May '11

21 May '11

commit d0006e5c991740954a04b5f110a72d6dde3481ae Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat May 21 12:50:32 2011 -0300 Center the "Connected to the Tor network" message --- src/vidalia/StatusTab.ui | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/vidalia/StatusTab.ui b/src/vidalia/StatusTab.ui index a89f303..746a54f 100644 --- a/src/vidalia/StatusTab.ui +++ b/src/vidalia/StatusTab.ui @@ -22,20 +22,46 @@ <layout class="QGridLayout" name="gridLayout_4"> <item row="0" column="0"> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> + <item row="0" column="1"> <widget class="QLabel" name="lblTorStatusImg"> <property name="text"> <string notr="true"/> </property> </widget> </item> - <item row="0" column="1"> + <item row="0" column="2"> <widget class="QLabel" name="lblTorStatus"> <property name="text"> <string notr="true">Tor is not running</string> </property> </widget> </item> + <item row="0" column="0"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" > + <size> + <width>40</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="3"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" > + <size> + <width>40</width> + <height>0</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item row="1" column="0">

1 0

[metrics-web/master] Provide Torperf experiment tarballs.
by karsten＠torproject.org 21 May '11

21 May '11

commit 0309d926649563012535b64869871b5bfa90c15e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 21 13:44:50 2011 +0200 Provide Torperf experiment tarballs. Previously, we were listing the .data and .extradata files of the last running Torperf experiment. That's not really helpful for anyone. Now, we provide all .data and .extradata files of a completed experiment as a single tarball. Only the default Torperf runs are still provided as single files, because they are continuously updated. --- .../torproject/ernie/web/ResearchDataServlet.java | 19 ++++++++++++ web/WEB-INF/data.jsp | 31 ++++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index 5186ca8..b863920 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -76,6 +76,8 @@ public class ResearchDataServlet extends HttpServlet { SortedMap<String, Map<String, String[]>> torperfData = new TreeMap<String, Map<String, String[]>>(); SortedMap<Date, String[]> exitLists = new TreeMap<Date, String[]>(); + SortedMap<Date, String[]> torperfExperiments = + new TreeMap<Date, String[]>(); SortedMap<Date, String[]> bridgePoolAssignments = new TreeMap<Date, String[]>(); @@ -200,6 +202,22 @@ public class ResearchDataServlet extends HttpServlet { } torperfData.get(source).get(filesize)[isExtraData ? 1 : 0] = url; + /* URL contains Torperf experiment tarball. */ + } else if (filename.startsWith("torperf-experiment-20")) { + String yearMonth = filename.substring(filename.indexOf("20")); + yearMonth = yearMonth.substring(0, 7); + Date month = null; + try { + month = monthFormat.parse(yearMonth); + } catch (ParseException e) { + /* Ignore this URL. */ + continue; + } + if (!torperfExperiments.containsKey(month)) { + torperfExperiments.put(month, new String[2]); + } + torperfExperiments.get(month)[0] = url; + /* URL contains exit list. */ } else if (filename.startsWith("exit-list-20")) { String yearMonth = filename.substring(filename.indexOf("20")); @@ -242,6 +260,7 @@ public class ResearchDataServlet extends HttpServlet { request.setAttribute("relayStatistics", relayStatistics); request.setAttribute("torperfData", torperfData); request.setAttribute("exitLists", exitLists); + request.setAttribute("torperfExperiments", torperfExperiments); request.setAttribute("bridgePoolAssignments", bridgePoolAssignments); request.getRequestDispatcher("WEB-INF/data.jsp").forward(request, response); diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index fdd5a69..da4ceb4 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -208,15 +208,10 @@ <a name="performance"></a> <h3>Performance data</h3> <br> - <p>We are measuring the performance of the Tor network by - periodically requesting files of different sizes and recording the - time needed to do so. The main measurements on moria, siv, and - torperf use an unmodified Tor client. The four additional setups - on torperf are configured to pick their guard nodes from sets of - the a) absolute fastest, b) absolute slowest, c) best rated vs. - advertised ratio or d) worst rated vs. advertised ratio nodes. The - ratio mechanisms provide a way to select the nodes that the - bandwidth authorities think stand out in their measurement. The + <p>We are continuously measuring the performance of the Tor + network by periodically requesting files of different sizes and + recording the time needed to do so. These measurements take place + on moria, siv, and torperf and use an unmodified Tor client. The files below contain the output of the torperf application and are updated every hour:</p> <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> @@ -257,6 +252,24 @@ </c:forEach> </table> <br> + <p>We further conducted additional experiments with Torperf in the + past by modifying the guard node selection strategies or circuit + build timeouts. The modified guard node selection strategies are + to pick guard nodes from sets of the a) absolute fastest, b) + absolute slowest, c) best rated vs. advertised ratio or d) worst + rated vs. advertised ratio nodes. The ratio mechanisms provide a + way to select the nodes that the bandwidth authorities think stand + out in their measurement. Experiments are listed by the date when + they ended. Details about the experiment setup are contained in a + README file in the tarballs.</p> + <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> + <c:forEach var="item" items="${torperfExperiments}" > + <fmt:formatDate var="endDate" pattern="MMMM dd, yyyy" + value="${item.key}"/> + <tr><td><a href="${item.value[0]}">${endDate}</a></td></tr> + </c:forEach> + </table> + <br> <a name="exitlist"></a> <h3>Exit lists</h3> <br>

1 0

[tor/maint-0.2.2] what's up with this trailing whitespace
by arma＠torproject.org 21 May '11

21 May '11

commit a2851d303414bbbdff97a02d142275c3e7c71841 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 20 23:30:37 2011 -0400 what's up with this trailing whitespace --- src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 1bb116b..7ffe0a9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2092,7 +2092,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) int save_errno = errno; if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING)) severity = LOG_INFO; - log_fn(severity, LD_FS,"Could not open \"%s\": %s ",filename, + log_fn(severity, LD_FS,"Could not open \"%s\": %s",filename, strerror(errno)); errno = save_errno; return NULL; diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2f86e1f..08bfb98 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1755,7 +1755,7 @@ circuit_handle_first_hop(origin_circuit_t *circ) /* not currently connected in a useful way. */ const char *name = strlen(firsthop->extend_info->nickname) ? firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); - log_info(LD_CIRC, "Next router is %s: %s ", + log_info(LD_CIRC, "Next router is %s: %s", safe_str_client(name), msg?msg:"???"); circ->_base.n_hop = extend_info_dup(firsthop->extend_info);

1 0

[torspec/master] Move xxx-hide-platform.txt into old at Karsten's suggestion
by nickm＠torproject.org 21 May '11

21 May '11

commit 9ab09a08c70dc9eb9feffc4975365998fa51baee Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 20 23:15:27 2011 -0400 Move xxx-hide-platform.txt into old at Karsten's suggestion --- proposals/ideas/old/xxx-hide-platform.txt | 37 +++++++++++++++++++++++++++++ proposals/ideas/xxx-hide-platform.txt | 37 ----------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/proposals/ideas/old/xxx-hide-platform.txt b/proposals/ideas/old/xxx-hide-platform.txt new file mode 100644 index 0000000..ad19fb1 --- /dev/null +++ b/proposals/ideas/old/xxx-hide-platform.txt @@ -0,0 +1,37 @@ +Filename: xxx-hide-platform.txt +Title: Hide Tor Platform Information +Author: Jacob Appelbaum +Created: 24-July-2008 +Status: Draft + + + Hiding Tor Platform Information + +0.0 Introduction + +The current Tor program publishes its specific Tor version and related OS +platform information. This information could be misused by an attacker. + +0.1 Current Implementation + +Currently, the Tor binary sends data that looks like the following: + + Tor 0.2.0.26-rc (r14597) on Darwin Power Macintosh + Tor 0.1.2.19 on Windows XP Service Pack 3 [workstation] {terminal services, + single user} + +1.0 Suggested changes + +It would be useful to allow a user to configure the disclosure of such +information. Such a change would be an option in the torrc file like so: + + HidePlatform Yes + +1.1 Suggested default behavior in the future + +If a user would like to disclose this information, they could configure their +Tor to do so. + + HidePlatform No + + diff --git a/proposals/ideas/xxx-hide-platform.txt b/proposals/ideas/xxx-hide-platform.txt deleted file mode 100644 index ad19fb1..0000000 --- a/proposals/ideas/xxx-hide-platform.txt +++ /dev/null @@ -1,37 +0,0 @@ -Filename: xxx-hide-platform.txt -Title: Hide Tor Platform Information -Author: Jacob Appelbaum -Created: 24-July-2008 -Status: Draft - - - Hiding Tor Platform Information - -0.0 Introduction - -The current Tor program publishes its specific Tor version and related OS -platform information. This information could be misused by an attacker. - -0.1 Current Implementation - -Currently, the Tor binary sends data that looks like the following: - - Tor 0.2.0.26-rc (r14597) on Darwin Power Macintosh - Tor 0.1.2.19 on Windows XP Service Pack 3 [workstation] {terminal services, - single user} - -1.0 Suggested changes - -It would be useful to allow a user to configure the disclosure of such -information. Such a change would be an option in the torrc file like so: - - HidePlatform Yes - -1.1 Suggested default behavior in the future - -If a user would like to disclose this information, they could configure their -Tor to do so. - - HidePlatform No - -

1 0

[arm/master] Support for rendering unicode characters if able
by atagar＠torproject.org 21 May '11

21 May '11

commit f27c4c97a2abd0d89a235969ecee8ce77148ad9b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 20 19:52:11 2011 -0700 Support for rendering unicode characters if able Checks for the multi-byte rendering type and curses wide character support, providing a util for checking if unicode rendering will work and enabling it if so. --- armrc.sample | 3 ++ src/cli/controller.py | 8 +++++- src/util/uiTools.py | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index 9f75ccc..ecfe45a 100644 --- a/armrc.sample +++ b/armrc.sample @@ -19,6 +19,9 @@ queries.useProc true # Renders the interface with color if set and the terminal supports it features.colorInterface true +# Includes unicode characters in the interface. +features.printUnicode true + # Checks the torrc for issues, warning and hilighting problems if true features.torrc.validate true diff --git a/src/cli/controller.py b/src/cli/controller.py index a1ec58a..8222da8 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -4,6 +4,7 @@ user input to the proper panels. """ import time +import locale import curses import threading @@ -18,7 +19,7 @@ import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel -from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools +from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools, uiTools ARM_CONTROLLER = None @@ -459,6 +460,11 @@ def drawTorMonitor(stdscr, startTime): try: curses.curs_set(0) except curses.error: pass + # If using our LANG variable for rendering multi-byte characters lets us + # get unicode support then then use it. + if uiTools.isUnicodeAvailable(): + locale.setlocale(locale.LC_ALL, "") + # logs the initialization time msg = "arm started (initialization took %0.3f seconds)" % (time.time() - startTime) log.log(CONFIG["log.startTime"], msg) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index b3b919a..0ff680e 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -5,6 +5,7 @@ easy method of providing the following interface components: - unit conversion for labels """ +import os import sys import curses @@ -35,8 +36,13 @@ TIME_UNITS = [(86400.0, "d", " day"), (3600.0, "h", " hour"), Ending = enum.Enum("ELLIPSE", "HYPHEN") SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) CONFIG = {"features.colorInterface": True, + "features.printUnicode": True, "log.cursesColorSupport": log.INFO} +# Flag indicating if unicode is supported by curses. If None then this has yet +# to be determined. +IS_UNICODE_SUPPORTED = None + def loadConfig(config): config.update(CONFIG) @@ -87,6 +93,29 @@ def _showGlyphs(stdscr): stdscr.getch() # quit on keyboard input +def isUnicodeAvailable(): + """ + True if curses has wide character support, false otherwise or if it can't be + determined. + """ + + global IS_UNICODE_SUPPORTED + if IS_UNICODE_SUPPORTED == None: + import sysTools + + if CONFIG["features.printUnicode"]: + # Checks if our LANG variable is unicode. This is what will be respected + # when printing multi-byte characters after calling... + # locale.setlocale(locale.LC_ALL, '') + # + # so if the LANG isn't unicode then setting this would be pointless. + + isLangUnicode = "utf-" in os.environ.get("LANG", "").lower() + IS_UNICODE_SUPPORTED = isLangUnicode and _isWideCharactersAvailable() + else: IS_UNICODE_SUPPORTED = False + + return IS_UNICODE_SUPPORTED + def getPrintable(line, keepNewlines = True): """ Provides the line back with non-printable characters stripped. @@ -606,6 +635,48 @@ def _getLabel(units, count, decimal, isLong): return countLabel + longLabel + ("s" if isPlural else "") else: return countLabel + shortLabel +def _isWideCharactersAvailable(): + """ + True if curses has wide character support (which is required to print + unicode). False otherwise. + """ + + try: + # gets the dynamic library used by the interpretor for curses + + import _curses + cursesLib = _curses.__file__ + + # Uses 'ldd' (Linux) or 'otool -L' (Mac) to determine the curses + # library dependencies. + # + # atagar@fenrir:~/Desktop$ ldd /usr/lib/python2.6/lib-dynload/_curses.so + # linux-gate.so.1 => (0x00a51000) + # libncursesw.so.5 => /lib/libncursesw.so.5 (0x00faa000) + # libpthread.so.0 => /lib/tls/i686/cmov/libpthread.so.0 (0x002f1000) + # libc.so.6 => /lib/tls/i686/cmov/libc.so.6 (0x00158000) + # libdl.so.2 => /lib/tls/i686/cmov/libdl.so.2 (0x00398000) + # /lib/ld-linux.so.2 (0x00ca8000) + # + # atagar$ otool -L /System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-dynload/_curses.so + # /System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-dynload/_curses.so: + # /usr/lib/libncurses.5.4.dylib (compatibility version 5.4.0, current version 5.4.0) + # /usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0) + # /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 111.1.6) + + libDependencyLines = None + if sysTools.isAvailable("ldd"): + libDependencyLines = sysTools.call("ldd %s" % cursesLib) + elif sysTools.isAvailable("otool"): + libDependencyLines = sysTools.call("otool -L %s" % cursesLib) + + if libDependencyLines: + for line in libDependencyLines: + if "libncursesw" in line: return True + except: pass + + return False + def _initColors(): """ Initializes color mappings usable by curses. This can only be done after

1 0

[arm/master] fix: Paused accounting info not visible
by atagar＠torproject.org 21 May '11

21 May '11

commit b03b2c90f44fd2b332cba3dd9a7296916d9d5f62 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 20 09:28:17 2011 -0700 fix: Paused accounting info not visible When the interface was paused the pause buffer instance of graph stats lacked accounting information, causing it to be displayed as "Unknown". --- src/cli/graphing/bandwidthStats.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 9be52e8..d378c45 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -76,6 +76,8 @@ class BandwidthStats(graphPanel.GraphStats): def clone(self, newCopy=None): if not newCopy: newCopy = BandwidthStats(self.inputConfig) + newCopy.accountingLastUpdated = self.accountingLastUpdated + newCopy.accountingInfo = self.accountingInfo return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType):

1 0