tor-commits April 2011

tor-commits@lists.torproject.org

18 participants
883 discussions

r24545: {arm} Last change accidently broke torrc validation - fixing this. (in arm/trunk/src: interface util)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 06:12:59 +0000 (Sun, 03 Apr 2011) New Revision: 24545 Modified: arm/trunk/src/interface/controller.py arm/trunk/src/util/torConfig.py Log: Last change accidently broke torrc validation - fixing this. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-03 05:55:58 UTC (rev 24544) +++ arm/trunk/src/interface/controller.py 2011-04-03 06:12:59 UTC (rev 24545) @@ -1675,7 +1675,7 @@ # display a popup for saving the current configuration panel.CURSES_LOCK.acquire() try: - configLines = torConfig.getCustomOptions() + configLines = torConfig.getCustomOptions(True) # lists event types popup = panels["popup"] Modified: arm/trunk/src/util/torConfig.py =================================================================== --- arm/trunk/src/util/torConfig.py 2011-04-03 05:55:58 UTC (rev 24544) +++ arm/trunk/src/util/torConfig.py 2011-04-03 06:12:59 UTC (rev 24545) @@ -351,9 +351,13 @@ return tuple(MULTILINE_PARAM) -def getCustomOptions(): +def getCustomOptions(includeValue = False): """ Provides the torrc parameters that differ from their defaults. + + Arguments: + includeValue - provides the current value with results if true, otherwise + this just contains the options """ configText = torTools.getConn().getInfo("config-text", "").strip() @@ -370,7 +374,8 @@ try: configLines.remove("Log notice stdout") except ValueError: pass - return configLines + if includeValue: return configLines + else: return [line[:line.find(" ")] for line in configLines] def validate(contents = None): """

1 0

r24544: {arm} Dropping the pointless "Log notice stdout" config-text entry (in arm/trunk/src: interface util)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 05:55:58 +0000 (Sun, 03 Apr 2011) New Revision: 24544 Modified: arm/trunk/src/interface/controller.py arm/trunk/src/util/torConfig.py Log: Dropping the pointless "Log notice stdout" config-text entry when writting the custom torrc. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-03 05:23:06 UTC (rev 24543) +++ arm/trunk/src/interface/controller.py 2011-04-03 05:55:58 UTC (rev 24544) @@ -1675,8 +1675,7 @@ # display a popup for saving the current configuration panel.CURSES_LOCK.acquire() try: - configText = torTools.getConn().getInfo("config-text", "").strip() - configLines = configText.split("\n") + configLines = torConfig.getCustomOptions() # lists event types popup = panels["popup"] @@ -1774,7 +1773,7 @@ # saves the configuration to the file configFile = open(configLocation, "w") - configFile.write(configText) + configFile.write("\n".join(configLines)) configFile.close() # reloads the cached torrc if overwriting it Modified: arm/trunk/src/util/torConfig.py =================================================================== --- arm/trunk/src/util/torConfig.py 2011-04-03 05:23:06 UTC (rev 24543) +++ arm/trunk/src/util/torConfig.py 2011-04-03 05:55:58 UTC (rev 24544) @@ -353,17 +353,24 @@ def getCustomOptions(): """ - Provides the set of torrc parameters that differ from their defaults. + Provides the torrc parameters that differ from their defaults. """ - customOptions, conn = set(), torTools.getConn() - configTextQuery = conn.getInfo("config-text", "").strip().split("\n") + configText = torTools.getConn().getInfo("config-text", "").strip() + configLines = configText.split("\n") - for entry in configTextQuery: - # tor provides a Log entry even if it matches the default - if entry != "Log notice stdout": - customOptions.add(entry[:entry.find(" ")]) - return customOptions + # removes any duplicates + 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: + # https://trac.torproject.org/projects/tor/ticket/2362 + + try: configLines.remove("Log notice stdout") + except ValueError: pass + + return configLines def validate(contents = None): """

1 0

r24543: {arm} Correcting page numbering for when either the new and/or old (arm/trunk/src/interface)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 05:23:06 +0000 (Sun, 03 Apr 2011) New Revision: 24543 Modified: arm/trunk/src/interface/controller.py Log: Correcting page numbering for when either the new and/or old connection panel aren't being displayed. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-03 05:04:10 UTC (rev 24542) +++ arm/trunk/src/interface/controller.py 2011-04-03 05:23:06 UTC (rev 24543) @@ -120,7 +120,11 @@ currentPage = self.page pageCount = len(PAGES) - if self.isBlindMode: + if not CONFIG["features.connection.newPanel"]: + if currentPage >= 3: currentPage -= 1 + pageCount -= 1 + + if self.isBlindMode or not CONFIG["features.connection.oldPanel"]: if currentPage >= 2: currentPage -= 1 pageCount -= 1

1 0

r24542: {arm} Fetching the exit policy from the consensus if available, an (arm/trunk/src/interface/connections)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 05:04:10 +0000 (Sun, 03 Apr 2011) New Revision: 24542 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Fetching the exit policy from the consensus if available, and otherwise falls back to the descriptor. Without this arm was encountering a parsing error with older Tor versions (encountered on 0.2.1.29). Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-03 04:16:00 UTC (rev 24541) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-03 05:04:10 UTC (rev 24542) @@ -702,14 +702,32 @@ _, nickname, _, _, pubDate, pubTime, _, orPort, dirPort = firstLineComp[:9] else: nickname, pubDate, pubTime, orPort, dirPort = "", "", "", "", "" - flags = nsLines[1][2:] - microExit = nsLines[3][2:] + flags = "unknown" + if len(nsLines) >= 2 and nsLines[1].startswith("s "): + flags = nsLines[1][2:] + # The network status exit policy doesn't exist for older tor versions. + # If unavailble we'll need the full exit policy which is on the + # descriptor (if that's available). + + exitPolicy = "unknown" + if len(nsLines) >= 4 and nsLines[3].startswith("p "): + exitPolicy = nsLines[3][2:].replace(",", ", ") + elif descEntry: + # the descriptor has an individual line for each entry in the exit policy + exitPolicyEntries = [] + + for line in descEntry.split("\n"): + if line.startswith("accept") or line.startswith("reject"): + exitPolicyEntries.append(line.strip()) + + exitPolicy = ", ".join(exitPolicyEntries) + dirPortLabel = "" if dirPort == "0" else "dirport: %s" % dirPort lines[2] = "nickname: %-25s orport: %-10s %s" % (nickname, orPort, dirPortLabel) lines[3] = "published: %s %s" % (pubDate, pubTime) lines[4] = "flags: %s" % flags.replace(" ", ", ") - lines[5] = "exit policy: %s" % microExit.replace(",", ", ") + lines[5] = "exit policy: %s" % exitPolicy if descEntry: torVersion, platform, contact = "", "", ""

1 0

r24541: {arm} Only flagging inbound connections as possibly being private (arm/trunk/src/interface/connections)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 04:16:00 +0000 (Sun, 03 Apr 2011) New Revision: 24541 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Only flagging inbound connections as possibly being private if we're a guard or bridge. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-03 04:00:48 UTC (rev 24540) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-03 04:16:00 UTC (rev 24541) @@ -361,12 +361,13 @@ myType = self.getType() if myType == Category.INBOUND: - # if the connection doesn't belong to a known relay then it might be - # client traffic + # if we're a guard or bridge and the connection doesn't belong to a + # known relay then it might be client traffic conn = torTools.getConn() - allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True) - return allMatches == [] + if "Guard" in conn.getMyFlags() or conn.getOption("BridgeRelay") == "1": + allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True) + return allMatches == [] elif myType == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our # resolvers). Everything else, however, is.

1 0

r24540: {arm} Giving a warning and prematurely aborting geoip lookups when (in arm/trunk: . src/util)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 04:00:48 +0000 (Sun, 03 Apr 2011) New Revision: 24540 Modified: arm/trunk/armrc.sample arm/trunk/src/util/torTools.py Log: Giving a warning and prematurely aborting geoip lookups when the database is unavailble. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-04-02 23:51:15 UTC (rev 24539) +++ arm/trunk/armrc.sample 2011-04-03 04:00:48 UTC (rev 24540) @@ -271,6 +271,7 @@ log.cursesColorSupport INFO log.bsdJailFound INFO log.unknownBsdJailId WARN +log.geoipUnavailable WARN log.stats.failedProcResolution DEBUG log.stats.procResolutionFailover INFO log.stats.failedPsResolution INFO Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 23:51:15 UTC (rev 24539) +++ arm/trunk/src/util/torTools.py 2011-04-03 04:00:48 UTC (rev 24540) @@ -90,6 +90,10 @@ "NS": "information related to the consensus will grow stale", "NEWCONSENSUS": "information related to the consensus will grow stale"} +# number of sequential attempts before we decide that the Tor geoip database +# is unavailable +GEOIP_FAILURE_THRESHOLD = 5 + # provides int -> str mappings for torctl event runlevels TORCTL_RUNLEVELS = dict([(val, key) for (key, val) in TorUtil.loglevels.items()]) @@ -310,6 +314,9 @@ # directs TorCtl to notify us of events TorUtil.logger = self TorUtil.loglevel = "DEBUG" + + # tracks the number of sequential geoip lookup failures + self.geoipFailureCount = 0 def init(self, conn=None): """ @@ -445,6 +452,8 @@ self.connLock.acquire() + isGeoipRequest = param.startswith("ip-to-country/") + # checks if this is an arg caching covers isCacheArg = param in CACHE_ARGS @@ -462,13 +471,23 @@ if isCacheArg and cachedValue: result = cachedValue isFromCache = True + elif isGeoipRequest and self.geoipFailureCount == GEOIP_FAILURE_THRESHOLD: + # 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 except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed), exc: if type(exc) == TorCtl.TorCtlClosed: self.close() raisedExc = exc + + if isGeoipRequest: + self.geoipFailureCount += 1 + + if self.geoipFailureCount == GEOIP_FAILURE_THRESHOLD: + log.log(CONFIG["log.geoipUnavailable"], "Tor geoip database is unavailable.") if isCacheArg and result and not isFromCache: self._cachedParam[param] = result

1 0

r24539: {arm} Correcting a horrible caching error causing most GETINFO que (arm/trunk/src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 23:51:15 +0000 (Sat, 02 Apr 2011) New Revision: 24539 Modified: arm/trunk/src/util/torTools.py Log: Correcting a horrible caching error causing most GETINFO queries to be inadvertantly persisted. Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 23:00:11 UTC (rev 24538) +++ arm/trunk/src/util/torTools.py 2011-04-02 23:51:15 UTC (rev 24539) @@ -56,7 +56,7 @@ "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") -CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/") +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

1 0

r24538: {arm} Freezing connection display when tor stops. (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 23:00:11 +0000 (Sat, 02 Apr 2011) New Revision: 24538 Modified: arm/trunk/src/interface/connections/connPanel.py Log: Freezing connection display when tor stops. Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-02 22:42:48 UTC (rev 24537) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-02 23:00:11 UTC (rev 24538) @@ -54,6 +54,7 @@ self._showDetails = False # presents the details panel if true self._lastUpdate = -1 # time the content was last revised + self._isTorRunning = True # indicates if tor is currently running or not self._isPaused = True # prevents updates if true self._pauseTime = None # time when the panel was paused self._halt = False # terminates thread if true @@ -77,7 +78,27 @@ for entry in self._entries: if isinstance(entry, connEntry.ConnectionEntry): entry.getLines()[0].isInitialConnection = True + + # listens for when tor stops so we know to stop reflecting changes + torTools.getConn().addStatusListener(self.torStateListener) + def torStateListener(self, conn, eventType): + """ + Freezes the connection contents when Tor stops. + + Arguments: + conn - tor controller + eventType - type of event detected + """ + + self._isTorRunning = eventType == torTools.State.INIT + + if self._isPaused or not self._isTorRunning: + if not self._pauseTime: self._pauseTime = time.time() + else: self._pauseTime = None + + self.redraw(True) + def setPaused(self, isPause): """ If true, prevents the panel from updating. @@ -86,7 +107,8 @@ if not self._isPaused == isPause: self._isPaused = isPause - if isPause: self._pauseTime = time.time() + if isPause or not self._isTorRunning: + if not self._pauseTime: self._pauseTime = time.time() else: self._pauseTime = None # redraws so the display reflects any changes between the last update @@ -151,7 +173,7 @@ while not self._halt: currentTime = time.time() - if self._isPaused or currentTime - lastDraw < self._config["features.connection.refreshRate"]: + if self._isPaused or not self._isTorRunning or currentTime - lastDraw < self._config["features.connection.refreshRate"]: self._cond.acquire() if not self._halt: self._cond.wait(0.2) self._cond.release()

1 0

r24537: {arm} Connection reordering, putting them in logical groupings (re (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 22:42:48 +0000 (Sat, 02 Apr 2011) New Revision: 24537 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Connection reordering, putting them in logical groupings (relay, client, other) Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 22:10:13 UTC (rev 24536) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 22:42:48 UTC (rev 24537) @@ -13,16 +13,17 @@ # Inbound Relay connection, coming to us. # Outbound Relay connection, leaving us. # Exit Outbound relay connection leaving the Tor network. -# Client Circuits for our client traffic. -# Program Socks connections for applications using Tor. +# Hidden Connections to a hidden service we're providing. +# Socks Socks connections for applications using Tor. +# Circuit Circuits our tor client has created. # Directory Fetching tor consensus information. # Control Tor controller (arm, vidalia, etc). -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CIRCUIT", "DIRECTORY", "SOCKS", "HIDDEN", "CONTROL") +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "HIDDEN", "SOCKS", "CIRCUIT", "DIRECTORY", "CONTROL") CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", - Category.EXIT: "red", Category.CIRCUIT: "cyan", - Category.DIRECTORY: "magenta", Category.SOCKS: "yellow", - Category.HIDDEN: "magenta", Category.CONTROL: "red"} + Category.EXIT: "red", Category.HIDDEN: "magenta", + Category.SOCKS: "yellow", Category.CIRCUIT: "cyan", + Category.DIRECTORY: "magenta", Category.CONTROL: "red"} # static data for listing format # <src> --> <dst> <etc><padding>

1 0

r24536: {arm} Alignment fixes for the circ entries. (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 22:10:13 +0000 (Sat, 02 Apr 2011) New Revision: 24536 Modified: arm/trunk/src/interface/connections/circEntry.py Log: Alignment fixes for the circ entries. Modified: arm/trunk/src/interface/connections/circEntry.py =================================================================== --- arm/trunk/src/interface/connections/circEntry.py 2011-04-02 21:54:34 UTC (rev 24535) +++ arm/trunk/src/interface/connections/circEntry.py 2011-04-02 22:10:13 UTC (rev 24536) @@ -127,7 +127,8 @@ for i in range(len(etcAttr), -1, -1): etcLabel = ", ".join(etcAttr[:i]) - if len(etcLabel) <= width: return etcLabel + if len(etcLabel) <= width: + return ("%%-%is" % width) % etcLabel return "" @@ -202,8 +203,8 @@ dst = "%-55s" % self.foreign.getFingerprint() etc = self.getEtcContent(width - baselineSpace - len(dst), listingType) else: - # min space for the nickname is 50 characters - etc = self.getEtcContent(width - baselineSpace - 50, listingType) + # min space for the nickname is 56 characters + etc = self.getEtcContent(width - baselineSpace - 56, listingType) dstLayout = "%%-%is" % (width - baselineSpace - len(etc)) dst = dstLayout % self.foreign.getNickname()

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2011