- tor-commits - lists.torproject.org

r24278: {arm} Using circuit-status results to identify directory and clien (in arm/trunk: . src/interface/connections src/util)
by Damian Johnson 01 Mar '11

01 Mar '11

Author: atagar Date: 2011-03-01 03:42:13 +0000 (Tue, 01 Mar 2011) New Revision: 24278 Modified: arm/trunk/README arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/interface/connections/listings.py arm/trunk/src/util/torTools.py Log: Using circuit-status results to identify directory and client circuits. This is using a far better implementation than the previous connection panel from a perspective of performance, accuracy, and code cleanliness. Other notes... - The previous function for fetching used guards is replaced with a getter function for the circuits. - I'm no longer using our authorities to identify directory connections (this was a stupid hack for several reasons, foremost being that it didn't identify mirrors, the harded listings get stale, and authorities can act as a normal relay too). I'm keeping that code for now in case it comes in handy later. Modified: arm/trunk/README =================================================================== --- arm/trunk/README 2011-02-28 17:39:55 UTC (rev 24277) +++ arm/trunk/README 2011-03-01 03:42:13 UTC (rev 24278) @@ -111,7 +111,6 @@ ChangeLog - revision history LICENSE - copy of the gpl v3 README - um... guess you figured this one out - TODO - known issues, future plans, etc setup.py - distutils installation script for arm src/ Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-02-28 17:39:55 UTC (rev 24277) +++ arm/trunk/src/interface/connections/connPanel.py 2011-03-01 03:42:13 UTC (rev 24278) @@ -187,6 +187,10 @@ if self._lastResourceFetch != currentResolutionCount: self.valsLock.acquire() currentConnections = connResolver.getConnections() + + # Replacement listing of connections. We first populate it with any of + # our old entries in currentConnections, then add new ConnectionEntries + # for whatever remains. newConnections = [] # preserves any ConnectionEntries they already exist Modified: arm/trunk/src/interface/connections/listings.py =================================================================== --- arm/trunk/src/interface/connections/listings.py 2011-02-28 17:39:55 UTC (rev 24277) +++ arm/trunk/src/interface/connections/listings.py 2011-03-01 03:42:13 UTC (rev 24278) @@ -17,10 +17,10 @@ # TODO: add recognizing of CLIENT connection type DestAttr = enum.Enum("NONE", "LOCALE", "HOSTNAME") -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "SOCKS", "CLIENT", "DIRECTORY", "CONTROL") -CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", - Category.EXIT: "red", Category.SOCKS: "cyan", - Category.CLIENT: "cyan", Category.DIRECTORY: "magenta", +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CLIENT", "APPLICATION", "DIRECTORY", "CONTROL") +CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", + Category.EXIT: "red", Category.CLIENT: "cyan", + Category.APPLICATION: "yellow", Category.DIRECTORY: "magenta", Category.CONTROL: "red"} # static data for listing format @@ -121,6 +121,15 @@ self._labelCache = "" self._labelCacheArgs = (None, None) + # 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 + # directory - matches an established single-hop circuit (probably a + # directory mirror) + + self._possibleClient = True + self._possibleDirectory = True + conn = torTools.getConn() myOrPort = conn.getOption("ORPort") myDirPort = conn.getOption("DirPort") @@ -137,7 +146,7 @@ self.baseType = Category.INBOUND self.local.isORPort = True elif lPort == mySocksPort: - self.baseType = Category.SOCKS + self.baseType = Category.APPLICATION elif lPort == myCtlPort: self.baseType = Category.CONTROL elif (fIpAddr, fPort) in myAuthorities: @@ -153,18 +162,53 @@ """ if self.baseType == Category.OUTBOUND: - # Currently the only non-static categories are OUTBOUND vs EXIT (since - # this depends on the current consensus). The exitability and - # fingerprints are both cached by the torTools util making this a quick - # lookup. + # Currently the only non-static categories are OUTBOUND vs... + # - EXIT since this depends on the current consensus + # - CLIENT if this is likely to belong to our guard usage + # - DIRECTORY if this is a single-hop circuit (directory mirror?) + # + # The exitability, circuits, and fingerprints are all cached by the + # torTools util keeping this a quick lookup. conn = torTools.getConn() - isKnownRelay = self.foreign.getFingerprint() != "UNKNOWN" - isExitingAllowed = conn.isExitingAllowed(self.foreign.getIpAddr(), self.foreign.getPort()) - isExitConnection = isExitingAllowed and not isKnownRelay + destFingerprint = self.foreign.getFingerprint() - return Category.EXIT if isExitConnection else Category.OUTBOUND - else: return self.baseType + if destFingerprint == "UNKNOWN": + # Not a known relay. This might be an exit connection. + + if conn.isExitingAllowed(self.foreign.getIpAddr(), self.foreign.getPort()): + return Category.EXIT + elif self._possibleClient or self._possibleDirectory: + # This belongs to a known relay. If we haven't eliminated ourselves as + # a possible client or directory connection then check if it still + # holds true. + + myCircuits = conn.getCircuits() + + if self._possibleClient: + # Checks that this belongs to the first hop in a circuit that's + # either unestablished or longer than a single hop (ie, anything but + # a built 1-hop connection since those are most likely a directory + # mirror). + + for status, _, path in myCircuits: + if path[0] == destFingerprint and (status != "BUILT" or len(path) > 1): + return Category.CLIENT # matched a probable guard connection + + # fell through, we can eliminate ourselves as a guard in the future + self._possibleClient = False + + if self._possibleDirectory: + # Checks if we match a built, single hop circuit. + + for status, _, path in myCircuits: + if path[0] == destFingerprint and status == "BUILT" and len(path) == 1: + return Category.DIRECTORY + + # fell through, eliminate ourselves as a directory connection + self._possibleDirectory = False + + return self.baseType def getDestinationLabel(self, maxLength, extraAttr=DestAttr.NONE): """ Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-02-28 17:39:55 UTC (rev 24277) +++ arm/trunk/src/util/torTools.py 2011-03-01 03:42:13 UTC (rev 24278) @@ -55,7 +55,7 @@ "config/names", "info/names", "features/names", "events/names", "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "pid", "pathPrefix", - "startTime", "authorities", "usedGuards") + "startTime", "authorities", "circuits") # 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 @@ -603,6 +603,17 @@ if raisedExc: raise raisedExc + def getCircuits(self, default = []): + """ + This provides a list with tuples of the form: + (status, purpose, (fingerprint1, fingerprint2...)) + + Arguments: + default - value provided back if unable to query the circuit-status + """ + + return self._getRelayAttr("circuits", default) + def getMyNetworkStatus(self, default = None): """ Provides the network status entry for this relay if available. This is @@ -691,16 +702,6 @@ return self._getRelayAttr("flags", default) - def getMyUsedGuards(self, default = None): - """ - Provides the guards that we're currently using. - - Arguments: - default - results if the query fails - """ - - return self._getRelayAttr("usedGuards", default) - def getMyPid(self): """ Provides the pid of the attached tor process (None if no controller exists @@ -1263,7 +1264,7 @@ # since it uses circuit-status results. self._fingerprintsAttachedCache = None - self._cachedParam["usedGuards"] = None + self._cachedParam["circuits"] = None def buildtimeout_set_event(self, event): self._updateHeartbeat() @@ -1586,23 +1587,28 @@ locationComp = entry.split()[-2] # address:port component result.append(tuple(locationComp.split(":", 1))) else: result = list(DIR_SERVERS) - elif key == "usedGuards": - # Checks our circuit-status entry and provides the first hops. Results - # tend to be one or three hops, for instance: - # 91 BUILT $E4AE6E2FE320FBBD31924E8577F3289D4BE0B4AD=Qwerty PURPOSE=GENERAL + elif key == "circuits": + # Parses our circuit-status results, for instance + # 91 BUILT $E4AE6E2FE320FBBD31924E8577F3289D4BE0B4AD=Qwerty PURPOSE=GENERAL + # would belong to a single hop circuit, most likely fetching the + # consensus via a directory mirror. circStatusResults = self.getInfo("circuit-status") if circStatusResults == "": - result = [] # we don't have any client circuits + result = [] # we don't have any circuits elif circStatusResults != None: result = [] for line in circStatusResults.split("\n"): - fpStart = line.find("$") - fpEnd = line.find("=", fpStart) - guardFp = line[fpStart + 1:fpEnd] + # appends a tuple with the (status, purpose, path) + lineComp = line.split(" ") - if not guardFp in result: result.append(guardFp) + # skips blank lines and circuits without a path, for instance: + # 5 LAUNCHED PURPOSE=TESTING + if len(lineComp) < 4: continue + + path = tuple([hopEntry[1:41] for hopEntry in lineComp[2].split(",")]) + result.append((lineComp[1], lineComp[3], path)) # cache value if result != None: self._cachedParam[key] = result

1 0

[tor/master] Revert bug1074_launch_authconn* branch: needs more design, less crashing
by nickm＠torproject.org 28 Feb '11

28 Feb '11

commit 42c1a47123cd6752435dd039e88c5760f7e18085 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 28 12:58:29 2011 -0500 Revert bug1074_launch_authconn* branch: needs more design, less crashing --- changes/launch_authcon_on_skew | 7 ------ src/or/command.c | 42 ++++++++------------------------------- 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/changes/launch_authcon_on_skew b/changes/launch_authcon_on_skew deleted file mode 100644 index 276e860..0000000 --- a/changes/launch_authcon_on_skew +++ /dev/null @@ -1,7 +0,0 @@ - o Minor features - - When we get a connection from a non-authority that tells us our - clock is skewed, and we haven't heard about clock skew (or lack - thereof) from an authority, launch a connection to an authority - so we can find out whether we're really skewed. Related to - bug 1074. Patch from "AltF4". - diff --git a/src/or/command.c b/src/or/command.c index bfcc1c9..4b70dee 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -45,13 +45,6 @@ uint64_t stats_n_destroy_cells_processed = 0; uint64_t stats_n_versions_cells_processed = 0; /** How many CELL_NETINFO cells have we received, ever? */ uint64_t stats_n_netinfo_cells_processed = 0; -/** Have we received a NETINFO cell from a trusted dir, ever? Used - * to decide what to do about time skew. - * 0 == No, and and we haven't tried asking an authority yet - * 1 == No, we've launched a query but haven't heard back yet - * 2 == Yes - **/ -static int received_netinfo_from_trusted_dir = 0; /* These are the main functions for processing cells */ static void command_process_create_cell(cell_t *cell, or_connection_t *conn); @@ -628,16 +621,17 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) } /* Act on apparent skew. */ - /** Warn when we get a netinfo skew with at least this value. - Ignore if we've already received skew info from a trusted dir */ + /** Warn when we get a netinfo skew with at least this value. */ #define NETINFO_NOTICE_SKEW 3600 if (labs(apparent_skew) > NETINFO_NOTICE_SKEW && - router_get_by_id_digest(conn->identity_digest) && - received_netinfo_from_trusted_dir != 2) { + router_get_by_id_digest(conn->identity_digest)) { char dbuf[64]; - - int severity = router_digest_is_trusted_dir(conn->identity_digest) ? - LOG_WARN : LOG_INFO; + int severity; + /*XXXX be smarter about when everybody says we are skewed. */ + if (router_digest_is_trusted_dir(conn->identity_digest)) + severity = LOG_WARN; + else + severity = LOG_INFO; format_time_interval(dbuf, sizeof(dbuf), apparent_skew); log_fn(severity, LD_GENERAL, "Received NETINFO cell with skewed time from " "server at %s:%d. It seems that our clock is %s by %s, or " @@ -646,31 +640,13 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) conn->_base.address, (int)conn->_base.port, apparent_skew>0 ? "ahead" : "behind", dbuf, apparent_skew>0 ? "behind" : "ahead"); - if (severity == LOG_WARN) { /* only tell the controller if an authority */ + if (severity == LOG_WARN) /* only tell the controller if an authority */ control_event_general_status(LOG_WARN, "CLOCK_SKEW SKEW=%ld SOURCE=OR:%s:%d", apparent_skew, conn->_base.address, conn->_base.port); - received_netinfo_from_trusted_dir = 2; - /* Connect to a trusted dir to trigger a NETINFO cell - * only if we haven't already */ - } else if (received_netinfo_from_trusted_dir == 0) { - const routerstatus_t *any_trusted_dir = - router_pick_trusteddirserver(NO_AUTHORITY, 0); - tor_addr_t trusted_dir_addr; - tor_addr_from_ipv4h(&trusted_dir_addr, any_trusted_dir->addr); - connection_or_connect(&trusted_dir_addr, - any_trusted_dir->or_port, - any_trusted_dir->identity_digest); - received_netinfo_from_trusted_dir = 1; - } } - /* Note that we received a good netinfo cell from a trusted directory */ - if (router_digest_is_trusted_dir(conn->identity_digest) && - labs(apparent_skew) <= NETINFO_NOTICE_SKEW) - received_netinfo_from_trusted_dir = 2; - /* XXX maybe act on my_apparent_addr, if the source is sufficiently * trustworthy. */

1 0

[torsocks/master] Only run config.status once at configure time
by hoganrobert＠torproject.org 28 Feb '11

28 Feb '11

commit 43043527fc2df76ff214234d7a93f73568297107 Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 27 20:58:37 2011 +0000 Only run config.status once at configure time --- configure.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index a89fa0e..0291f8f 100644 --- a/configure.in +++ b/configure.in @@ -635,11 +635,11 @@ AC_ENABLE_SHARED AC_ENABLE_STATIC AC_CONFIG_FILES([src/usewithtor src/torsocks doc/torsocks.conf.5 doc/torsocks.8 doc/usewithtor.1 doc/torsocks.1]) - -dnl Output the Makefile for libtorsocks -AC_OUTPUT(Makefile src/Makefile doc/Makefile) +AC_CONFIG_FILES(Makefile src/Makefile doc/Makefile) +AC_OUTPUT dnl Output the Makefile for test/test_torsocks. dnl Dump any LDFLAGS that were only required for linking libtorsocks, such as -dynamiclib on OSX. LDFLAGS="$TESTLDFLAGS" -AC_OUTPUT(test/Makefile) +AC_CONFIG_FILES(test/Makefile) +AC_OUTPUT

1 0

r24277: {arm} Fix for minor bug with the last commit. (arm/trunk/src/util)
by Damian Johnson 28 Feb '11

28 Feb '11

Author: atagar Date: 2011-02-28 17:39:55 +0000 (Mon, 28 Feb 2011) New Revision: 24277 Modified: arm/trunk/src/util/torTools.py Log: Fix for minor bug with the last commit. Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-02-28 17:11:26 UTC (rev 24276) +++ arm/trunk/src/util/torTools.py 2011-02-28 17:39:55 UTC (rev 24277) @@ -1595,6 +1595,8 @@ if circStatusResults == "": result = [] # we don't have any client circuits elif circStatusResults != None: + result = [] + for line in circStatusResults.split("\n"): fpStart = line.find("$") fpEnd = line.find("=", fpStart)

1 0

r24276: {arm} Adding a method for fetching the currently used guards, and (arm/trunk/src/util)
by Damian Johnson 28 Feb '11

28 Feb '11

Author: atagar Date: 2011-02-28 17:11:26 +0000 (Mon, 28 Feb 2011) New Revision: 24276 Modified: arm/trunk/src/util/torTools.py Log: Adding a method for fetching the currently used guards, and allowing for empty cache results. Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-02-28 13:30:28 UTC (rev 24275) +++ arm/trunk/src/util/torTools.py 2011-02-28 17:11:26 UTC (rev 24276) @@ -55,7 +55,7 @@ "config/names", "info/names", "features/names", "events/names", "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "pid", "pathPrefix", - "startTime", "authorities") + "startTime", "authorities", "usedGuards") # 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 @@ -263,7 +263,7 @@ self._pathPrefixLogging = True # cached GETINFO parameters (None if unset or possibly changed) - self._cachedParam = dict([(arg, "") for arg in CACHE_ARGS]) + self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) # cached GETCONF parameters, entries consisting of: # (option, fetch_type) => value @@ -691,6 +691,16 @@ return self._getRelayAttr("flags", default) + def getMyUsedGuards(self, default = None): + """ + Provides the guards that we're currently using. + + Arguments: + default - results if the query fails + """ + + return self._getRelayAttr("usedGuards", default) + def getMyPid(self): """ Provides the pid of the attached tor process (None if no controller exists @@ -716,10 +726,7 @@ jail's path. """ - result = self._getRelayAttr("pathPrefix", "") - - if result == UNKNOWN: return "" - else: return result + return self._getRelayAttr("pathPrefix", "") def getStartTime(self): """ @@ -727,10 +734,7 @@ can't be determined then this provides None. """ - result = self._getRelayAttr("startTime", None) - - if result == UNKNOWN: return None - else: return result + return self._getRelayAttr("startTime", None) def getStatus(self): """ @@ -1100,7 +1104,7 @@ if not issueSighup: try: self.conn.send_signal("RELOAD") - self._cachedParam = dict([(arg, "") for arg in CACHE_ARGS]) + self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) self._cachedConf = {} except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) @@ -1145,7 +1149,7 @@ if errorLine: raise IOError(" ".join(errorLine.split()[3:])) else: raise IOError("failed silently") - self._cachedParam = dict([(arg, "") for arg in CACHE_ARGS]) + self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) self._cachedConf = {} except IOError, exc: raisedException = exc @@ -1258,6 +1262,8 @@ # CIRC events aren't required, but if one's received then flush this cache # since it uses circuit-status results. self._fingerprintsAttachedCache = None + + self._cachedParam["usedGuards"] = None def buildtimeout_set_event(self, event): self._updateHeartbeat() @@ -1448,14 +1454,14 @@ """ currentVal = self._cachedParam[key] - if currentVal: + if currentVal != None: if currentVal == UNKNOWN: return default else: return currentVal self.connLock.acquire() currentVal, result = self._cachedParam[key], None - if not currentVal and self.isAlive(): + if currentVal == None and self.isAlive(): # still unset - fetch value if key in ("nsEntry", "descEntry"): myFingerprint = self.getInfo("fingerprint") @@ -1580,16 +1586,30 @@ locationComp = entry.split()[-2] # address:port component result.append(tuple(locationComp.split(":", 1))) else: result = list(DIR_SERVERS) + elif key == "usedGuards": + # Checks our circuit-status entry and provides the first hops. Results + # tend to be one or three hops, for instance: + # 91 BUILT $E4AE6E2FE320FBBD31924E8577F3289D4BE0B4AD=Qwerty PURPOSE=GENERAL + circStatusResults = self.getInfo("circuit-status") + + if circStatusResults == "": + result = [] # we don't have any client circuits + elif circStatusResults != None: + for line in circStatusResults.split("\n"): + fpStart = line.find("$") + fpEnd = line.find("=", fpStart) + guardFp = line[fpStart + 1:fpEnd] + + if not guardFp in result: result.append(guardFp) # cache value - if result: self._cachedParam[key] = result + if result != None: self._cachedParam[key] = result elif cacheUndefined: self._cachedParam[key] = UNKNOWN - elif currentVal == UNKNOWN: result = currentVal self.connLock.release() - if result: return result - else: return default + if result == None or result == UNKNOWN: return default + else: return result def _notifyStatusListeners(self, eventType): """ @@ -1601,7 +1621,7 @@ """ # resets cached GETINFO and GETCONF parameters - self._cachedParam = dict([(arg, "") for arg in CACHE_ARGS]) + self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) self._cachedConf = {} # gives a notice that the control port has closed

1 0

r24275: {website} Fix MacOS Vidalia Bundle package names (website/trunk/include)
by Robert Ransom 28 Feb '11

28 Feb '11

Author: rransom Date: 2011-02-28 13:30:28 +0000 (Mon, 28 Feb 2011) New Revision: 24275 Modified: website/trunk/include/versions.wmi Log: Fix MacOS Vidalia Bundle package names Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-02-27 21:37:03 UTC (rev 24274) +++ website/trunk/include/versions.wmi 2011-02-28 13:30:28 UTC (rev 24275) @@ -61,12 +61,12 @@ <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.10.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.10-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.10-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.10-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.10-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.10-ppc.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.10-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>/dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>

1 0

[torbutton/master] Bug #1968: Reset window.name in the content window on toggle
by mikeperry＠torproject.org 28 Feb '11

28 Feb '11

commit fef8cb176662120197bf10d955c1175c1dad82a2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 27 20:38:03 2011 -0800 Bug #1968: Reset window.name in the content window on toggle --- 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 c45a8df..3fe8145 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2260,6 +2260,16 @@ function torbutton_check_js_tag(browser, tor_enabled, js_enabled) { torbutton_log(4, "Failed to disable JS events: "+e) } + try { + // My estimation is that this does not get the inner iframe windows, + // but that does not matter, because iframes should be destroyed + // on the next load. + browser.contentWindow.name = null; + browser.contentWindow.window.name = null; + } catch(e) { + torbutton_log(4, "Failed to reset window.name: "+e) + } + if(browser.__tb_tor_fetched == tor_enabled) { // States match, js ok browser.docShell.allowJavascript = js_enabled; if (eventSuppressor)

1 0

[torbutton/master] Add plumbing that might've helped #1968, except it didn't.
by mikeperry＠torproject.org 28 Feb '11

28 Feb '11

commit ed1458b58cf9c30dfdc8cf81cc8262bd090403c4 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 27 17:37:44 2011 -0800 Add plumbing that might've helped #1968, except it didn't. Might end up useful in the future though. --- src/chrome/content/jshooks.js | 1 - src/chrome/content/torbutton.js | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/jshooks.js b/src/chrome/content/jshooks.js index 32c446d..aff355b 100644 --- a/src/chrome/content/jshooks.js +++ b/src/chrome/content/jshooks.js @@ -314,7 +314,6 @@ window.__HookObjects = function() { } } // window.__tb_hook_date == true - with(window) { XPCNativeWrapper = function(a) { return a; }; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 54e15f4..c45a8df 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2393,7 +2393,9 @@ function torbutton_apply_tab_tag(browser, tag) { else torbutton_log(5, "No tab found for session store tag."); } + var oldtag = browser.__tb_tor_fetched; browser.__tb_tor_fetched = tag; + return oldtag != tag; } function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { @@ -3692,6 +3694,7 @@ function torbutton_is_same_origin(win, source, target) { // unused. function torbutton_update_tags(win, new_loc) { + var tag_change = false; torbutton_eclog(2, "Updating tags."); if(typeof(win.wrappedJSObject) == 'undefined') { torbutton_eclog(3, "No JSObject: "+win.location); @@ -3743,6 +3746,7 @@ function torbutton_update_tags(win, new_loc) { torbutton_apply_tab_tag(browser, tor_tag); } if(browser.__tb_tor_fetched != !tor_tag) { + tag_change = true; // Purge session history every time we fetch a new doc // in a new tor state torbutton_log(2, "Purging session history"); @@ -3807,6 +3811,7 @@ function torbutton_update_tags(win, new_loc) { } torbutton_log(2, "Tags updated."); + return tag_change; } // Same-origin policy may prevent our hooks from applying @@ -3825,7 +3830,7 @@ function torbutton_update_tags(win, new_loc) { // - http://swik.net/User:Staple/JavaScript+Popup+Windows+Generation+and+Testing… // - pure javascript pages/non-text/html pages // - Messing with variables/existing hooks -function torbutton_hookdoc(win, doc) { +function torbutton_hookdoc(win, doc, state_change) { if(typeof(win.wrappedJSObject) == 'undefined') { torbutton_eclog(3, "No JSObject: "+win.location); return; @@ -3857,7 +3862,7 @@ function torbutton_hookdoc(win, doc) { // the insertion function returning before the injected code is evaluated. // This code seems to do what we want. - var str2 = ""; + var str2 = "window.__tb_state_changed="+state_change+";\r\n"; if(m_tb_ff3) { str2 += "window.__tb_set_uagent=false;\r\n"; str2 += "window.__tb_hook_date=false;\r\n"; @@ -3899,13 +3904,15 @@ function torbutton_hookdoc(win, doc) { } else { s = new Components.utils.Sandbox(win.wrappedJSObject); } + torbutton_log(2, "Type of sandbox: " + typeof(s)); // FIXME: FF3 issues // http://developer.mozilla.org/en/docs/XPConnect_wrappers#XPCSafeJSObjectWrap… // http://developer.mozilla.org/en/docs/Code_snippets:Interaction_between_priv… s.window = win.wrappedJSObject; -//s.__proto__ = win.wrappedJSObject; + //s.__proto__ = win.wrappedJSObject; var result = Components.utils.evalInSandbox(str2, s); + torbutton_log(2, "Type of result: " + typeof(result)); if(result === 23) { // secret confirmation result code. torbutton_log(3, "Javascript hooks applied successfully at: " + win.location); } else if(result === 13) { @@ -4079,9 +4086,9 @@ function torbutton_check_progress(aProgress, aRequest, aFlags, new_loc) { var doc = DOMWindow.document; try { if(doc) { - torbutton_update_tags(DOMWindow.window, new_loc); + var tag_change = torbutton_update_tags(DOMWindow.window, new_loc); if(doc.domain) { - torbutton_hookdoc(DOMWindow.window, doc); + torbutton_hookdoc(DOMWindow.window, doc, tag_change); } } } catch(e) {

1 0

[torbutton/master] Bug #2148: Make the ref spoofing more uniform in behavior
by mikeperry＠torproject.org 28 Feb '11

28 Feb '11

commit 2589477ba1034c394d9ef74c33bd1123316da214 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 27 16:53:29 2011 -0800 Bug #2148: Make the ref spoofing more uniform in behavior This may not be the final form we want for it to take, see FIXME in the comments. Also fix a potential issue with unescaped .'s in regex match strings. I'm really not sure we can call this ref spoofing protection a real security feature, though, so it's not like this matters a whole bunch. But might as well fix it, too. --- src/components/torRefSpoofer.js | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/components/torRefSpoofer.js b/src/components/torRefSpoofer.js index 2a2325d..e3504b8 100644 --- a/src/components/torRefSpoofer.js +++ b/src/components/torRefSpoofer.js @@ -4,6 +4,7 @@ const kMODULE_CONTRACTID = "@torproject.org/torRefSpoofer;1"; function RefSpoofer() { this.logger = Components.classes["@torproject.org/torbutton-logger;1"].getService(Components.interfaces.nsISupports).wrappedJSObject; this.logger.log(3, "RefSpoof component created"); + this.specials = /[-[\]{}()*+?.,\\^$|#\s]/g; } @@ -49,25 +50,31 @@ RefSpoofer.prototype = { return;//no referer available or invalid uri } var requestURI = oHttpChannel.URI; //request nsIURI object - var refererHost = referer.host; //referer host w/o scheme - var requestHost = oHttpChannel.URI.host;//request host without scheme - - //get rid of www. to compare root domain - if (refererHost.match("^www.")) - refererHost = refererHost.substring(4); - - if (requestHost.match("^www.")) - requestHost = requestHost.substring(4); - - //if they're in the same domain(if we can tell) or have the same host, keep the referer - if (requestHost.split(".").length >= refererHost.split(".").length && requestHost.match(refererHost)) + var destHost = referer.host; //referer host w/o scheme + var srcHost = oHttpChannel.URI.host;//request host without scheme + + // match is not what we want, unless we escape dots: + var destHostMatch = destHost.replace(this.specials, "\\$&"); + var srcHostMatch = srcHost.replace(this.specials, "\\$&"); + + // FIXME: This isn't exactly bulletproof security here, but it still + // may need to be more lenient not to break sites... + // + // If we suspect issues, we can try doing the following first: + // 1. Strip off all TLD suffixes, up to but not including '.' + // 2. If more than one domain part is till left, strip off prefix + + //if they're in the same domain(if we can tell) or have the same host, keep the referer + if (srcHost.split(".").length >= destHost.split(".").length + && srcHost.match(destHostMatch)) // dest is a substring of src return; - else if (refererHost.split(".").length >= requestHost.split(".").length && refererHost.match(requestHost)) + else if (destHost.split(".").length >= srcHost.split(".").length + && destHost.match(srcHostMatch)) // src is a substring of dest return; //if they do not have the same host this.adjustRef(oHttpChannel, requestURI.scheme + "://" + requestURI.host); this.logger.safe_log(3, "Adjusting Referer, ", - "from " + refererHost + " to " + requestURI.host); + "from " + destHost + " to " + requestURI.host); } catch (ex) { this.logger.log(5, "RefSpoof onModifyRequest: " +ex);

1 0

r24274: {} Removing internal TODO document (it's being replaced by its (arm/trunk)
by Damian Johnson 27 Feb '11

27 Feb '11

Author: atagar Date: 2011-02-27 21:37:03 +0000 (Sun, 27 Feb 2011) New Revision: 24274 Removed: arm/trunk/TODO Log: Removing internal TODO document (it's being replaced by its wiki page: https://trac.torproject.org/projects/tor/wiki/projects/arm) Deleted: arm/trunk/TODO =================================================================== --- arm/trunk/TODO 2011-02-27 21:36:19 UTC (rev 24273) +++ arm/trunk/TODO 2011-02-27 21:37:03 UTC (rev 24274) @@ -1,360 +0,0 @@ -Contents: - 1. Easy Bugs / Improvements - 2. Known Bugs - 3. Features - 3a. Improvements - 3b. Projects - 4. Ideas (low priority or not yet really) - 4. Investigational - - - - - - - - - -- Roadmap and completed work for next release (1.4.2) - [ ] refactor panels - Currently the interface is a bit of a rat's nest (especially the - controller). The goal is to use better modularization to both simplify - the codebase and make it possible to use smarter caching to improve - performance (far too much is done in the ui logic). This work is in - progress - /init and /util are done and /interface is partly done. Known - bugs are being fixed while refactoring. - - * conn panel - - expand client connections and note location in circuit (entry-exit) - - for clients give an option to list all connections, to tell which are - going through tor and which might be leaking - - check family members to see if they're alive (VERSION cell - handshake?) - - fallback when pid or connection querying via pid is unavailable - List all connections listed both by netstat and the consensus - - note when connection times are estimates (color?), ie connection - was established before arm - - connection uptime to associate inbound/outbound connections? - - identify controller connections (if it's arm, vidalia, etc) with - special detail page for them - - provide bridge / client country / exiting port statistics - Include bridge related data via GETINFO option (feature request - by waltman and ioerror). - - note the common port usage along with the exit statistics - - show the port used in scrubbed exit connections - - pick apart applications like iftop and pktstat to see how they get - per-connection bandwidth usage. Forum thread discussing it: - https://bbs.archlinux.org/viewtopic.php?pid=715906 - - include an option to show both the internal and external ips for the - local connection, ie: - myInternal --> myExternal --> foreign - idea and initial patch by Fabian Keil - - give a warning if family relays don't name us - - use SAVECONF instead when overwriting the current torrc - * classify config options as useful (defaultly shown), standard, and - deprecated (configured to be hidden by default) - * check tor source for deprecated options like 'group' (are they - ignored? idea is thanks to NightMonkey) - * elaborate on the password prompt (suggestion by weasel) - -- Roadmap for version 1.4.3 - [ ] refactor panels - [ ] controller and popup panels - - allow arm to resume after restarting tor - This requires a full move to the torTools controller. - - improve on performance bottlenecks for startup time and cpu usage - - intermittent concurrency bugs during shutdown, one possible source: - https://trac.torproject.org/projects/tor/ticket/2144 - [ ] setup scripts for arm - [ ] updater (checks for a new tarball and installs it automatically) - - attempt to verify download signature, providing a warning if unable - to do so - [ ] look into CAPs to get around permission issues for connection - listing sudo wrapper for arm to help arm run as the same user as - tor? Irc suggestions: - - man capabilities - - http://www.linuxjournal.com/article/5737 - -- Bugs - * Config options with long names (ex. UpdateBridgesFromAuthority) are causing - the layout on the config panel to be shifted. - * The default resolver isn't configurable. - * Default config value checks don't work with older versions of tor. We need - a version check for the feature. From Sjon: - > Okay, I found the problem with all values being tagged as default, - > 'GETINFO config-text' has been introduced in 0.2.2.7, while I am - > running 0.2.1.28. Maybe a check in arm for the version-number for that - > feature to be enabled might be an idea? - also: https://trac.torproject.org/projects/tor/ticket/2501 - * When saving the config the Log entry should be filtered out if unnecessary. - * The config write dialog (ie, the one for saving the config) has its a - misaligned border when it's smaller than the top detail section. - * The cpu usage spikes for scrollable content when the key's held. Try - coalescing the events. - * The manpage layout is system dependent, so the scraper needs to be more - resilient against being confused by whitespace. Another improvement is - including fallback results if the man page can't be parsed (suggested by - rransom, issue caught by NightMonkey). - * Log deduplication is currently an n^2 operation. Hence it can't handle - large logs (for instance, when at the DEBUG runlevel). Currently we're - timing out the function if it takes too long, but a more efficient method - for deduplication would be preferable. - * when in client mode and tor stops the header panel doesn't say so - * util/torTools.py: effective bandwidth rate/burst measurements don't take - SETCONF into consideration, blocked on: - https://trac.torproject.org/projects/tor/ticket/1692 - * log prepopulation fails to limit entries to the current tor instance if - the file isn't logged to at the NOTICE level. A fix is to use the - timestamps to see if it belongs to this tor instance. This requires - tor's uptime - blocked on implementation of the following proposal: - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… - * the STATUS_SERVER event may not be supported - 18:52 < mikeperry> atagar: I believe there is no event parsing for STATUS_SERVER - 18:53 < mikeperry> atagar: see TorCtl.EventSink and classes that inherit from it - 18:54 < mikeperry> specifically, TorCtl.EventHandler._decode1, _handle1, and _map1 - - * conn panel: - * *never* do reverse dns lookups for first hops (could be resolving via - tor and hence leaking to the exit) - * If there's duplicate family entries (and harder case: both nickname and - fingerprint entries for the same relay) then the duplicate should be - removed. This is also causing a bad scrolling bug where the cursor can't - get past the pair of duplicate entries. - * revise multikey sort of connections - Currently using a pretty ugly hack. Look at: - http://www.velocityreviews.com/forums/ - t356461-sorting-a-list-of-objects-by-multiple-attributes.html - and check for performance difference. - * replace checks against exit policy with Mike's torctl version - My version still isn't handling all inputs anyway (still need to handle - masks, private keyword, and prepended policy). Parse it from the rest - of the router if too heavy ("TorCtl.Router.will_exit_to instead"). - * avoid hostname lookups of private connections - Stripped most of them but suspect there might be others (have assertions - check for this in a debug mode?) - * connection uptimes shouldn't show fractions of a second - * connections aren't cleared when control port closes - -- Packaging - * OpenWrt - OpenWrt uses the opkg packaging format which could make use of - arm's current deb packages. Packaging for this platform would help with - the Torouter project: - https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter - * Mac - Couple of options include macport and dmg... - * macport (http://guide.macports.org/#development) - Build-from-source distribution method (like BSD portinstall). This has - been suggested by several people. - - * dmg (http://en.wikipedia.org/wiki/Apple_Disk_Image) - Most conventional method of software distribution on mac. This is just - a container (no updating/removal support), but could contain an icon - for the dock that starts a terminal with arm. This might include a pkg - installer. - - * mpkg (http://pypi.python.org/pypi/bdist_mpkg/) - Plugin for distutils. Like most mac packaging, this can only run on a - mac. It also requires setuptools: - http://www.errorhelp.com/search/details/74034/importerror-no-module-named-s… - -- Future Features - * Option for the graph to move right to left (easy - feature request by - ioerror and rdegraaf) - * client mode use cases - * not sure what sort of information would be useful in the header (to - replace the orport, fingerprint, flags, etc) - * one idea by velope: - "whether you configured a dnsport, transport, etc. and whether they - were successfully opened. might be nice to know this after the log - messages might be gone." - [notice] Opening Socks listener on 127.0.0.1:9050 - [notice] Opening Transparent pf/netfilter listener on 127.0.0.1:9040 - [notice] Opening DNS listener on 127.0.0.1:53 - * rdns and whois lookups (to find ISP, country, and jurisdiction, etc) - To avoid disclosing connection data to third parties this needs to be - an all-or-nothing operation (ie, needs to fetch information on all - relays or none of them). Plan is something like: - * add resolving/caching capabilities to fetch information on all relays - and distil whois entries to just what we care about (hosting provider - or ISP), by default updating the cache on a daily basis - * construct tarball and make this available for download rather than - fetching everything at each client - * possibly make these archives downloadable from peer relays (this is a - no-go for clients) via torrents or some dirport like scheme - * look at Vidalia and TorK for ideas - * need to solicit for ideas on what would be most helpful to clients - * dialog with bridge statuses (idea by mikeperry) - https://trac.vidalia-project.net/ticket/570 - https://trac.torproject.org/projects/tor/ticket/2068 - * menus - * http://gnosis.cx/publish/programming/charming_python_6.html ? - * additional options: - * make update rates configurable via the ui - * dialog with flag descriptions and other help - * menu with all torrc options (making them editable/toggleable) - * control port interpreter (interactive prompt) - Panel and startup option (-t maybe?) for providing raw control port - access along with usability improvements (piggybacking on the arm - connection): - * irc like help (ex "/help GETINFO" could provide a summary of - getinfo commands, partly using the results from - "GETINFO info/names") - * tab completion and up/down for previous commands - * warn and get confirmation if command would disrupt arm (for - instance 'SETEVENTS') - * 'safe' option that restricts to read-only access (start with this) - * issue sighup reset - * options for more deailed control of when bandwidth's contributed - https://trac.torproject.org/projects/tor/ticket/1730 - * make use of the new process/* GETINFO options - They'll be available in the next tor release, as per: - https://trac.torproject.org/projects/tor/ticket/2291 - * feature parity for arm's config values (armrc entries) - * editability - * parse descriptions from the man page? autogeneration of the man page from - something storing the descriptions - * handle mutiple tor instances - * screen style (dialog for switching between instances) - * extra window with whatever stats can be aggregated over all instances, - or a config option to aggregate stats for bw, resource usage, etc - * option to save the current settings to the config - * provide warning at startup if the armrc doesn't exist, with instructions - for generating it - * email alerts for changes to the relay's status, similar to tor-weather - * simple alert if tor shuts down - * accounting and alerts for if the bandwidth drops to zero - * daily/weekly/etc status reports - * log output, bandwidth history, etc - * graphic of the graphed bandwidth usage - * aggregated port usage for exits and country of origin for clients - * merge in and improve the consensus tracker - * tab completion for input fields that expect a filesystem path - * look through vidalia's tickets for more ideas - https://trac.vidalia-project.net/ - * look into additions to the used apis - * curses (python 2.6 extended?): http://docs.python.org/library/curses.html - * new control options (like "desc-annotations/id/<OR identity>")? - * look into better supporting hidden services (what could be useful here?) - * provide option for a consensus page - Shows full consensus with an interface similar to the connection panel. - For this Mike's ConsensusTracker would be helpful (though boost the - startup time by several seconds) - * splash screen when starting up to indicate that arm is loading, which - would be especially helpful when arm's taking a while to parse the man - page (idea by Sjon) - * show qos stats - Take a look at 'linux-tor-prio.sh' to see if any of the stats are - available and interesting. - * escaping function for uiTools' formatted strings - * provide an option for showing cpu usage on a per-core basis - This would be similar to top when you press 1, ie cpu0 X%, cpu1 Y%, etc. - This would help relay operators in checking system load (feature request - by Jordan) - * setup wizard for new relays - Setting the password and such for torrc generation. Maybe a netinstaller - that fetches the right package for the plagform, verifies signatures, etc? - Another alternative would be that when arm is started and tor isn't - running offer to start tor as a client, relay, or bridge. (idea by ioerror) - * audit what tor does - * Provide warnings if tor connections misbehaves, for instance: - * ensuring ExitPolicyRejectPrivate is being obeyed - * check that ExitPolicy violations don't occur (not possible yet since - not all relays aren't identified) - * check that all connections are properly related to a circuit, for - instance no outbound connections without a corresponding inbound (not - possible yet due to being unable to correlate connections to circuits) - * check file descriptors being accessed by tor to see if they're outside a - known pattern - * script that dumps relay stats to stdout - Derived from an idea by StrangeCharm. Django has a small terminal coloring - module that could be nice for formatting. Could possibly include: - * desc / ns information for our relay - * ps / netstat stats like load, uptime, and connection counts, etc - * implement control-spec proposals: - * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-cir… - * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… - * urwid improvements - Urwid (http://excess.org/urwid/) is an open source python library for - terminal applications. It provides a nicer interface, ideal for terminal - forms and some common UI elements. - - As I recall it isn't compatable with using curses directly, but checking - the library for interesting capabilities and code snippets could be very - helpful. For instance, the screenshots exemplify color support beyond the - 8 colors (RGB + CMYK) available with curses... *very* curious how they do - this and how widely higher color support is available! - * gui frontend (gtk?) - Look into if the arm utilities and codebase would fit nicely for a gui - controller like Vidalia and TorK. - * unit tests - Primarily for util, for instance 'addfstr' would be a good candidate. - * python 3 compatibility - Currently blocked on TorCtl support. - -- Release Checklist - 1. Run a sanity check over major changes: - - pylint --indent-string=" " --disable=C,R interface/foo.py | less - - double check __init__.py and README for added or removed files - 2. Revise the TODO (adding plans for the next release) - 3. Update release notes - - Spellcheck notes and copy them to the site (atagar.com/arm/log.php) - - Copy rendered release notes into the ChangeLog - 4. Check into release and upload the signed tarball - - svn co https://svn.torproject.org/svn/arm/ - - svn merge release trunk - - bump the version - - release/src/version.py - - resources/deb-prep.sh - - resources/build/debian/changelog - - svn commit -m "Arm release 1.4.1" - - note the commit number in the site log and ChangeLog - - svn export release arm - - copy the export and perform a final sanity check that it works - - tar cjf arm-1.4.1.0.tar.bz2 arm - - gpg --detach-sig --armor arm-1.4.1.0.tar.bz2 - - copy tarball and sig to the webserver (both to resources and static) - - update links and bump the release in download.php and index.php - - double check that there aren't any broken links - 5. Release notifications - - Log into https://blog.torproject.org/user/ - - Write a new blog post, example: - https://blog.torproject.org/blog/arm-release-141 - - Send an update to or-talk, example: - http://archives.seul.org/or/talk/Jan-2011/msg00096.html - 6. After a week bump package versions: - - Debian - Contact: weasel (Peter Palfrader) - Initial Release: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603056 - Update Instructions: - - update resources/build/debian/changelog - - ./resources/deb-prep.sh - - cd release_deb - - ./debian/make-deb - - copy the results to the webserver, example: - http://www.atagar.com/transfer/tmp/armBuild_12-7-10/ - - send the dsc link to weasel - - sign deb and copy that and sig for the download page - - - Red Hat - Contact: None - Update Instructions: - - update resources/build/redHat/MANIFEST - - ./resources/rpm-prep.sh - - cd release_rpm - - ./debian/make-rpm - - copy the results to the webserver - - sign rpm and copy that and sig for the download page - - - Gentoo - Contact: NightMonkey (Jesse Adelman) - Initial Release: https://bugs.gentoo.org/show_bug.cgi?id=341731 - Update Instructions: - - go to https://bugs.gentoo.org - - make a generic bug with "net-misc/arm-X.X.X version bump, please" - - - ArchLinux - Contact: Spider.007 - Initial Release: http://aur.archlinux.org/packages.php?ID=44172 - Update Instructions: - - go to aur.archlinux.org - - select "Out-of-date" for the package -

1 0