This will be the last update for a while since I'm about to start a new job.

CHANGE LOG

10/21/09 - version 1.2.1

11/8/09 - version 1.2.2

This will be the last update for a while since I'm about to start a new job.

    * added: including family relays on connections listing

    * added: file descriptors dialog (stats and scrollable listing)

    * change: logs warning if torrc fails to load

    * fix: size and time labels used in torrc are expanded for validation

    * fix: duplicate torrc entries weren't being detected if not erroneous

    * fix: crashing issue when cleaning up hostname cache

    * fix: stretching connection lines to fill full screen

10/21/09 - version 1.2.1 (r20814)

Substantial bundle of changes including torrc validation, improved arm event logging, and numerous bug fixes.

    * added: verifies loaded torrc consistency against tor's actual state (gives warning and providing corrections)

Requirements:

Python 2.5

TorCtl (retrieved in svn checkout)

Common *nix commands including: ps, pidof, tail, host, and netstat

Tor is running with an available control port. This means either...

  ... starting Tor with '--controlport <PORT>'

  ... or including 'ControlPort <PORT>' in your torrc

For full functionality this requires common *nix commands including: ps, pidof,

  tail, pwdx, host, netstat, lsof, and ulimit

This is started via 'arm' (use the '--help' argument for usage).

			if set and there's extra room available show 'MaxAdvertisedBandwidth'

	* when help popup is showing options let them be directly opened

			requested by arma

	* check family connections to see if they're alive (VERSION cell handshake?)

	* update site's screenshots (pretty out of date...)

- Ideas (low priority)

from interface import controller

from interface import logPanel

VERSION = "1.2.1"

LAST_MODIFIED = "Oct 21, 2009"

VERSION = "1.2.2"

LAST_MODIFIED = "Nov 8, 2009"

DEFAULT_CONTROL_ADDR = "127.0.0.1"

DEFAULT_CONTROL_PORT = 9051

# last updated for tor version 0.2.1.19

MULTI_LINE_PARAM = ["AlternateBridgeAuthority", "AlternateDirAuthority", "AlternateHSAuthority", "AuthDirBadDir", "AuthDirBadExit", "AuthDirInvalid", "AuthDirReject", "Bridge", "ControlListenAddress", "ControlSocket", "DirListenAddress", "DirPolicy", "DirServer", "DNSListenAddress", "ExitPolicy", "HashedControlPassword", "HiddenServiceDir", "HiddenServiceOptions", "HiddenServicePort", "HiddenServiceVersion", "HiddenServiceAuthorizeClient", "HidServAuth", "Log", "MapAddress", "NatdListenAddress", "NodeFamily", "ORListenAddress", "ReachableAddresses", "ReachableDirAddresses", "ReachableORAddresses", "RecommendedVersions", "RecommendedClientVersions", "RecommendedServerVersions", "SocksListenAddress", "SocksPolicy", "TransListenAddress", "__HashedControlSessionPassword"]

# size modifiers allowed by config.c

LABEL_KB = ["kb", "kbyte", "kbytes", "kilobyte", "kilobytes"]

LABEL_MB = ["m", "mb", "mbyte", "mbytes", "megabyte", "megabytes"]

LABEL_GB = ["gb", "gbyte", "gbytes", "gigabyte", "gigabytes"]

LABEL_TB = ["tb", "terabyte", "terabytes"]

# time modifiers allowed by config.c

LABEL_MIN = ["minute", "minutes"]

LABEL_HOUR = ["hour", "hours"]

LABEL_DAY = ["day", "days"]

LABEL_WEEK = ["week", "weeks"]

class ConfPanel(util.Panel):

  """

  Presents torrc with syntax highlighting in a scroll-able area.

      # checks if torrc differs from get_option data

      self.irrelevantLines = []

      self.corrections = {}

      correctedCmd = {}       # mapping of corrected commands to line numbers

      parsedCommands = {}       # mapping of parsed commands to line numbers

      for lineNumber in range(len(self.confContents)):

        lineText = self.confContents[lineNumber].strip()

          if argEnd == -1: argEnd = len(lineText)

          command, argument = lineText[:ctlEnd], lineText[ctlEnd:argEnd].strip()

          # expands value if it's a size or time

          comp = argument.strip().lower().split(" ")

          if len(comp) > 1:

            size = 0

            if comp[1] in LABEL_KB: size = int(comp[0]) * 1024

            elif comp[1] in LABEL_MB: size = int(comp[0]) * 1048576

            elif comp[1] in LABEL_GB: size = int(comp[0]) * 1073741824

            elif comp[1] in LABEL_TB: size = int(comp[0]) * 1099511627776

            elif comp[1] in LABEL_MIN: size = int(comp[0]) * 60

            elif comp[1] in LABEL_HOUR: size = int(comp[0]) * 3600

            elif comp[1] in LABEL_DAY: size = int(comp[0]) * 86400

            elif comp[1] in LABEL_WEEK: size = int(comp[0]) * 604800

            if size != 0: argument = str(size)

          # most parameters are overwritten if defined multiple times, if so

          # it's erased from corrections and noted as duplicate instead

          if not command in MULTI_LINE_PARAM and command in correctedCmd.keys():

            self.irrelevantLines.append(correctedCmd[command])

            del self.corrections[correctedCmd[command]]

          if not command in MULTI_LINE_PARAM and command in parsedCommands.keys():

            previousLineNum = parsedCommands[command]

            self.irrelevantLines.append(previousLineNum)

            if previousLineNum in self.corrections.keys(): del self.corrections[previousLineNum]

          parsedCommands[command] = lineNumber + 1

          # check validity against tor's actual state

          try:

              actualValues.append(val)

            if not argument in actualValues:

              self.corrections[lineNumber + 1] = ", ".join(actualValues)

              correctedCmd[command] = lineNumber + 1

              self.corrections[lineNumber + 1] = argument + " - " + ", ".join(actualValues)

          except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed):

            pass # unable to load tor parameter to validate... weird

        self.logger.monitor_event("NOTICE", "%s: %s (highlighted in blue)" % (baseMsg, ", ".join([str(val) for val in self.irrelevantLines])))

      if self.corrections:

        self.logger.monitor_event("WARN", "Tor's state differs from loaded torrc")

    except IOError:

    except IOError, exc:

      self.confContents = ["### Unable to load torrc ###"]

      self.logger.monitor_event("WARN", "Unable to load torrc (%s)" % str(exc))

    self.scroll = 0

  def handleKey(self, key):