- tor-commits - lists.torproject.org

r24534: {arm} Making the etc content greedy, consuming the full space avai (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 21:51:23 +0000 (Sat, 02 Apr 2011) New Revision: 24534 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Making the etc content greedy, consuming the full space available to it to get better column alignment for all listing types. The disadvantage of this is that dynamically sized columns (hostname and nickname) will have less room available to them. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 20:39:38 UTC (rev 24533) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 21:51:23 UTC (rev 24534) @@ -463,7 +463,9 @@ displayLabel = "resolving..." else: displayLabel = "UNKNOWN" - return displayLabel + if len(displayLabel) < width: + return ("%%-%is" % width) % displayLabel + else: return "" # for everything else display connection/consensus information dstAddress = self.getDestinationLabel(26, includeLocale = True) @@ -527,7 +529,7 @@ etc += "%-26s " % dstAddress usedSpace += 28 - return etc + return ("%%-%is" % width) % etc def _getListingContent(self, width, listingType): """ @@ -569,13 +571,13 @@ else: srcAddress = self.local.getIpAddr() + localPort if myType in (Category.SOCKS, Category.CONTROL): - # These categories are reordered later so the it's dst -> src rather - # than src -> dst. They are local connections so the dst lacks locale - # information, so swapping their respective widths to match column - # alignments. + # Like inbound connections these need their source and destination to + # be swapped. However, this only applies when listing by IP or hostname + # (their fingerprint and nickname are both for us). Reversing the + # fields here to keep the same column alignments. - src = "%-26s" % srcAddress - dst = "%-21s" % dstAddress + src = "%-21s" % dstAddress + dst = "%-26s" % srcAddress else: src = "%-21s" % srcAddress # ip:port = max of 21 characters dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters @@ -600,6 +602,8 @@ usedSpace += len(etc) elif listingType == entries.ListingType.HOSTNAME: # 15 characters for source, and a min of 40 reserved for the destination + # TODO: when actually functional the src and dst need to be swapped for + # SOCKS and CONTROL connections src = "localhost%-6s" % localPort usedSpace += len(src) minHostnameSpace = 40 @@ -648,7 +652,7 @@ # pads dst entry to its max space dst = ("%%-%is" % (baseSpace - len(src))) % dst - if myType in (Category.INBOUND, Category.SOCKS, Category.CONTROL): src, dst = dst, src + if myType == Category.INBOUND: src, dst = dst, src padding = " " * (width - usedSpace + LABEL_MIN_PADDING) return LABEL_FORMAT % (src, dst, etc, padding)

1 0

r24533: {arm} Overwriting local connections with our fingerprint so they'r (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 20:39:38 +0000 (Sat, 02 Apr 2011) New Revision: 24533 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Overwriting local connections with our fingerprint so they're identified as our relay. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 19:57:30 UTC (rev 24532) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 20:39:38 UTC (rev 24533) @@ -129,11 +129,11 @@ determined. """ - conn = torTools.getConn() - orPort = self.port if self.isORPort else None - myFingerprint = conn.getRelayFingerprint(self.ipAddr, orPort) + myFingerprint = self.getFingerprint() - if myFingerprint: return conn.getRelayNickname(myFingerprint) + if myFingerprint != "UNKNOWN": + conn = torTools.getConn() + return conn.getRelayNickname(myFingerprint) else: return "UNKNOWN" class ConnectionEntry(entries.ConnectionPanelEntry): @@ -190,6 +190,10 @@ self.startTime = time.time() self.isInitialConnection = False + # overwrite the local fingerprint with ours + conn = torTools.getConn() + self.local.fingerprintOverwrite = conn.getInfo("fingerprint") + # True if the connection has matched the properties of a client/directory # connection every time we've checked. The criteria we check is... # client - first hop in an established circuit @@ -204,7 +208,6 @@ self.appPid = None self.isAppResolving = False - conn = torTools.getConn() myOrPort = conn.getOption("ORPort") myDirPort = conn.getOption("DirPort") mySocksPort = conn.getOption("SocksPort", "9050")

1 0

r24532: {arm} Notes for the descriptor popup. This is a very rarely used p (in arm/trunk/src/interface: . connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 19:57:30 +0000 (Sat, 02 Apr 2011) New Revision: 24532 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/entries.py arm/trunk/src/interface/controller.py Log: Notes for the descriptor popup. This is a very rarely used part of the interface and won't be implemented until 1.4.3. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -325,6 +325,21 @@ detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()]) return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)] + def _getDescriptors(self, width): + """ + Provides raw descriptor information for the relay. + + Arguments: + width - available space to display in + """ + + # TODO: Porting and refactoring the descriptorPopup.py functionality is + # gonna take quite a bit of work. This is a very rarely used feature and + # not worth delaying the 1.4.2 release any further, so this will be a part + # of 1.4.3. + + return [] + def resetDisplay(self): entries.ConnectionPanelLine.resetDisplay(self) self.cachedType = None Modified: arm/trunk/src/interface/connections/entries.py =================================================================== --- arm/trunk/src/interface/connections/entries.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/connections/entries.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -102,6 +102,9 @@ self._detailsCache = None self._detailsCacheArgs = None + + self._descriptorCache = None + self._descriptorCacheArgs = None def getListingEntry(self, width, currentTime, listingType): """ @@ -142,9 +145,28 @@ return self._detailsCache def _getDetails(self, width): - # implementation of getListing + # implementation of getDetails return [] + def getDescriptor(self, width): + """ + Provides a list of DrawEntry instances with descriptor informatoin for + this connection. + + Arguments: + width - available space to display in + """ + + if self._descriptorCacheArgs != width: + self._descriptorCache = self._getDescriptor(width) + self._descriptorCacheArgs = width + + return self._descriptorCache + + def _getDescriptor(self, width): + # implementation of getDescriptor + return [] + def resetDisplay(self): """ Flushes cached display results. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/controller.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -1003,7 +1003,7 @@ popup.addfstr(2, 41, "page down: scroll down a page") popup.addfstr(3, 2, "enter: edit configuration option") - popup.addfstr(3, 41, "d: raw consensus descriptor") + #popup.addfstr(3, 41, "d: raw consensus descriptor") listingType = panels["conn2"]._listingType.lower() popup.addfstr(4, 2, "l: listed identity (%s)" % listingType) @@ -1013,6 +1013,8 @@ resolverUtil = connections.getResolver("tor").overwriteResolver if resolverUtil == None: resolverUtil = "auto" popup.addfstr(5, 2, "u: resolving utility (%s)" % resolverUtil) + + pageOverrideKeys = (ord('l'), ord('s'), ord('u')) elif page == 3: popup.addfstr(1, 2, "up arrow: scroll up a line") popup.addfstr(1, 41, "down arrow: scroll down a line")

1 0

r24531: {arm} Corrections and added scope for caching. With this the cpu u (arm/trunk/src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 02:26:05 +0000 (Sat, 02 Apr 2011) New Revision: 24531 Modified: arm/trunk/src/util/torTools.py Log: Corrections and added scope for caching. With this the cpu usage of the new connection panel is roughly half of the previous version. :) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 01:47:53 UTC (rev 24530) +++ arm/trunk/src/util/torTools.py 2011-04-02 02:26:05 UTC (rev 24531) @@ -56,6 +56,7 @@ "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") +CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/") # Tor has a couple messages (in or/router.c) for when our ip address changes: # "Our IP Address has changed from <previous> to <current>; rebuilding @@ -298,8 +299,9 @@ # messages. self._pathPrefixLogging = True - # cached GETINFO parameters (None if unset or possibly changed) - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + # cached parameters for GETINFO and custom getters (None if unset or + # possibly changed) + self._cachedParam = {} # cached GETCONF parameters, entries consisting of: # (option, fetch_type) => value @@ -443,11 +445,22 @@ self.connLock.acquire() + # checks if this is an arg caching covers + isCacheArg = param in CACHE_ARGS + + if not isCacheArg: + for prefix in CACHE_GETINFO_PREFIX_ARGS: + if param.startswith(prefix): + isCacheArg = True + break + startTime = time.time() result, raisedExc, isFromCache = default, None, False if self.isAlive(): - if param in CACHE_ARGS and self._cachedParam[param]: - result = self._cachedParam[param] + cachedValue = self._cachedParam.get(param) + + if isCacheArg and cachedValue: + result = cachedValue isFromCache = True else: try: @@ -457,7 +470,7 @@ if type(exc) == TorCtl.TorCtlClosed: self.close() raisedExc = exc - if not isFromCache and result and param in CACHE_ARGS: + if isCacheArg and result and not isFromCache: self._cachedParam[param] = result if isFromCache: @@ -564,17 +577,17 @@ if type(exc) == TorCtl.TorCtlClosed: self.close() result, raisedExc = default, exc - if not isFromCache and result: + if not isFromCache: cacheValue = result if fetchType == "list": cacheValue = list(result) elif fetchType == "map": cacheValue = dict(result) self._cachedConf[(param.lower(), fetchType)] = cacheValue if isFromCache: - msg = "GETINFO %s (cache fetch)" % param + msg = "GETCONF %s (cache fetch)" % param log.log(CONFIG["log.torGetConfCache"], msg) else: - msg = "GETINFO %s (runtime: %0.4f)" % (param, time.time() - startTime) + msg = "GETCONF %s (runtime: %0.4f)" % (param, time.time() - startTime) log.log(CONFIG["log.torGetConf"], msg) self.connLock.release() @@ -1205,7 +1218,7 @@ if not issueSighup: try: self.conn.send_signal("RELOAD") - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) @@ -1250,7 +1263,7 @@ if errorLine: raise IOError(" ".join(errorLine.split()[3:])) else: raise IOError("failed silently") - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} except IOError, exc: raisedException = exc @@ -1401,12 +1414,10 @@ # if the message is informing us of our ip address changing then clear # its cached value - isAddrChangeEvent = False for prefix in ADDR_CHANGED_MSG_PREFIX: - isAddrChangeEvent |= msg.startswith(prefix) - - if isAddrChangeEvent and "address" in self._cachedParam: - del self._cachedParam["address"] + if msg.startswith(prefix): + self._cachedParam["address"] = None + break def _updateHeartbeat(self): """ @@ -1548,14 +1559,14 @@ lookups if true """ - currentVal = self._cachedParam[key] + currentVal = self._cachedParam.get(key) if currentVal != None: if currentVal == UNKNOWN: return default else: return currentVal self.connLock.acquire() - currentVal, result = self._cachedParam[key], None + currentVal, result = self._cachedParam.get(key), None if currentVal == None and self.isAlive(): # still unset - fetch value if key in ("nsEntry", "descEntry"): @@ -1750,7 +1761,7 @@ """ # resets cached GETINFO and GETCONF parameters - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} # gives a notice that the control port has closed

1 0

r24530: {arm} Dropping config query cache hits from the log. (in arm/trunk: . src/interface/connections src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 01:47:53 +0000 (Sat, 02 Apr 2011) New Revision: 24530 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/util/torTools.py Log: Dropping config query cache hits from the log. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/armrc.sample 2011-04-02 01:47:53 UTC (rev 24530) @@ -233,6 +233,7 @@ log.torGetInfo DEBUG log.torGetInfoCache NONE log.torGetConf DEBUG +log.torGetConfCache NONE log.torSetConf INFO log.torEventTypeUnrecognized NOTICE log.torPrefixPathInvalid NOTICE Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-02 01:47:53 UTC (rev 24530) @@ -77,10 +77,6 @@ for entry in self._entries: if isinstance(entry, connEntry.ConnectionEntry): entry.getLines()[0].isInitialConnection = True - - # TODO: should listen for tor shutdown - # TODO: hasn't yet had its pausing functionality tested (for instance, the - # key handler still accepts events when paused) def setPaused(self, isPause): """ Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/src/util/torTools.py 2011-04-02 01:47:53 UTC (rev 24530) @@ -75,6 +75,7 @@ "log.torGetInfo": log.DEBUG, "log.torGetInfoCache": None, "log.torGetConf": log.DEBUG, + "log.torGetConfCache": None, "log.torSetConf": log.INFO, "log.torPrefixPathInvalid": log.NOTICE, "log.bsdJailFound": log.INFO, @@ -569,9 +570,12 @@ elif fetchType == "map": cacheValue = dict(result) self._cachedConf[(param.lower(), fetchType)] = cacheValue - runtimeLabel = "cache fetch" if isFromCache else "runtime: %0.4f" % (time.time() - startTime) - msg = "GETCONF %s (%s)" % (param, runtimeLabel) - log.log(CONFIG["log.torGetConf"], msg) + if isFromCache: + msg = "GETINFO %s (cache fetch)" % param + log.log(CONFIG["log.torGetConfCache"], msg) + else: + msg = "GETINFO %s (runtime: %0.4f)" % (param, time.time() - startTime) + log.log(CONFIG["log.torGetConf"], msg) self.connLock.release()

1 0

r24529: {arm} Corrections for minor issues spotted while checking for pari (in arm/trunk/src: interface interface/connections util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 01:35:15 +0000 (Sat, 02 Apr 2011) New Revision: 24529 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/interface/controller.py arm/trunk/src/util/uiTools.py Log: Corrections for minor issues spotted while checking for parity with the old connection panel. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-01 19:15:59 UTC (rev 24528) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 01:35:15 UTC (rev 24529) @@ -335,6 +335,10 @@ connection or exit traffic. """ + # This is used to scrub private information from the interface. Relaying + # etiquette (and wiretaping laws) say these are bad things to look at so + # DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! + myType = self.getType() if myType == Category.INBOUND: Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-01 19:15:59 UTC (rev 24528) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-02 01:35:15 UTC (rev 24529) @@ -28,7 +28,7 @@ """ def __init__(self, stdscr, config=None): - panel.Panel.__init__(self, stdscr, "connections", 0) + panel.Panel.__init__(self, stdscr, "conn", 0) threading.Thread.__init__(self) self.setDaemon(True) Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-01 19:15:59 UTC (rev 24528) +++ arm/trunk/src/interface/controller.py 2011-04-02 01:35:15 UTC (rev 24529) @@ -1003,12 +1003,16 @@ popup.addfstr(2, 41, "page down: scroll down a page") popup.addfstr(3, 2, "enter: edit configuration option") - popup.addfstr(3, 41, "w: save current configuration") + popup.addfstr(3, 41, "d: raw consensus descriptor") listingType = panels["conn2"]._listingType.lower() popup.addfstr(4, 2, "l: listed identity (%s)" % listingType) popup.addfstr(4, 41, "s: sort ordering") + + resolverUtil = connections.getResolver("tor").overwriteResolver + if resolverUtil == None: resolverUtil = "auto" + popup.addfstr(5, 2, "u: resolving utility (%s)" % resolverUtil) elif page == 3: popup.addfstr(1, 2, "up arrow: scroll up a line") popup.addfstr(1, 41, "down arrow: scroll down a line") @@ -1512,7 +1516,7 @@ hostnames.setPaused(True) panels["conn"].sortConnections() - elif page == 1 and (key == ord('u') or key == ord('U')): + elif page in (1, 2) and (key == ord('u') or key == ord('U')): # provides menu to pick identification resolving utility options = ["auto"] + connections.Resolver.values() Modified: arm/trunk/src/util/uiTools.py =================================================================== --- arm/trunk/src/util/uiTools.py 2011-04-01 19:15:59 UTC (rev 24528) +++ arm/trunk/src/util/uiTools.py 2011-04-02 01:35:15 UTC (rev 24529) @@ -503,10 +503,16 @@ if self.isCursorEnabled: self.getCursorSelection(content) # resets the cursor location + # makes sure the cursor is visible if self.cursorLoc < self.scrollLoc: self.scrollLoc = self.cursorLoc elif self.cursorLoc > self.scrollLoc + pageHeight - 1: self.scrollLoc = self.cursorLoc - pageHeight + 1 + + # checks if the bottom would run off the content (this could be the + # case when the content's size is dynamic and entries are removed) + if len(content) > pageHeight: + self.scrollLoc = min(self.scrollLoc, len(content) - pageHeight) return self.scrollLoc

1 0

[torbutton/master] Bug #2777: Clear OCSP cache on toggle.
by mikeperry＠torproject.org 01 Apr '11

01 Apr '11

commit 77193828ed6d4ab7749bb61b10df4bf628155ecd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 1 16:38:51 2011 -0700 Bug #2777: Clear OCSP cache on toggle. We do this by toggling the pref. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5170be1..5d0a564 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1579,6 +1579,16 @@ function torbutton_update_status(mode, force_update) { !m_tb_prefs.getBoolPref("security.enable_ssl2")); } + // This clears the OCSP cache. + // + // nsNSSComponent::Observe() watches security.OCSP.enabled, which calls + // setOCSPOptions(), which if set to 0, calls CERT_DisableOCSPChecking(), + // which calls CERT_ClearOCSPCache(). + // See: http://mxr.mozilla.org/security/source/security/manager/ssl/src/nsNSSCompon… + var ocsp = m_tb_prefs.getIntPref("security.OCSP.enabled"); + m_tb_prefs.setIntPref("security.OCSP.enabled", 0); + m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp); + // This clears the undo tab history. var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);

1 0

r24528: {} add roger's osdc'11 slides. (projects/presentations)
by Andrew Lewman 01 Apr '11

01 Apr '11

Author: phobos Date: 2011-04-01 19:15:59 +0000 (Fri, 01 Apr 2011) New Revision: 24528 Added: projects/presentations/slides-osdc11.odp projects/presentations/slides-osdc11.pdf Log: add roger's osdc'11 slides. Added: projects/presentations/slides-osdc11.odp =================================================================== (Binary files differ) Property changes on: projects/presentations/slides-osdc11.odp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/slides-osdc11.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/slides-osdc11.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24527: {website} fix page title (website/trunk/about/en)
by Roger Dingledine 01 Apr '11

01 Apr '11

Author: arma Date: 2011-04-01 17:31:50 +0000 (Fri, 01 Apr 2011) New Revision: 24527 Modified: website/trunk/about/en/gsoc.wml Log: fix page title Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2011-04-01 16:18:15 UTC (rev 24526) +++ website/trunk/about/en/gsoc.wml 2011-04-01 17:31:50 UTC (rev 24527) @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2010" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Google Summer of Code 2011" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a>

1 0

r24526: {arm} Identifying connections we're providing a hidden service on (in arm/trunk/src: interface/connections util)
by Damian Johnson 01 Apr '11

01 Apr '11

Author: atagar Date: 2011-04-01 16:18:15 +0000 (Fri, 01 Apr 2011) New Revision: 24526 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/util/connections.py arm/trunk/src/util/enum.py arm/trunk/src/util/torTools.py Log: Identifying connections we're providing a hidden service on and application it's attached to. This was tested by running a local HS via thttpd and using tor2web to download files from it. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-01 04:46:33 UTC (rev 24525) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-01 16:18:15 UTC (rev 24526) @@ -18,11 +18,11 @@ # Directory Fetching tor consensus information. # Control Tor controller (arm, vidalia, etc). -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CIRCUIT", "DIRECTORY", "SOCKS", "CONTROL") +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CIRCUIT", "DIRECTORY", "SOCKS", "HIDDEN", "CONTROL") CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", Category.EXIT: "red", Category.CIRCUIT: "cyan", - Category.SOCKS: "yellow", Category.DIRECTORY: "magenta", - Category.CONTROL: "red"} + Category.DIRECTORY: "magenta", Category.SOCKS: "yellow", + Category.HIDDEN: "magenta", Category.CONTROL: "red"} # static data for listing format # <src> --> <dst> <etc><padding> @@ -199,7 +199,7 @@ self._possibleClient = True self._possibleDirectory = True - # attributes for SOCKS and CONTROL connections + # attributes for SOCKS, HIDDEN, and CONTROL connections self.appName = None self.appPid = None self.isAppResolving = False @@ -209,6 +209,7 @@ myDirPort = conn.getOption("DirPort") mySocksPort = conn.getOption("SocksPort", "9050") myCtlPort = conn.getOption("ControlPort") + myHiddenServicePorts = conn.getHiddenServicePorts() # the ORListenAddress can overwrite the ORPort listenAddr = conn.getOption("ORListenAddress") @@ -220,6 +221,8 @@ self.local.isORPort = True elif lPort == mySocksPort: self.baseType = Category.SOCKS + elif fPort in myHiddenServicePorts: + self.baseType = Category.HIDDEN elif lPort == myCtlPort: self.baseType = Category.CONTROL else: @@ -288,7 +291,7 @@ True if our display uses application information that hasn't yet been resolved. """ - return self.appName == None and self.getType() in (Category.SOCKS, Category.CONTROL) + return self.appName == None and self.getType() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL) def _getListingEntry(self, width, currentTime, listingType): entryType = self.getType() @@ -428,7 +431,7 @@ """ # for applications show the command/pid - if self.getType() in (Category.SOCKS, Category.CONTROL): + if self.getType() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): displayLabel = "" if self.appName: @@ -538,13 +541,23 @@ # the source and destination addresses are both private, but that might # not be perfectly reliable either. - isExpansionType = not myType in (Category.SOCKS, Category.CONTROL) + isExpansionType = not myType in (Category.SOCKS, Category.HIDDEN, Category.CONTROL) if isExpansionType: srcAddress = myExternalIpAddr + localPort else: srcAddress = self.local.getIpAddr() + localPort - src = "%-21s" % srcAddress # ip:port = max of 21 characters - dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters + if myType in (Category.SOCKS, Category.CONTROL): + # These categories are reordered later so the it's dst -> src rather + # than src -> dst. They are local connections so the dst lacks locale + # information, so swapping their respective widths to match column + # alignments. + + src = "%-26s" % srcAddress + dst = "%-21s" % dstAddress + else: + src = "%-21s" % srcAddress # ip:port = max of 21 characters + dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters + usedSpace += len(src) + len(dst) # base data requires 47 characters # Showing the fingerprint (which has the width of 42) has priority over Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-01 04:46:33 UTC (rev 24525) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-01 16:18:15 UTC (rev 24526) @@ -64,14 +64,14 @@ # it changes. self._lastResourceFetch = -1 - # resolver for the command/pid associated with SOCKS and CONTROL connections + # resolver for the command/pid associated with SOCKS, HIDDEN, and CONTROL connections self._appResolver = connections.AppResolver("arm") # rate limits appResolver queries to once per update self.appResolveSinceUpdate = False self._update() # populates initial entries - self._resolveApps(False) # resolves initial SOCKS and CONTROL applications + self._resolveApps(False) # resolves initial applications # mark the initially exitsing connection uptimes as being estimates for entry in self._entries: @@ -203,7 +203,7 @@ for lineNum in range(scrollLoc, len(self._entryLines)): entryLine = self._entryLines[lineNum] - # if this is an unresolved SOCKS or CONTROL entry then queue up + # if this is an unresolved SOCKS, HIDDEN, or CONTROL entry then queue up # resolution for the applicaitions they belong to if isinstance(entryLine, connEntry.ConnectionLine) and entryLine.isUnresolvedApp(): self._resolveApps() @@ -325,8 +325,8 @@ def _resolveApps(self, flagQuery = True): """ - Triggers an asynchronous query for all unresolved SOCKS and CONTROL - entries. + Triggers an asynchronous query for all unresolved SOCKS, HIDDEN, and + CONTROL entries. Arguments: flagQuery - sets a flag to prevent further call from being respected @@ -334,42 +334,46 @@ """ if self.appResolveSinceUpdate or not self._config["features.connection.resolveApps"]: return + unresolvedLines = [l for l in self._entryLines if isinstance(l, connEntry.ConnectionLine) and l.isUnresolvedApp()] - # fetch the unresolved SOCKS and CONTROL lines - unresolvedLines = [] + # get the ports used for unresolved applications + appPorts = [] - for line in self._entryLines: - if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): - unresolvedLines.append(line) + for line in unresolvedLines: + appConn = line.local if line.getType() == connEntry.Category.HIDDEN else line.foreign + appPorts.append(appConn.getPort()) # Queue up resolution for the unresolved ports (skips if it's still working # on the last query). - if not self._appResolver.isResolving: - self._appResolver.resolve([line.foreign.getPort() for line in unresolvedLines]) + if appPorts and not self._appResolver.isResolving: + self._appResolver.resolve(appPorts) + # Fetches results. If the query finishes quickly then this is what we just + # asked for, otherwise these belong to an earlier resolution. + # # The application resolver might have given up querying (for instance, if # the lsof lookups aren't working on this platform or lacks permissions). # The isAppResolving flag lets the unresolved entries indicate if there's # a lookup in progress for them or not. - for line in unresolvedLines: - line.isAppResolving = self._appResolver.isResolving - - # Fetches results. If the query finishes quickly then this is what we just - # asked for, otherwise these belong to the last resolution. appResults = self._appResolver.getResults(0.2) for line in unresolvedLines: - linePort = line.foreign.getPort() + isLocal = line.getType() == connEntry.Category.HIDDEN + linePort = line.local.getPort() if isLocal else line.foreign.getPort() if linePort in appResults: # sets application attributes if there's a result with this as the # inbound port for inboundPort, outboundPort, cmd, pid in appResults[linePort]: - if linePort == inboundPort: + appPort = outboundPort if isLocal else inboundPort + + if linePort == appPort: line.appName = cmd line.appPid = pid line.isAppResolving = False + else: + line.isAppResolving = self._appResolver.isResolving if flagQuery: self.appResolveSinceUpdate = True Modified: arm/trunk/src/util/connections.py =================================================================== --- arm/trunk/src/util/connections.py 2011-04-01 04:46:33 UTC (rev 24525) +++ arm/trunk/src/util/connections.py 2011-04-01 16:18:15 UTC (rev 24526) @@ -659,7 +659,7 @@ else: lsofArgs.append("-i tcp:%s" % port) if lsofArgs: - lsofResults = sysTools.call("lsof -n " + " ".join(lsofArgs)) + lsofResults = sysTools.call("lsof -nP " + " ".join(lsofArgs)) else: lsofResults = None if not lsofResults and self.failureCount != -1: Modified: arm/trunk/src/util/enum.py =================================================================== --- arm/trunk/src/util/enum.py 2011-04-01 04:46:33 UTC (rev 24525) +++ arm/trunk/src/util/enum.py 2011-04-01 16:18:15 UTC (rev 24526) @@ -32,7 +32,8 @@ words = [] for entry in label.split("_"): - if len(entry) == 1: words.append(entry.upper()) + if len(entry) == 0: words.append("") + elif len(entry) == 1: words.append(entry.upper()) else: words.append(entry[0].upper() + entry[1:].lower()) return " ".join(words) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-01 04:46:33 UTC (rev 24525) +++ arm/trunk/src/util/torTools.py 2011-04-01 16:18:15 UTC (rev 24526) @@ -55,7 +55,7 @@ "config/names", "info/names", "features/names", "events/names", "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", - "pathPrefix", "startTime", "authorities", "circuits") + "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") # Tor has a couple messages (in or/router.c) for when our ip address changes: # "Our IP Address has changed from <previous> to <current>; rebuilding @@ -649,6 +649,16 @@ return self._getRelayAttr("circuits", default) + def getHiddenServicePorts(self, default = []): + """ + Provides the target ports hidden services are configured to use. + + Arguments: + default - value provided back if unable to query the hidden service ports + """ + + return self._getRelayAttr("hsPorts", default) + def getMyNetworkStatus(self, default = None): """ Provides the network status entry for this relay if available. This is @@ -1691,6 +1701,31 @@ path = tuple([hopEntry[1:41] for hopEntry in lineComp[2].split(",")]) result.append((int(lineComp[0]), lineComp[1], lineComp[3][8:], path)) + elif key == "hsPorts": + result = [] + hsOptions = self.getOptionMap("HiddenServiceOptions") + + if hsOptions and "HiddenServicePort" in hsOptions: + for hsEntry in hsOptions["HiddenServicePort"]: + # hidden service port entries are of the form: + # VIRTPORT [TARGET] + # with the TARGET being an IP, port, or IP:Port. If the target port + # isn't defined then uses the VIRTPORT. + + hsPort = None + + if " " in hsEntry: + # parses the target, checking if it's a port or IP:Port combination + hsTarget = hsEntry.split(" ")[1] + + if ":" in hsTarget: + hsPort = hsTarget.split(":")[1] # target is the IP:Port + elif hsTarget.isdigit(): + hsPort = hsTarget # target is just the port + else: hsPort = hsEntry # just has the virtual port + + if hsPort.isdigit(): + result.append(hsPort) # cache value if result != None: self._cachedParam[key] = result

1 0