- tor-commits - lists.torproject.org

[arm/release] Dropping locales when geoip db is unavailable
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1161a6a6e72dff62fe019b9d15cc0943958359f7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 25 19:13:43 2011 -0700 Dropping locales when geoip db is unavailable Previously the connection panel showed '??' for all locales when the geoip database was unavailable. Dropping these entries from the interface entirely instead. --- src/interface/connections/connEntry.py | 3 ++- src/util/torTools.py | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py index f613fc2..e6c0d92 100644 --- a/src/interface/connections/connEntry.py +++ b/src/interface/connections/connEntry.py @@ -824,8 +824,9 @@ class ConnectionLine(entries.ConnectionPanelLine): dstAddress += " (%s)" % purpose elif not connections.isIpAddressPrivate(self.foreign.getIpAddr()): extraInfo = [] + conn = torTools.getConn() - if includeLocale: + if includeLocale and not conn.isGeoipUnavailable(): foreignLocale = self.foreign.getLocale("??") extraInfo.append(foreignLocale) spaceAvailable -= len(foreignLocale) + 2 diff --git a/src/util/torTools.py b/src/util/torTools.py index 31a7061..0eebd20 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -474,19 +474,19 @@ class Controller(TorCtl.PostEventListener): if isCacheArg and cachedValue: result = cachedValue isFromCache = True - elif isGeoipRequest and self.geoipFailureCount == GEOIP_FAILURE_THRESHOLD: + elif isGeoipRequest and self.isGeoipUnavailable(): # the geoip database aleady looks to be unavailable - abort the request raisedExc = TorCtl.ErrorReply("Tor geoip database is unavailable.") else: try: getInfoVal = self.conn.get_info(param)[param] if getInfoVal != None: result = getInfoVal - if isGeoipRequest: self.geoipFailureCount = 0 + if isGeoipRequest: self.geoipFailureCount = -1 except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed), exc: if type(exc) == TorCtl.TorCtlClosed: self.close() raisedExc = exc - if isGeoipRequest: + if isGeoipRequest and not self.geoipFailureCount == -1: self.geoipFailureCount += 1 if self.geoipFailureCount == GEOIP_FAILURE_THRESHOLD: @@ -833,6 +833,14 @@ class Controller(TorCtl.PostEventListener): return result + def isGeoipUnavailable(self): + """ + Provides true if we've concluded that our geoip database is unavailable, + false otherwise. + """ + + return self.geoipFailureCount == GEOIP_FAILURE_THRESHOLD + def getMyPid(self): """ Provides the pid of the attached tor process (None if no controller exists

1 0

[arm/release] fix: minor commenting correction on lsof results
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e4bf17a30fbeaa24f6980476ceb8e1a51ad0ba62 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 26 08:55:19 2011 -0700 fix: minor commenting correction on lsof results A previous commit noted that lsof queries return itself in the results, so correcting the comment on this. --- src/util/torTools.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index f4a29af..5d8ffd8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -225,8 +225,8 @@ def getPid(controlPort=9051, pidFilePath=None): try: results = sysTools.call("lsof -wnPi | egrep \"^tor.*:%i\"" % controlPort) - # This can result in multiple entries with the same pid (maybe from the - # query itself?). Checking all lines to see if they have the same pid. + # This can result in multiple entries with the same pid (from the query + # itself). Checking all lines to see if they're in agreement about the pid. if results: pid = ""

1 0

[arm/release] fix: Workaround for autogenerated Nickname config
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9b653e81ba24b154510e8fc39222de5c96478bc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 24 12:21:34 2011 -0700 fix: Workaround for autogenerated Nickname config As discussed in ticket 2362 (https://trac.torproject.org/projects/tor/ticket/2362) the "GETINFO config-text" results provide an autogenerated Nickname field if running as a relay and one wasn't provided. --- src/util/torConfig.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 2e70f5a..030a169 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -3,6 +3,7 @@ Helper functions for working with tor's configuration file. """ import os +import socket import threading from util import enum, log, sysTools, torTools, uiTools @@ -367,13 +368,16 @@ def getCustomOptions(includeValue = False): configLines = list(set(configLines)) # The "GETINFO config-text" query only provides options that differ - # from Tor's defaults with the exception of its Log entry which, even - # if undefined, returns "Log notice stdout" as per: + # from Tor's defaults with the exception of its Log and Nickname entries + # which, even if undefined, returns "Log notice stdout" as per: # https://trac.torproject.org/projects/tor/ticket/2362 try: configLines.remove("Log notice stdout") except ValueError: pass + try: configLines.remove("Nickname %s" % socket.gethostname()) + except ValueError: pass + if includeValue: return configLines else: return [line[:line.find(" ")] for line in configLines]

1 0

[arm/release] Making lsof the sole connection resolver on macs
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit cd6a6873e753fa4497250ab1c5c332f3e6fe86cf Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 25 19:21:56 2011 -0700 Making lsof the sole connection resolver on macs On macs connection resolver detection from the path isn't working, and aparently only lsof is available. This results in us trying (and failing) all of the other resolvers before falling back to something that works. This drops us straight to using lsof on macs. --- src/util/connections.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/util/connections.py b/src/util/connections.py index a797e7b..f632306 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -337,6 +337,8 @@ def getSystemResolvers(osType = None): if osType == "FreeBSD": resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] + elif osType == "Darwin": + resolvers = [Resolver.LSOF] else: resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS]

1 0

[arm/release] fix: Missing configuration key for missing geoip
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 36512bdc7608db5f225e58926ac0b5f383f6b026 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 25 18:51:13 2011 -0700 fix: Missing configuration key for missing geoip This causes a crashing error when the Tor geoip file is unavailable, and locales are queried. --- src/util/torTools.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index b5913ed..31a7061 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -82,7 +82,8 @@ CONFIG = {"torrc.map": {}, "log.torSetConf": log.INFO, "log.torPrefixPathInvalid": log.NOTICE, "log.bsdJailFound": log.INFO, - "log.unknownBsdJailId": log.WARN} + "log.unknownBsdJailId": log.WARN, + "log.geoipUnavailable": log.WARN} # events used for controller functionality: # NOTICE - used to detect when tor is shut down

1 0

[arm/release] PID resolution fallbacks by ps and lsof
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit c62e15023f3f6fe791a5f6fc21f070c6e8f857fb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 25 19:52:07 2011 -0700 PID resolution fallbacks by ps and lsof On Macs all of the current pid resolution tactics fails, so adding a couple more that work on that platform. --- src/util/torTools.py | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 0eebd20..08b04c0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -122,6 +122,8 @@ def getPid(controlPort=9051, pidFilePath=None): 4. "netstat -npl | grep 127.0.0.1:%s" % <tor control port> 5. "ps -o pid -C tor" 6. "sockstat -4l -P tcp -p %i | grep tor" % <tor control port> + 7. "ps axc | egrep \" tor$\"" + 8. "lsof -wnPi | egrep \"^tor.*:%i\"" % <tor control port> If pidof or ps provide multiple tor instances then their results are discarded (since only netstat can differentiate using the control port). This @@ -201,6 +203,32 @@ def getPid(controlPort=9051, pidFilePath=None): if pid.isdigit(): return pid except IOError: pass + # attempts to resolve via a ps command that works on the mac (this and lsof + # are the only resolvers to work on that platform). This fails if: + # - tor's running under a different name + # - there's multiple instances of tor + + try: + results = sysTools.call("ps axc | egrep \" tor$\"") + if len(results) == 1 and len(results[0].split()) > 0: + pid = results[0].split()[0] + if pid.isdigit(): return pid + except IOError: pass + + # attempts to resolve via lsof - this should work on linux, mac, and bsd - + # this fails if: + # - tor's running under a different name + # - tor's being run as a different user due to permissions + # - there are multiple instances of Tor, using the + # same control port on different addresses. + + try: + results = sysTools.call("lsof -wnPi | egrep \"^tor.*:%i\"" % controlPort) + if len(results) == 1 and len(results[0].split()) > 1: + pid = results[0].split()[1] + if pid.isdigit(): return pid + except IOError: pass + return None def getBsdJailId():

1 0

[arm/release] fix: Accounting for multiple results from lsof
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 12077adddb88f1a2e7ae2f8e0078c54ce3e70fd2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 26 08:32:50 2011 -0700 fix: Accounting for multiple results from lsof When querying lsof from the python process this can provide multiple results with the same pid. The second is from the lsof query itself (this was observed with an earlier change for querying our own process). Accounting for this by checking all pid results from the query to see if they're in agreement. --- src/util/torTools.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 08b04c0..f4a29af 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -224,8 +224,20 @@ def getPid(controlPort=9051, pidFilePath=None): try: results = sysTools.call("lsof -wnPi | egrep \"^tor.*:%i\"" % controlPort) - if len(results) == 1 and len(results[0].split()) > 1: - pid = results[0].split()[1] + + # This can result in multiple entries with the same pid (maybe from the + # query itself?). Checking all lines to see if they have the same pid. + + if results: + pid = "" + + for line in results: + lineComp = line.split() + + if len(lineComp) >= 2 and (not pid or lineComp[1] == pid): + pid = lineComp[1] + else: raise IOError + if pid.isdigit(): return pid except IOError: pass

1 0

[arm/release] Separating inital BW totals into separate params
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b4ea3bd612d54ff1e33c4b52d4982ccfc207d9fb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:34:31 2011 -0700 Separating inital BW totals into separate params Mixing the bandwidth totals fetched from Tor with the GraphStats param caused the average measurement to be skewed. Separating this total into a parameter just used for the total label. --- armrc.sample | 4 ---- src/interface/graphing/bandwidthStats.py | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/armrc.sample b/armrc.sample index 11b62ea..4cda197 100644 --- a/armrc.sample +++ b/armrc.sample @@ -140,9 +140,6 @@ features.graph.showIntermediateBounds true # prepopulate # attempts to use tor's state file to prepopulate the bandwidth graph at the # 15-minute interval (this requires the minimum of a day's worth of uptime) -# prepopulateTotal -# populates the total stat from the state file if true (this only contains -# the last day's worth of information, so this metric isn't the true total) # transferInBystes # shows rate measurments in bytes if true, bits otherwise # accounting.show @@ -153,7 +150,6 @@ features.graph.showIntermediateBounds true # provides verbose measurements of time if true features.graph.bw.prepopulate true -features.graph.bw.prepopulateTotal false features.graph.bw.transferInBytes false features.graph.bw.accounting.show true features.graph.bw.accounting.rate 10 diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 70a1e16..f8e3020 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -60,19 +60,18 @@ class BandwidthStats(graphPanel.GraphStats): # https://trac.torproject.org/projects/tor/ticket/2345 # # further updates are still handled via BW events to avoid unnecessary - # GETINFO requests. This needs to update the pause buffer too because - # instances start paused, causing the primary value to be clobbered once - # just after initalization. + # GETINFO requests. + + self.initialPrimaryTotal = 0 + self.initialSecondaryTotal = 0 readTotal = conn.getInfo("traffic/read") if readTotal and readTotal.isdigit(): - self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB - self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + self.initialPrimaryTotal = int(readTotal) / 1024 # Bytes -> KB writeTotal = conn.getInfo("traffic/written") if writeTotal and writeTotal.isdigit(): - self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB - self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 + self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed @@ -346,6 +345,7 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal + total += self.initialPrimaryTotal if isPrimary else self.initialSecondaryTotal return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/release] Initializing bandwidth totals from Tor when able
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 301085e92801173d884e8a1282539282331244d8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:24:55 2011 -0700 Initializing bandwidth totals from Tor when able Ticket 2345 (https://trac.torproject.org/projects/tor/ticket/2345) introduced GETINFO options for the total read and written bandwidth values. If these are available then they're used to populate the total values in arm. --- src/interface/graphing/bandwidthStats.py | 19 +++++++++++++++++++ src/settings.cfg | 4 ++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 1955465..3f34e3c 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -55,6 +55,25 @@ class BandwidthStats(graphPanel.GraphStats): self._titleStats, self.isAccounting = [], False self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) + + # Initialized the bandwidth totals to the values reported by Tor. This + # uses a controller options introduced in ticket 2345: + # https://trac.torproject.org/projects/tor/ticket/2345 + # + # further updates are still handled via BW events to avoid unnecessary + # GETINFO requests. This needs to update the pause buffer too because + # instances start paused, causing the primary value to be clobbered once + # just after initalization. + + readTotal = conn.getInfo("traffic/read") + if readTotal and readTotal.isdigit(): + self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB + self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + + writeTotal = conn.getInfo("traffic/written") + if writeTotal and writeTotal.isdigit(): + self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB + self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed diff --git a/src/settings.cfg b/src/settings.cfg index 0e0e395..1ee63a1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -273,6 +273,8 @@ config.summary.TestingEstimatedDescriptorPropagationTime delay before clients at # [ARM_DEBUG] recreating panel 'graph' with the dimensions of 14/124 # [ARM_DEBUG] redrawing the log panel with the corrected content height (estimat was off by 4) # [ARM_DEBUG] GETINFO accounting/bytes-left (runtime: 0.0006) +# [ARM_DEBUG] GETINFO traffic/read (runtime: 0.0004) +# [ARM_DEBUG] GETINFO traffic/written (runtime: 0.0002) # [ARM_DEBUG] GETCONF MyFamily (runtime: 0.0007) # [ARM_DEBUG] Unable to query process resource usage from ps, waiting 6.25 seconds (unrecognized output from ps: ...) @@ -311,6 +313,8 @@ msg.ARM_DEBUG GETINFO accounting/bytes msg.ARM_DEBUG GETINFO accounting/bytes-left msg.ARM_DEBUG GETINFO accounting/interval-end msg.ARM_DEBUG GETINFO accounting/hibernating +msg.ARM_DEBUG GETINFO traffic/read +msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps

1 0

[arm/release] Ignoring vim temporary swap files
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b38cd993ee6d717372f479329236a7ab0a019f79 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:22:17 2011 -0700 Ignoring vim temporary swap files --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9b955dd..6377435 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc src/TorCtl/ +*.swp

1 0