- tor-commits - lists.torproject.org

[arm/master] Optional detached startup
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit 64c9fae2b7f4dfa70db19e7ed1d7e187cd9ff09c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 13:10:30 2011 -0700 Optional detached startup This is adding a config option that allows us to run arm when there's no Tor instance to connect to. This is a prerequisite for both a relay setup wizard and arbitrary reattachability. Arm was written with the expectation that there was a controller instance while starting up. This commit fixes most of the obvious crashing issues, but this is still gonna take some work to address instability for detached startups. --- armrc.sample | 4 ++++ src/cli/configPanel.py | 10 +++++++--- src/cli/connections/connPanel.py | 2 +- src/cli/controller.py | 2 +- src/cli/graphing/bandwidthStats.py | 2 +- src/cli/graphing/connStats.py | 2 +- src/cli/headerPanel.py | 4 ++-- src/cli/torrcPanel.py | 2 +- src/starter.py | 7 ++++--- src/util/torConfig.py | 22 +++++++++++++--------- src/util/torTools.py | 13 +++++++------ 11 files changed, 42 insertions(+), 28 deletions(-) diff --git a/armrc.sample b/armrc.sample index 54e3f7b..bfe8976 100644 --- a/armrc.sample +++ b/armrc.sample @@ -56,6 +56,10 @@ features.redrawRate 5 # Confirms promt to confirm when quiting if true features.confirmQuit true +# Allows arm to start when there's no running tor instance if true, otherwise +# we terminate right away. +features.allowDetachedStartup false + # Paremters for the log panel # --------------------------- # showDateDividers diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index fedf1f7..913bc39 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -198,9 +198,12 @@ class ConfigPanel(panel.Panel): self.showAll = False if self.configType == State.TOR: - conn = torTools.getConn() + conn, configOptionLines = torTools.getConn(), [] customOptions = torConfig.getCustomOptions() - configOptionLines = conn.getInfo("config/names", "").strip().split("\n") + configOptionQuery = conn.getInfo("config/names") + + if configOptionQuery: + configOptionLines = configOptionQuery.strip().split("\n") for line in configOptionLines: # lines are of the form "<option> <type>[ <documentation>]", like: @@ -484,7 +487,8 @@ class ConfigPanel(panel.Panel): cursorSelection = self.getSelection() isScrollbarVisible = len(self._getConfigOptions()) > height - detailPanelHeight - 1 - self._drawSelectionPanel(cursorSelection, width, detailPanelHeight, isScrollbarVisible) + if cursorSelection != None: + self._drawSelectionPanel(cursorSelection, width, detailPanelHeight, isScrollbarVisible) # draws the top label if self.isTitleVisible(): diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index edf5a14..161d6f6 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -90,7 +90,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): eventType - type of event detected """ - self._isTorRunning = eventType == torTools.State.INIT + self._isTorRunning = eventType in (torTools.State.INIT, torTools.State.RESET) if self._isTorRunning: self._haltTime = None else: self._haltTime = time.time() diff --git a/src/cli/controller.py b/src/cli/controller.py index feb7cf0..1fb52c9 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -435,7 +435,7 @@ def connResetListener(conn, eventType): resolver = connections.getResolver("tor") resolver.setPaused(eventType == torTools.State.CLOSED) - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): torPid = conn.getMyPid() if torPid and torPid != resolver.getPid(): diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index b92a58c..642790d 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -86,7 +86,7 @@ class BandwidthStats(graphPanel.GraphStats): self._titleStats = [] # force reset of title self.new_desc_event(None) # updates title params - if eventType == torTools.State.INIT and self._config["features.graph.bw.accounting.show"]: + if eventType in (torTools.State.INIT, torTools.State.RESET) and self._config["features.graph.bw.accounting.show"]: self.isAccounting = conn.getInfo('accounting/enabled') == '1' # redraws to reflect changes (this especially noticeable when we have diff --git a/src/cli/graphing/connStats.py b/src/cli/graphing/connStats.py index 7f0dc18..0df5db3 100644 --- a/src/cli/graphing/connStats.py +++ b/src/cli/graphing/connStats.py @@ -25,7 +25,7 @@ class ConnStats(graphPanel.GraphStats): return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType): - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): self.orPort = conn.getOption("ORPort", "0") self.dirPort = conn.getOption("DirPort", "0") self.controlPort = conn.getOption("ControlPort", "0") diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 7e0f639..733abad 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -65,7 +65,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._config = dict(DEFAULT_CONFIG) if config: config.update(self._config) - self._isTorConnected = True + self._isTorConnected = torTools.getConn().isAlive() self._lastUpdate = -1 # time the content was last revised self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread @@ -405,7 +405,7 @@ class HeaderPanel(panel.Panel, threading.Thread): eventType - type of event detected """ - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): self._isTorConnected = True self._haltTime = None self._update(True) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index f651785..2dc244f 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -53,7 +53,7 @@ class TorrcPanel(panel.Panel): eventType - type of event detected """ - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): try: torConfig.getTorrc().load(True) self.redraw(True) diff --git a/src/starter.py b/src/starter.py index d50c718..104e0e2 100644 --- a/src/starter.py +++ b/src/starter.py @@ -40,6 +40,7 @@ CONFIG = {"startup.controlPassword": None, "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", + "features.allowDetachedStartup": False, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, "log.configDescriptions.readManPageSuccess": util.log.INFO, @@ -216,7 +217,7 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # again prompting for the user to enter it print incorrectPasswordMsg return _torCtlConnect(controlAddr, controlPort) - else: + elif not CONFIG["features.allowDetachedStartup"]: print exc return None @@ -388,7 +389,7 @@ if __name__ == '__main__': authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath conn = _torCtlConnect(controlAddr, controlPort, authPassword, incorrectPasswordMsg) - if conn == None: sys.exit(1) + if conn == None and not CONFIG["features.allowDetachedStartup"]: sys.exit(1) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this @@ -410,7 +411,7 @@ if __name__ == '__main__': # skewing the startup time results so this isn't counted initTime = time.time() - startTime controller = util.torTools.getConn() - controller.init(conn) + if conn: controller.init(conn) # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 14ef4ce..a63eddb 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -178,9 +178,10 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): # Fetches all options available with this tor instance. This isn't # vital, and the validOptions are left empty if the call fails. conn, validOptions = torTools.getConn(), [] - configOptionQuery = conn.getInfo("config/names").strip().split("\n") + configOptionQuery = conn.getInfo("config/names") if configOptionQuery: - validOptions = [line[:line.find(" ")].lower() for line in configOptionQuery] + for line in configOptionQuery.strip().split("\n"): + validOptions.append(line[:line.find(" ")].lower()) optionCount, lastOption, lastArg = 0, None, None lastCategory, lastDescription = Category.GENERAL, "" @@ -343,14 +344,17 @@ def getMultilineParameters(): # 'Dependent'), and LINELIST_V (aka 'Virtual') types global MULTILINE_PARAM if MULTILINE_PARAM == None: - conn = torTools.getConn() - configOptionQuery = conn.getInfo("config/names", "").strip().split("\n") - - multilineEntries = [] - for line in configOptionQuery: - confOption, confType = line.strip().split(" ", 1) - if confType in ("LineList", "Dependant", "Virtual"): - multilineEntries.append(confOption) + conn, multilineEntries = torTools.getConn(), [] + + configOptionQuery = conn.getInfo("config/names") + if configOptionQuery: + for line in configOptionQuery.strip().split("\n"): + confOption, confType = line.strip().split(" ", 1) + if confType in ("LineList", "Dependant", "Virtual"): + multilineEntries.append(confOption) + else: + # unable to query tor connection, so not caching results + return () MULTILINE_PARAM = multilineEntries diff --git a/src/util/torTools.py b/src/util/torTools.py index 7ea140b..d1e5e9d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -17,9 +17,10 @@ from TorCtl import TorCtl, TorUtil from util import enum, log, procTools, sysTools, uiTools # enums for tor's controller state: -# INIT - attached to a new controller or restart/sighup signal received +# INIT - attached to a new controller +# RESET - received a reset/sighup signal # CLOSED - control port closed -State = enum.Enum("INIT", "CLOSED") +State = enum.Enum("INIT", "RESET", "CLOSED") # Addresses of the default directory authorities for tor version 0.2.3.0-alpha # (this comes from the dirservers array in src/or/config.c). @@ -1068,7 +1069,7 @@ class Controller(TorCtl.PostEventListener): if myAddress: result = ExitPolicy("reject %s" % myAddress, result) else: # no ORPort is set so all relaying is disabled - result = ExitPolicy("reject *:*") + result = ExitPolicy("reject *:*", None) self.connLock.release() @@ -1469,11 +1470,11 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): self._isReset = True - self._status = State.INIT + self._status = State.RESET self._statusTime = time.time() if not NO_SPAWN: - self._notificationQueue.put(State.INIT) + self._notificationQueue.put(State.RESET) thread.start_new_thread(self._notifyStatusListeners, ()) self.connLock.release() @@ -2038,7 +2039,7 @@ class Controller(TorCtl.PostEventListener): eventType = self._notificationQueue.get(timeout=0) # checks that the notice is accurate for our current state - if self.isAlive() != (eventType == State.INIT): + if self.isAlive() != (eventType in (State.INIT, State.RESET)): eventType = None except Queue.Empty: eventType = None

1 0

[arm/master] fix: config panel handling for reattachment
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit 487c6effbecc0e6415aa865547acce58f13e9c56 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 14:14:55 2011 -0700 fix: config panel handling for reattachment When arm's connected to a new tor instance the current config options are replaced with those of the new instance. This addresses a couple issues we previously had... 1. if arm was initially detached then when connected to an instance the config panel would still be blank 2. if tor was shut down and we were then reattached to a different version (with different config options) we'd still display the old set --- src/cli/configPanel.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 913bc39..33cec34 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -190,6 +190,7 @@ class ConfigPanel(panel.Panel): self.configType = configType self.confContents = [] + self.confImportantContents = [] self.scroller = uiTools.Scroller(True) self.valsLock = threading.RLock() @@ -197,6 +198,28 @@ class ConfigPanel(panel.Panel): # the 'important' flag are shown self.showAll = False + # initializes config contents if we're connected + conn = torTools.getConn() + conn.addStatusListener(self.resetListener) + + if conn.isAlive(): + self.resetListener(conn, torTools.State.INIT) + + def resetListener(self, conn, eventType): + # fetches configuration options if a new instance, otherewise keeps our + # current contents + + if eventType == torTools.State.INIT: + self._loadConfigOptions() + + def _loadConfigOptions(self): + """ + Fetches the configuration options available from tor or arm. + """ + + self.confContents = [] + self.confImportantContents = [] + if self.configType == State.TOR: conn, configOptionLines = torTools.getConn(), [] customOptions = torConfig.getCustomOptions()

1 0

[arm/master] Config option for log regex patterns
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit f773a8a72bcc470cb03e7af1fa1b79e895bbcd9a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 17:36:03 2011 -0700 Config option for log regex patterns Allowing the regular expression log filters to be preconfigured in the user's armrrc. --- armrc.sample | 4 ++++ src/cli/logPanel.py | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index a81c9d8..54e3f7b 100644 --- a/armrc.sample +++ b/armrc.sample @@ -76,6 +76,8 @@ features.confirmQuit true # maxRefreshRate # rate limiting (in milliseconds) for drawing the log if updates are made # rapidly (for instance, when at the DEBUG runlevel) +# regex +# preconfigured regular expression pattern, up to five will be loaded features.log.showDateDividers true features.log.showDuplicateEntries false @@ -84,6 +86,8 @@ features.log.maxLinesPerEntry 4 features.log.prepopulate true features.log.prepopulateReadLimit 5000 features.log.maxRefreshRate 300 +#features.log.regex My First Regex Pattern +#features.log.regex ^My Second Regex Pattern$ # Paremters for the config panel # --------------------------- diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index fc3bfc3..2561416 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -48,12 +48,14 @@ DEFAULT_CONFIG = {"features.logFile": "", "features.log.prepopulate": True, "features.log.prepopulateReadLimit": 5000, "features.log.maxRefreshRate": 300, + "features.log.regex": [], "cache.logPanel.size": 1000, "log.logPanel.prepopulateSuccess": log.INFO, "log.logPanel.prepopulateFailed": log.WARN, "log.logPanel.logFileOpened": log.NOTICE, "log.logPanel.logFileWriteFailed": log.ERR, - "log.logPanel.forceDoubleRedraw": log.DEBUG} + "log.logPanel.forceDoubleRedraw": log.DEBUG, + "log.configEntryTypeError": log.NOTICE} DUPLICATE_MSG = " [%i duplicate%s hidden]" @@ -562,6 +564,9 @@ class LogPanel(panel.Panel, threading.Thread): # config options. loadLogMessages() + # regex filters the user has defined + self.filterOptions = [] + self._config = dict(DEFAULT_CONFIG) if config: @@ -570,6 +575,17 @@ class LogPanel(panel.Panel, threading.Thread): "features.log.prepopulateReadLimit": 0, "features.log.maxRefreshRate": 10, "cache.logPanel.size": 1000}) + + for filter in self._config["features.log.regex"]: + # checks if we can't have more filters + if len(self.filterOptions) >= MAX_REGEX_FILTERS: break + + try: + re.compile(filter) + self.filterOptions.append(filter) + except re.error, exc: + msg = "Invalid regular expression pattern (%s): %s" % (exc, filter) + log.log(self._config["log.configEntryTypeError"], msg) # collapses duplicate log entries if false, showing only the most recent self.showDuplicates = self._config["features.log.showDuplicateEntries"] @@ -582,7 +598,6 @@ class LogPanel(panel.Panel, threading.Thread): self.msgLog = [] # log entries, sorted by the timestamp self.loggedEvents = loggedEvents # events we're listening to self.regexFilter = None # filter for presented log events (no filtering if None) - self.filterOptions = [] # filters the user has input self.lastContentHeight = 0 # height of the rendered content when last drawn self.logFile = None # file log messages are saved to (skipped if None) self.scroll = 0

1 0

[arm/master] Adding summaries for new torrc options
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit f99f071a841ef200c88c14f2626540f1e4281d32 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 18:32:02 2011 -0700 Adding summaries for new torrc options Summaries for all new options in the torrc of the master git repo, commit: 42d6f3459053aaafbed2ab215e9e85ae5d594b5a --- src/settings.cfg | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 1ee63a1..5e62ce1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -46,6 +46,8 @@ config.summary.HashedControlPassword Hash of the password for authenticating to config.summary.CookieAuthentication If set, authenticates controllers via a cookie config.summary.CookieAuthFile Location of the authentication cookie config.summary.CookieAuthFileGroupReadable Group read permissions for the authentication cookie +config.summary.ControlPortWriteToFile Path for a file tor writes containing its control port +config.summary.ControlPortFileGroupReadable Group read permissions for the control port file config.summary.DataDirectory Location for storing runtime data (state, keys, etc) config.summary.DirServer Alternative directory authorities config.summary.AlternateDirAuthority Alternative directory authorities (consensus only) @@ -68,10 +70,12 @@ config.summary.Socks5ProxyUsername Username for connecting to the Socks5Proxy config.summary.Socks5ProxyPassword Password for connecting to the Socks5Proxy config.summary.KeepalivePeriod Rate at which to send keepalive packets config.summary.Log Runlevels and location for tor logging +config.summary.LogMessageDomains Includes a domain when logging messages config.summary.OutboundBindAddress Sets the IP used for connecting to tor config.summary.PidFile Path for a file tor writes containing its process id config.summary.ProtocolWarnings Toggles if protocol errors give warnings or not config.summary.RunAsDaemon Toggles if tor runs as a daemon process +config.summary.LogTimeGranularity limits granularity of log message timestamps config.summary.SafeLogging Toggles if logs are scrubbed of sensitive information config.summary.User UID for the process when started config.summary.HardwareAccel Toggles if tor attempts to use hardware acceleration @@ -81,6 +85,8 @@ config.summary.AvoidDiskWrites Toggles if tor avoids frequently writing to disk config.summary.TunnelDirConns Toggles if directory requests can be made over the ORPort config.summary.PreferTunneledDirConns Avoids directory requests that can't be made over the ORPort if set config.summary.CircuitPriorityHalflife Overwrite method for prioritizing traffic among relayed connections +config.summary.DisableIOCP Disables use of the Windows IOCP networking API +config.summary.CountPrivateBandwidth Applies rate limiting to private IP addresses # Client Config Options config.summary.AllowInvalidNodes Permits use of relays flagged as invalid by authorities @@ -93,8 +99,8 @@ config.summary.CircuitStreamTimeout Timeout for shifting streams among circuits config.summary.ClientOnly Ensures that we aren't used as a relay or directory mirror config.summary.ExcludeNodes Relays or locales never to be used in circuits config.summary.ExcludeExitNodes Relays or locales never to be used for exits -config.summary.EntryNodes Preferred first hops for circuits config.summary.ExitNodes Preferred final hop for circuits +config.summary.EntryNodes Preferred first hops for circuits config.summary.StrictNodes Never uses notes outside of Entry/ExitNodes config.summary.FascistFirewall Only make outbound connections on FirewallPorts config.summary.FirewallPorts Ports used by FascistFirewall @@ -134,6 +140,7 @@ config.summary.AutomapHostsSuffixes Address suffixes recognized by AutomapHostsO config.summary.DNSPort Port from which DNS responses are fetched instead of tor config.summary.DNSListenAddress Address for performing DNS resolution config.summary.ClientDNSRejectInternalAddresses Ignores DNS responses for internal addresses +config.summary.ClientRejectInternalAddresses Disables use of Tor for internal connections config.summary.DownloadExtraInfo Toggles fetching of extra information about relays config.summary.FallbackNetworkstatusFile Path for a fallback cache of the consensus config.summary.WarnPlaintextPorts Toggles warnings for using risky ports @@ -154,8 +161,11 @@ config.summary.Nickname Identifier for this relay config.summary.NumCPUs Number of processes spawned for decryption config.summary.ORPort Port used to accept relay traffic config.summary.ORListenAddress Address for relay connections +config.summary.PortForwarding Use UPnP or NAT-PMP if needed to relay +config.summary.PortForwardingHelper Executable for configuring port forwarding config.summary.PublishServerDescriptor Types of descriptors published config.summary.ShutdownWaitLength Delay before quitting after receiving a SIGINT signal +config.summary.HeartbeatPeriod Rate at which an INFO level heartbeat message is sent config.summary.AccountingMax Amount of traffic before hibernating config.summary.AccountingStart Duration of an accounting period config.summary.RefuseUnknownExits Prevents relays not in the consensus from using us as an exit @@ -172,6 +182,7 @@ config.summary.CellStatistics Toggles storing circuit queue duration to disk config.summary.DirReqStatistics Toggles storing network status counts and performance to disk config.summary.EntryStatistics Toggles storing client connection counts to disk config.summary.ExitPortStatistics Toggles storing traffic and port usage data to disk +config.summary.ConnDirectionStatistics Toggles storing connection use to disk config.summary.ExtraInfoStatistics Publishes statistic data in the extra-info documents # Directory Server Options @@ -189,6 +200,7 @@ config.summary.MinUptimeHidServDirectoryV2 required uptime before accepting hidd config.summary.DirPort port for directory connections config.summary.DirListenAddress address the directory service is bound to config.summary.DirPolicy access policy for the DirPort +config.summary.FetchV2Networkstatus Get the obsolete V2 consensus # Directory Authority Server Options config.summary.RecommendedVersions tor versions believed to be safe @@ -205,16 +217,20 @@ config.summary.AuthDirListBadExits toggles if we provide an opinion on bad exits config.summary.AuthDirRejectUnlisted rejects further relay descriptors config.summary.AuthDirMaxServersPerAddr limit on the number of relays accepted per ip config.summary.AuthDirMaxServersPerAuthAddr limit on the number of relays accepted per an authority's ip +config.summary.BridgePassword Password for requesting bridge information config.summary.V3AuthVotingInterval consensus voting interval config.summary.V3AuthVoteDelay wait time to collect votes of other authorities config.summary.V3AuthDistDelay wait time to collect the signatures of other authorities config.summary.V3AuthNIntervalsValid number of voting intervals a consensus is valid for config.summary.V3BandwidthsFile path to a file containing measured relay bandwidths +config.summary.V3AuthUseLegacyKey Signs consensus with both the current and legacy keys +config.summary.RephistTrackTime Discards old, unchanged reliability informaition # Hidden Service Options config.summary.HiddenServiceDir directory contents for the hidden service config.summary.HiddenServicePort port the hidden service is provided on config.summary.PublishHidServDescriptors toggles automated publishing of the hidden service to the rendezvous directory +config.summary.HiddenServiceVersion Version for published hidden service descriptors config.summary.HiddenServiceAuthorizeClient restricts access to the hidden service config.summary.RendPostPeriod period at which the rendezvous service descriptors are refreshed

1 0

[arm/master] fix: inconsistent capitalization for summaries
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit b2cb195bac58a1251d88238622447832557cedc0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 18:35:45 2011 -0700 fix: inconsistent capitalization for summaries Summaries for most config sections were capitalized, but the last ones weren't. Changing it so they're all capitalized. --- src/settings.cfg | 88 +++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 5e62ce1..7a1d63f 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -186,61 +186,61 @@ config.summary.ConnDirectionStatistics Toggles storing connection use to disk config.summary.ExtraInfoStatistics Publishes statistic data in the extra-info documents # Directory Server Options -config.summary.AuthoritativeDirectory act as a directory authority -config.summary.DirPortFrontPage publish this html file on the DirPort -config.summary.V1AuthoritativeDirectory generates a version 1 consensus -config.summary.V2AuthoritativeDirectory generates a version 2 consensus -config.summary.V3AuthoritativeDirectory generates a version 3 consensus -config.summary.VersioningAuthoritativeDirectory provides opinions on recommended versions of tor -config.summary.NamingAuthoritativeDirectory provides opinions on fingerprint to nickname bindings -config.summary.HSAuthoritativeDir toggles accepting hidden service descriptors -config.summary.HidServDirectoryV2 toggles accepting version 2 hidden service descriptors -config.summary.BridgeAuthoritativeDir acts as a bridge authority -config.summary.MinUptimeHidServDirectoryV2 required uptime before accepting hidden service directory -config.summary.DirPort port for directory connections -config.summary.DirListenAddress address the directory service is bound to -config.summary.DirPolicy access policy for the DirPort +config.summary.AuthoritativeDirectory Act as a directory authority +config.summary.DirPortFrontPage Publish this html file on the DirPort +config.summary.V1AuthoritativeDirectory Generates a version 1 consensus +config.summary.V2AuthoritativeDirectory Generates a version 2 consensus +config.summary.V3AuthoritativeDirectory Generates a version 3 consensus +config.summary.VersioningAuthoritativeDirectory Provides opinions on recommended versions of tor +config.summary.NamingAuthoritativeDirectory Provides opinions on fingerprint to nickname bindings +config.summary.HSAuthoritativeDir Toggles accepting hidden service descriptors +config.summary.HidServDirectoryV2 Toggles accepting version 2 hidden service descriptors +config.summary.BridgeAuthoritativeDir Acts as a bridge authority +config.summary.MinUptimeHidServDirectoryV2 Required uptime before accepting hidden service directory +config.summary.DirPort Port for directory connections +config.summary.DirListenAddress Address the directory service is bound to +config.summary.DirPolicy Access policy for the DirPort config.summary.FetchV2Networkstatus Get the obsolete V2 consensus # Directory Authority Server Options -config.summary.RecommendedVersions tor versions believed to be safe -config.summary.RecommendedClientVersions tor versions believed to be safe for clients -config.summary.RecommendedServerVersions tor versions believed to be safe for relays -config.summary.ConsensusParams params entry of the networkstatus vote -config.summary.DirAllowPrivateAddresses toggles allowing arbitrary input or non-public IPs in descriptors -config.summary.AuthDirBadDir relays to be flagged as bad directory caches -config.summary.AuthDirBadExit relays to be flagged as bad exits -config.summary.AuthDirInvalid relays from which the valid flag is withheld -config.summary.AuthDirReject relays to be dropped from the consensus -config.summary.AuthDirListBadDirs toggles if we provide an opinion on bad directory caches -config.summary.AuthDirListBadExits toggles if we provide an opinion on bad exits -config.summary.AuthDirRejectUnlisted rejects further relay descriptors -config.summary.AuthDirMaxServersPerAddr limit on the number of relays accepted per ip -config.summary.AuthDirMaxServersPerAuthAddr limit on the number of relays accepted per an authority's ip +config.summary.RecommendedVersions Tor versions believed to be safe +config.summary.RecommendedClientVersions Tor versions believed to be safe for clients +config.summary.RecommendedServerVersions Tor versions believed to be safe for relays +config.summary.ConsensusParams Params entry of the networkstatus vote +config.summary.DirAllowPrivateAddresses Toggles allowing arbitrary input or non-public IPs in descriptors +config.summary.AuthDirBadDir Relays to be flagged as bad directory caches +config.summary.AuthDirBadExit Relays to be flagged as bad exits +config.summary.AuthDirInvalid Relays from which the valid flag is withheld +config.summary.AuthDirReject Relays to be dropped from the consensus +config.summary.AuthDirListBadDirs Toggles if we provide an opinion on bad directory caches +config.summary.AuthDirListBadExits Toggles if we provide an opinion on bad exits +config.summary.AuthDirRejectUnlisted Rejects further relay descriptors +config.summary.AuthDirMaxServersPerAddr Limit on the number of relays accepted per ip +config.summary.AuthDirMaxServersPerAuthAddr Limit on the number of relays accepted per an authority's ip config.summary.BridgePassword Password for requesting bridge information -config.summary.V3AuthVotingInterval consensus voting interval -config.summary.V3AuthVoteDelay wait time to collect votes of other authorities -config.summary.V3AuthDistDelay wait time to collect the signatures of other authorities -config.summary.V3AuthNIntervalsValid number of voting intervals a consensus is valid for -config.summary.V3BandwidthsFile path to a file containing measured relay bandwidths +config.summary.V3AuthVotingInterval Consensus voting interval +config.summary.V3AuthVoteDelay Wait time to collect votes of other authorities +config.summary.V3AuthDistDelay Wait time to collect the signatures of other authorities +config.summary.V3AuthNIntervalsValid Number of voting intervals a consensus is valid for +config.summary.V3BandwidthsFile Path to a file containing measured relay bandwidths config.summary.V3AuthUseLegacyKey Signs consensus with both the current and legacy keys config.summary.RephistTrackTime Discards old, unchanged reliability informaition # Hidden Service Options -config.summary.HiddenServiceDir directory contents for the hidden service -config.summary.HiddenServicePort port the hidden service is provided on -config.summary.PublishHidServDescriptors toggles automated publishing of the hidden service to the rendezvous directory +config.summary.HiddenServiceDir Directory contents for the hidden service +config.summary.HiddenServicePort Port the hidden service is provided on +config.summary.PublishHidServDescriptors Toggles automated publishing of the hidden service to the rendezvous directory config.summary.HiddenServiceVersion Version for published hidden service descriptors -config.summary.HiddenServiceAuthorizeClient restricts access to the hidden service -config.summary.RendPostPeriod period at which the rendezvous service descriptors are refreshed +config.summary.HiddenServiceAuthorizeClient Restricts access to the hidden service +config.summary.RendPostPeriod Period at which the rendezvous service descriptors are refreshed # Testing Network Options -config.summary.TestingTorNetwork overrides other options to be a testing network -config.summary.TestingV3AuthInitialVotingInterval overrides V3AuthVotingInterval for the first consensus -config.summary.TestingV3AuthInitialVoteDelay overrides TestingV3AuthInitialVoteDelay for the first consensus -config.summary.TestingV3AuthInitialDistDelay overrides TestingV3AuthInitialDistDelay for the first consensus -config.summary.TestingAuthDirTimeToLearnReachability delay until opinions are given about which relays are running or not -config.summary.TestingEstimatedDescriptorPropagationTime delay before clients attempt to fetch descriptors from directory caches +config.summary.TestingTorNetwork Overrides other options to be a testing network +config.summary.TestingV3AuthInitialVotingInterval Overrides V3AuthVotingInterval for the first consensus +config.summary.TestingV3AuthInitialVoteDelay Overrides TestingV3AuthInitialVoteDelay for the first consensus +config.summary.TestingV3AuthInitialDistDelay Overrides TestingV3AuthInitialDistDelay for the first consensus +config.summary.TestingAuthDirTimeToLearnReachability Delay until opinions are given about which relays are running or not +config.summary.TestingEstimatedDescriptorPropagationTime Delay before clients attempt to fetch descriptors from directory caches # Snippets from common log messages # These are static bits of log messages, used to determine when entries with

1 0

[arm/master] Flagging a couple important config options
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 57af5cf4401cd502a7adaa4f6891e5a3b93aaa08 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 18:40:45 2011 -0700 Flagging a couple important config options Adding the important flag to MaxCircuitDirtiness and PortForwarding so they're displayed in the summarized config listing. --- src/settings.cfg | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 7a1d63f..bced9a4 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -10,20 +10,26 @@ config.important DataDirectory config.important Log config.important RunAsDaemon config.important User + config.important Bridge config.important ExcludeNodes +config.important MaxCircuitDirtiness config.important SocksPort config.important UseBridges + config.important BridgeRelay config.important ContactInfo config.important ExitPolicy config.important MyFamily config.important Nickname config.important ORPort +config.important PortForwarding config.important AccountingMax config.important AccountingStart + config.important DirPortFrontPage config.important DirPort + config.important HiddenServiceDir config.important HiddenServicePort

1 0

[arm/master] Dropping usage of TorCtl.connect()
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 8d6a1a6b0bd14b10b6bbe468e55c382e2a0bb6d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 19:31:02 2011 -0700 Dropping usage of TorCtl.connect() Using a custom implementation of the TorCtl.connect() function rather than adding hacks for added functionality. This version provides a different password prompt message (suggestion by weasel) and expansion of relative cookie paths. This is mostly being done since the previous hack would attempt relative cookies, fail, print a failure message, then the hack would correct for this. Having a custom connect() means we can correct the path on the first pass. --- src/starter.py | 76 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/starter.py b/src/starter.py index e060274..d50c718 100644 --- a/src/starter.py +++ b/src/starter.py @@ -10,6 +10,7 @@ import os import sys import time import getopt +import getpass import locale import platform @@ -176,6 +177,49 @@ def _loadConfigurationDescriptions(pathPrefix): msg = DESC_INTERNAL_LOAD_FAILED_MSG % util.sysTools.getFileErrorMsg(exc) util.log.log(CONFIG["log.configDescriptions.internalLoadFailed"], msg) +def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, incorrectPasswordMsg=""): + """ + Custom handler for establishing a TorCtl connection. + """ + + conn = None + try: + conn, authType, authValue = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) + + if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: + # password authentication, promting for the password if it wasn't provided + if passphrase: authValue = passphrase + else: + try: authValue = getpass.getpass("Controller password: ") + except KeyboardInterrupt: return None + elif authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE and authValue[0] != "/": + # Connecting to the control port will probably fail if it's using cookie + # authentication and the cookie path is relative (unfortunately this is + # the case for TBB). This is discussed in: + # https://trac.torproject.org/projects/tor/ticket/1101 + # + # This is best effort. If we can't expand the path then it's still + # attempted since we might be running in tor's pwd. + + torPid = util.torTools.getPid(controlPort) + if torPid: + try: conn._cookiePath = util.sysTools.expandRelativePath(authValue, torPid) + except IOError: pass + + conn.authenticate(authValue) + return conn + except Exception, exc: + if conn: conn.close() + + if passphrase and str(exc) == "Unable to authenticate: password incorrect": + # provide a warning that the provided password didn't work, then try + # again prompting for the user to enter it + print incorrectPasswordMsg + return _torCtlConnect(controlAddr, controlPort) + else: + print exc + return None + def _dumpConfig(): """ Dumps the current arm and tor configurations at the DEBUG runlevel. This @@ -341,36 +385,10 @@ if __name__ == '__main__': # sets up TorCtl connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise - TorCtl.TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) - conn = TorCtl.TorCtl.connect(controlAddr, controlPort, authPassword) - if conn == None: - # Connecting to the control port will probably fail if it's using cookie - # authentication and the cookie path is relative (unfortunately this is - # the case for TBB). This is discussed in: - # https://trac.torproject.org/projects/tor/ticket/1101 - # - # Until this is fixed including a hack to expand the relative path in - # these cases, setting conn to the established connection if successful - # and leaving it undefined otherwise. Even if successful this prints the - # error message saying that the auth cookie couldn't be found - # (unfortunately this is unavoidable without either changing TorCtl or - # making this a much bigger hack). - - try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) - - if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: - torPid = util.torTools.getPid(controlPort) - - if torPid and cookiePath[0] != "/": - # previous attempt to connect failed due to having a relative path - fix it - tmpConn._cookiePath = util.sysTools.expandRelativePath(cookiePath, torPid) - tmpConn.authenticate(cookiePath) - conn = tmpConn # success! - except: pass - - if conn == None: sys.exit(1) + incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath + conn = _torCtlConnect(controlAddr, controlPort, authPassword, incorrectPasswordMsg) + if conn == None: sys.exit(1) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this

1 0

r24824: {} svg versions of our logos. (projects/misc/phobos)
by Andrew Lewman 18 Jun '11

18 Jun '11

Author: phobos Date: 2011-06-19 02:28:58 +0000 (Sun, 19 Jun 2011) New Revision: 24824 Added: projects/misc/phobos/svg_logos.tar.gz Log: svg versions of our logos. Added: projects/misc/phobos/svg_logos.tar.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/svg_logos.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[arm/packaging] Updating autofetch torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 967db1a753a248c0cba8bb9795648df55bfe9c34 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:52:00 2011 -0700 Updating autofetch torctl bundle Using the torctl commit... af306b53a668168ae92a6c919d4013b81d7e61ad --- deps/fetch.sh | 1 + deps/torctl.tar.gz | Bin 64261 -> 64726 bytes 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/deps/fetch.sh b/deps/fetch.sh index 73d5505..baaa61b 100755 --- a/deps/fetch.sh +++ b/deps/fetch.sh @@ -3,6 +3,7 @@ # and provided with the tarball to avoid complicating the install process. # # TorCtl (https://gitweb.torproject.org/pytorctl.git) +# 6/18/11 - 5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3 # 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed # # cagraph (https://code.google.com/p/cagraph/) diff --git a/deps/torctl.tar.gz b/deps/torctl.tar.gz index d45820b..e079c45 100644 Binary files a/deps/torctl.tar.gz and b/deps/torctl.tar.gz differ

1 0

[arm/master] Autofetching new torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit a72d0de4404d8d3db52f236c2abb0d2e02c9ee2f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:58:57 2011 -0700 Autofetching new torctl bundle --- src/prereq.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index ba1e988..eee9fdb 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -12,9 +12,9 @@ import tempfile # Library dependencies can be fetched on request. By default this is via # the following mirrors with their sha256 signatures checked. -TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/torctl.tar.gz" -TORCTL_SIG = "be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed" -CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/cagraph.tar.gz" +TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz" +TORCTL_SIG = "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3" +CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-10/cagraph.tar.gz" CAGRAPH_SIG = "1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d" # optionally we can do an unverified fetch from the library's sources

1 0