- tor-commits - lists.torproject.org

[arm/master] fix: graph panel can overlap after reconnect
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 4793494447312e0ef1bbb33c2d82948362b129b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 09:40:48 2011 -0700 fix: graph panel can overlap after reconnect If having accounting stats changes from one tor instance to the next then the graph panel's size can change, causing overlap with the log panel for a few seconds. --- src/cli/graphing/bandwidthStats.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 642790d..f1891f9 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -6,6 +6,8 @@ stats if they're set. import time import curses +import cli.controller + from cli.graphing import graphPanel from util import log, sysTools, torTools, uiTools @@ -87,7 +89,13 @@ class BandwidthStats(graphPanel.GraphStats): self.new_desc_event(None) # updates title params if eventType in (torTools.State.INIT, torTools.State.RESET) and self._config["features.graph.bw.accounting.show"]: - self.isAccounting = conn.getInfo('accounting/enabled') == '1' + isAccountingEnabled = conn.getInfo('accounting/enabled') == '1' + + if isAccountingEnabled != self.isAccounting: + self.isAccounting = isAccountingEnabled + + # redraws the whole screen since our height changed + cli.controller.getController().requestRedraw(True) # redraws to reflect changes (this especially noticeable when we have # accounting and shut down since it then gives notice of the shutdown)

1 0

[arm/master] fix: repopulating log panel when on tor init
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 96e46cbfa76c479da428762d046ab7300a78d338 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 21:55:59 2011 -0700 fix: repopulating log panel when on tor init When connecting to a new tor instance the log panel is now clearing itself and repopulating with the event backlog. This keeps all arm events, and mixes them with the events of the tor log file. This is helpful since it means that we'll display the events that occurred during initialization. --- src/cli/logPanel.py | 94 +++++++++++++++++++++++++++++++------------------- 1 files changed, 58 insertions(+), 36 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 9ea4ecb..6da0901 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -619,47 +619,14 @@ class LogPanel(panel.Panel, threading.Thread): self._titleCache = None self._titleArgs = (None, None, None) - # fetches past tor events from log file, if available - torEventBacklog = [] - if self._config["features.log.prepopulate"]: - setRunlevels = list(set.intersection(set(self.loggedEvents), set(log.Runlevel.values()))) - readLimit = self._config["features.log.prepopulateReadLimit"] - addLimit = self._config["cache.logPanel.size"] - torEventBacklog = getLogFileEntries(setRunlevels, readLimit, addLimit, self._config) - - # adds arm listener and fetches past events + # adds arm listener and prepopulates log with past tor/arm events log.LOG_LOCK.acquire() try: - armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] - log.addListeners(armRunlevels, self._registerArmEvent) - - # gets the set of arm events we're logging - setRunlevels = [] - for i in range(len(armRunlevels)): - if "ARM_" + log.Runlevel.values()[i] in self.loggedEvents: - setRunlevels.append(armRunlevels[i]) - - armEventBacklog = [] - for level, msg, eventTime in log._getEntries(setRunlevels): - armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) - armEventBacklog.insert(0, armEventEntry) - - # joins armEventBacklog and torEventBacklog chronologically into msgLog - while armEventBacklog or torEventBacklog: - if not armEventBacklog: - self.msgLog.append(torEventBacklog.pop(0)) - elif not torEventBacklog: - self.msgLog.append(armEventBacklog.pop(0)) - elif armEventBacklog[0].timestamp < torEventBacklog[0].timestamp: - self.msgLog.append(torEventBacklog.pop(0)) - else: - self.msgLog.append(armEventBacklog.pop(0)) + log.addListeners(log.Runlevel.values(), self._registerArmEvent) + self.reprepopulateEvents() finally: log.LOG_LOCK.release() - # crops events that are either too old, or more numerous than the caching size - self._trimEvents(self.msgLog) - # leaving lastContentHeight as being too low causes initialization problems self.lastContentHeight = len(self.msgLog) @@ -667,6 +634,7 @@ class LogPanel(panel.Panel, threading.Thread): conn = torTools.getConn() conn.addEventListener(TorEventObserver(self.registerEvent)) conn.addTorCtlListener(self._registerTorCtlEvent) + conn.addStatusListener(self._resetListener) # opens log file if we'll be saving entries if self._config["features.logFile"]: @@ -683,6 +651,52 @@ class LogPanel(panel.Panel, threading.Thread): log.log(self._config["log.logPanel.logFileWriteFailed"], "Unable to write to log file: %s" % sysTools.getFileErrorMsg(exc)) self.logFile = None + def reprepopulateEvents(self): + """ + Clears the event log and repopulates it from the arm and tor backlogs. + """ + + self.valsLock.acquire() + + # clears the event log + self.msgLog = [] + + # fetches past tor events from log file, if available + torEventBacklog = [] + if self._config["features.log.prepopulate"]: + setRunlevels = list(set.intersection(set(self.loggedEvents), set(log.Runlevel.values()))) + readLimit = self._config["features.log.prepopulateReadLimit"] + addLimit = self._config["cache.logPanel.size"] + torEventBacklog = getLogFileEntries(setRunlevels, readLimit, addLimit, self._config) + + # gets the set of arm events we're logging + setRunlevels = [] + armRunlevels = log.Runlevel.values() + for i in range(len(armRunlevels)): + if "ARM_" + log.Runlevel.values()[i] in self.loggedEvents: + setRunlevels.append(armRunlevels[i]) + + armEventBacklog = [] + for level, msg, eventTime in log._getEntries(setRunlevels): + armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) + armEventBacklog.insert(0, armEventEntry) + + # joins armEventBacklog and torEventBacklog chronologically into msgLog + while armEventBacklog or torEventBacklog: + if not armEventBacklog: + self.msgLog.append(torEventBacklog.pop(0)) + elif not torEventBacklog: + self.msgLog.append(armEventBacklog.pop(0)) + elif armEventBacklog[0].timestamp < torEventBacklog[0].timestamp: + self.msgLog.append(torEventBacklog.pop(0)) + else: + self.msgLog.append(armEventBacklog.pop(0)) + + # crops events that are either too old, or more numerous than the caching size + self._trimEvents(self.msgLog) + + self.valsLock.release() + def setDuplicateVisability(self, isVisible): """ Sets if duplicate log entries are collaped or expanded. @@ -1159,6 +1173,14 @@ class LogPanel(panel.Panel, threading.Thread): self._cond.notifyAll() self._cond.release() + def _resetListener(self, _, eventType): + # if we're attaching to a new tor instance then clears the log and + # prepopulates it with the content belonging to this instance + + if eventType == torTools.State.INIT: + self.reprepopulateEvents() + self.redraw(True) + def _getTitle(self, width): """ Provides the label used for the panel, looking like:

1 0

[arm/master] Using extra config panel width for values
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit fa77ada821231a50426185f23a27254d7e18c475 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 09:48:31 2011 -0700 Using extra config panel width for values When the configuration panel has enough space to show the whole summaries using the extra space for the value column instead. --- src/cli/configPanel.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index d76a528..e4a48fc 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -528,6 +528,12 @@ class ConfigPanel(panel.Panel): valueWidth = self._config["features.config.state.colWidth.value"] descriptionWidth = max(0, width - scrollOffset - optionWidth - valueWidth - 2) + # if the description column is overly long then use its space for the + # value instead + if descriptionWidth > 80: + valueWidth += descriptionWidth - 80 + descriptionWidth = 80 + for lineNum in range(scrollLoc, len(self._getConfigOptions())): entry = self._getConfigOptions()[lineNum] drawLine = lineNum + detailPanelHeight + 1 - scrollLoc

1 0

[arm/master] Logging that exit notice has US sepecific sections
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 88cb9113f8853f83289f487f2fcbedee4e008777 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:09:29 2011 -0700 Logging that exit notice has US sepecific sections The exit notice has US specific sections with a "FIXME" tag to informing wizard users so they can fix this. --- src/cli/wizard.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6caf490..8f3d0d1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -354,6 +354,10 @@ def showWizard(): if not os.path.exists(dst): shutil.copytree(src, dst) + + # providing a notice that it has sections specific to us operators + msg = "Exit notice placed at '%s/index.html'. Some of the sections are specific to US relay operators so please change the \"FIXME\" sections if this is inappropriate." % dst + log.log(log.NOTICE, msg) if manager.isTorrcAvailable(): # If we're connected to a managed instance then just need to

1 0

[arm/master] Logging where we place the generated torrc
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 49ff021c97b9a4400730f3ee769beec74add50fa Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:21:45 2011 -0700 Logging where we place the generated torrc --- src/cli/wizard.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8f3d0d1..032cb92 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -333,14 +333,23 @@ def showWizard(): log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) # if the torrc already exists then save it to a _bak file + isBackedUp = False if os.path.exists(torrcLocation): shutil.copy(torrcLocation, torrcLocation + "_bak") + isBackedUp = True # writes the torrc contents torrcFile = open(torrcLocation, "w") torrcFile.write(generatedTorrc) torrcFile.close() + # logs where we placed the torrc + msg = "Tor configuration placed at '%s'" % torrcLocation + if isBackedUp: + msg += " (the previous torrc was moved to 'torrc_bak')" + + log.log(log.NOTICE, msg) + dataDir = cli.controller.getController().getDataDirectory() pathPrefix = os.path.dirname(sys.argv[0])

1 0

[arm/master] Toggling config flad to allow detached startups
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit e19872a84c02e3d755cccf0668b0ccc3396bba8e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:26:52 2011 -0700 Toggling config flad to allow detached startups Toggling default for the 'features.allowDetachedStartup' flag so users, by default, will see the relay setup wizard if there's no control connection. It's complete minus the root startup script... --- armrc.sample | 2 +- src/starter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index 23092d7..0a7b0e1 100644 --- a/armrc.sample +++ b/armrc.sample @@ -62,7 +62,7 @@ features.confirmQuit true # Allows arm to start when there's no running tor instance if true, otherwise # we terminate right away. -features.allowDetachedStartup false +features.allowDetachedStartup true # Paremters for the log panel # --------------------------- diff --git a/src/starter.py b/src/starter.py index 58bc6b1..d2d0f2a 100644 --- a/src/starter.py +++ b/src/starter.py @@ -40,7 +40,7 @@ CONFIG = {"startup.controlPassword": None, "startup.events": "N3", "startup.dataDirectory": "~/.arm", "wizard.default": {}, - "features.allowDetachedStartup": False, + "features.allowDetachedStartup": True, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, "log.configDescriptions.readManPageSuccess": util.log.INFO,

1 0

[arm/master] Dropping "/s" when making torrc for rates
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit ec0cdb0f1499910fc85337ac20c2ab6352578cb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:25:12 2011 -0700 Dropping "/s" when making torrc for rates The wizard shows bandwidth rates (for instance "5 MB/s") but the torrc just wants the volume part. Dropping the "/s" for RelayBandwidthRate and RelayBandwidthBurst. --- src/cli/wizard.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index cf544a5..8aa1a23 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -493,14 +493,21 @@ def getTorrc(relayType, config): if isinstance(value, ConfigOption): value = value.getValue() + # truncates "/s" from the rate for RelayBandwidthRate entry + if key == Options.BANDWIDTH and value.endswith("/s"): + value = value[:-2] + templateOptions[key.upper()] = value templateOptions[relayType.upper()] = True templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] # uses double the relay rate for bursts - relayRateComp = config[Options.BANDWIDTH].getValue().split(" ") - templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) + bwOpt = Options.BANDWIDTH.upper() + + if templateOptions[bwOpt] != TOR_DEFAULTS[Options.BANDWIDTH]: + relayRateComp = templateOptions[bwOpt].split(" ") + templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory()

1 0

[arm/master] Excluding tor config options if they match default
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 0c0a54387a2c6f562b65d15820a8753f244c9b7a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:14:46 2011 -0700 Excluding tor config options if they match default When the wizard is generating a torrc it's now excluding options if they match the defaults. This'll take some more work to get right. --- src/cli/wizard.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index e2419e8..cf544a5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -75,6 +75,10 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" +# tor's defaults for config options, used to filter unneeded options +TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", + Options.REUSE: "10 minutes"} + CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", @@ -551,6 +555,11 @@ def getTorrc(relayType, config): templateOptions["BRIDGES"] = "\n".join(bridgeLines) + # removes options if they match the tor defaults + for opt in TOR_DEFAULTS: + if templateOptions[opt.upper()] == TOR_DEFAULTS[opt]: + del templateOptions[opt.upper()] + return torConfig.renderTorrc(template, templateOptions) def showConfirmationDialog(torrcContents, torrcLocation):

1 0

[arm/master] fix: tor startup errors caused stacktrace
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 7bd3af6a9da4afac92ab1b72cbb315e68e0b394e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:37:34 2011 -0700 fix: tor startup errors caused stacktrace Simple typo caused raised exceptions value to be left None. --- src/cli/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 5ba7f42..d4ee3e3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -472,7 +472,7 @@ class TorManager: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) except IOError, exc: - raisedExc == exc + raisedExc = exc time.sleep(0.5) if not torctlConn: raise raisedExc

1 0

[arm/master] Giving better error output when tor startup fails
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 000d5d9efda100758b2e8f703a13ebd76bcb457a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:43:57 2011 -0700 Giving better error output when tor startup fails The error out was pointless (any startup failure reported as being unable to connect to the control port) so giving the user the command to manually start tor. I should try to capture the logged err msg but this is gonna be a little tricky... --- src/cli/controller.py | 12 ++++++------ src/cli/wizard.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d4ee3e3..a04bf99 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -462,20 +462,20 @@ class TorManager: Starts a managed instance of tor, raising an IOError if unsuccessful. """ - os.system("tor --quiet -f %s&" % self.getTorrcPath()) + torrcLoc = self.getTorrcPath() + os.system("tor --quiet -f %s&" % torrcLoc) startTime = time.time() # attempts to connect for five seconds (tor might or might not be # immediately available) - torctlConn, authType, authValue, raisedExc = None, None, None, None + torctlConn, authType, authValue = None, None, None while not torctlConn and time.time() - startTime < 5: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) - except IOError, exc: - raisedExc = exc - time.sleep(0.5) + except IOError, exc: time.sleep(0.5) - if not torctlConn: raise raisedExc + if not torctlConn: + raise IOError("try running \"tor -f %s\" for error output" % torrcLoc) if authType == TorCtl.AUTH_TYPE.COOKIE: torctlConn.authenticate(authValue) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8aa1a23..6d2e623 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -304,7 +304,7 @@ def showWizard(): if manager.isManaged(conn): conn.reset() else: manager.startManagedInstance() except IOError, exc: - log.log(log.WARN, "Unable to start tor: %s" % exc) + log.log(log.WARN, "Unable to start tor, %s" % exc) break elif confirmationSelection == CANCEL: break @@ -512,7 +512,7 @@ def getTorrc(relayType, config): # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory() templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" - templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir + templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue():

1 0