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 … [View More]

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/… [View More]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): """ [View Less]

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:… [View More]

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/… [View More]

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/… [View More]

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 @@… [View More] 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 [View Less]

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,… [View More]

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 … [View More]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() [View Less]

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/… [View More]

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) … [View More]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2011