- tor-commits - lists.torproject.org

[arm/release] fix: cropping whitespace-only strings could crash
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4aa35c2f4ad2445a948a05f46b07a7636ff2aac3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:06:55 2011 -0700 fix: cropping whitespace-only strings could crash When cropping strings that started with whitespace and we didn't have enough room for any of the words we would crash (index error due to referencing the -1 index of an empty string). --- src/util/uiTools.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index ce467c3..40a3087 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -273,7 +273,8 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge else: returnMsg, remainder = msg[:lastWordbreak], msg[lastWordbreak:] # if this is ending with a comma or period then strip it off - if not getRemainder and returnMsg[-1] in (",", "."): returnMsg = returnMsg[:-1] + if not getRemainder and returnMsg and returnMsg[-1] in (",", "."): + returnMsg = returnMsg[:-1] if endType == Ending.ELLIPSE: returnMsg = returnMsg.rstrip() + "..."

1 0

[arm/release] Filling blank space in circ entries with nickname
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 5e1109836be738ce17adf596d5942f8dab98c020 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:17:56 2011 -0700 Filling blank space in circ entries with nickname The circuit entries on the connection panel had empty space besides the ip address field. Using this for the nickname. --- src/cli/connections/circEntry.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index 82ef0ff..f94f53a 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -192,6 +192,10 @@ class CircLine(connEntry.ConnectionLine): # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char dst = "%-53s" % self.getDestinationLabel(53, includeLocale = True) + + # fills the nickname into the empty space here + dst = "%s%-25s " % (dst[:25], uiTools.cropStr(self.foreign.getNickname(), 25, 0)) + etc = self.getEtcContent(width - baselineSpace - len(dst), listingType) elif listingType == entries.ListingType.HOSTNAME: # min space for the hostname is 40 characters

1 0

[arm/release] fix: using renamed functions/args in torctl
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 00ba915dc6f24476c19b4fb67d260a64063c19ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 16:01:30 2011 -0700 fix: using renamed functions/args in torctl The torctl patches had some functions and arguments renamed while being merged so using those. --- src/cli/headerPanel.py | 2 +- src/starter.py | 2 +- src/util/torTools.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 145e75b..7e0f639 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -133,7 +133,7 @@ class HeaderPanel(panel.Panel, threading.Thread): elif key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] - tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) + tmpConn, authType, authValue = TorCtl.TorCtl.preauth_connect(ctlAddr, ctlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: authValue = cli.popups.inputPrompt("Controller Password: ") diff --git a/src/starter.py b/src/starter.py index 94bb30b..e060274 100644 --- a/src/starter.py +++ b/src/starter.py @@ -358,7 +358,7 @@ if __name__ == '__main__': # making this a much bigger hack). try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.connectionComp(controlAddr, controlPort) + tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) diff --git a/src/util/torTools.py b/src/util/torTools.py index 17c54f0..7ea140b 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1629,7 +1629,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status(getIterator=True) + try: nsList = self.conn.get_network_status(get_iterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0

[arm/release] Flagging a couple important config options
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Config option for log regex patterns
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Adding summaries for new torrc options
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] fix: inconsistent capitalization for summaries
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Dropping usage of TorCtl.connect()
by atagar＠torproject.org 17 Jul '11

17 Jul '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

[arm/release] Use resizable panes for layout, added scrolled window for connections.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 39fe520fa85256c506c7f5eeb6dfd02bed787b05 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 14 01:29:13 2011 +0500 Use resizable panes for layout, added scrolled window for connections. --- src/gui/arm.xml | 550 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 287 insertions(+), 263 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index a511583..e58279b 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -282,358 +282,403 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox_main"> + <object class="GtkVPaned" id="vpaned_main"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkNotebook" id="notebook_main"> + <object class="GtkHPaned" id="hpaned_main"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkVBox" id="vbox_graph"> + <object class="GtkNotebook" id="notebook_main"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_graph_top"> - <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 40 Mb/s, Burst: 80 Mb/s</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> <child> - <object class="GtkHBox" id="hbox_graph"> + <object class="GtkVBox" id="vbox_graph"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkVBox" id="vbox_graph_primary"> + <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_graph_primary_top"> - <property name="visible">True</property> - <property name="label" translatable="yes">Download (0.0 b/sec)</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="placeholder_graph_primary"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_graph_primary_bottom"> - <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="label" translatable="yes">Limit: 40 Mb/s, Burst: 80 Mb/s</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox_graph_secondary"> + <object class="GtkHBox" id="hbox_graph"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="label_graph_secondary_top"> + <object class="GtkVBox" id="vbox_graph_primary"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload (0.0 b/sec)</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_graph_primary_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">Download (0.0 b/sec)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="placeholder_graph_primary"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_graph_primary_bottom"> + <property name="visible">True</property> + <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="placeholder_graph_secondary"> + <object class="GtkVBox" id="vbox_graph_secondary"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_graph_secondary_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">Upload (0.0 b/sec)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> - <placeholder/> + <object class="GtkVBox" id="placeholder_graph_secondary"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_graph_secondary_bottom"> + <property name="visible">True</property> + <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkLabel" id="label_graph_secondary_bottom"> - <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label_notebook_graph"> - <property name="visible">True</property> - <property name="label" translatable="yes">Graphs</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_conn"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_conn_top"> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_graph"> <property name="visible">True</property> - <property name="label" translatable="yes">2 Clients, 1 Control</property> + <property name="label" translatable="yes">Graphs</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="tab_fill">False</property> </packing> </child> <child> - <object class="GtkTreeView" id="treeview_conn"> + <object class="GtkVBox" id="vbox_conn"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_conn</property> - <property name="headers_visible">False</property> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_conn_origin"/> - <attributes> - <attribute name="foreground">4</attribute> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_dest"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_conn_dest"/> - <attributes> - <attribute name="foreground">4</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> + <property name="orientation">vertical</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_time"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_conn_time"/> - <attributes> - <attribute name="foreground">4</attribute> - <attribute name="markup">2</attribute> - </attributes> - </child> + <object class="GtkLabel" id="label_conn_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">2 Clients, 1 Control</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_type"> - <property name="title">column</property> + <object class="GtkScrolledWindow" id="scrolledwindow_conn"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext_conn_type"/> - <attributes> - <attribute name="foreground">4</attribute> - <attribute name="markup">3</attribute> - </attributes> + <object class="GtkTreeView" id="treeview_conn"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_conn</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_origin"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_dest"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_dest"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_time"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_time"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_type"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_type"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">3</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label_notebook_conn"> - <property name="visible">True</property> - <property name="label" translatable="yes">Connections</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_config"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_config_top"> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_conn"> <property name="visible">True</property> - <property name="label" translatable="yes">RelayBandwidthBurst (General Option) -Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) -Description: Limit the maximum token bucket size (also known as -the burst) for relayed traffic to the given number of bytes in -each direction. (Default: 0) </property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Connections</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> + <property name="tab_fill">False</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <object class="GtkVBox" id="vbox_config"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_config_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">RelayBandwidthBurst (General Option) +Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) +Description: Limit the maximum token bucket size (also known as +the burst) for relayed traffic to the given number of bytes in +each direction. (Default: 0) </property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkTreeView" id="treeview_config"> + <object class="GtkScrolledWindow" id="scrolledwindow_config"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore_config</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> - <property name="title">column</property> + <object class="GtkTreeView" id="treeview_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_config</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> + </object> </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> - <property name="title">column</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> - <property name="title">column</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> + </object> </child> </object> </child> </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_config"> + <property name="visible">True</property> + <property name="label" translatable="yes">Configuration</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> </packing> </child> </object> <packing> - <property name="position">2</property> + <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> - <child type="tab"> - <object class="GtkLabel" id="label_notebook_config"> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> <property name="visible">True</property> - <property name="label" translatable="yes">Configuration</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview_sticky"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_sticky</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> + <attributes> + <attribute name="markup">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> + <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> + <attributes> + <attribute name="foreground">2</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> </object> <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> <packing> - <property name="position">0</property> + <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> + <object class="GtkScrolledWindow" id="scrolledwindow_log"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTreeView" id="treeview_sticky"> + <object class="GtkTextView" id="textview_log"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore_sticky</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> - <attributes> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> - <attributes> - <attribute name="foreground">2</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> + <property name="buffer">textbuffer_log</property> </object> </child> </object> <packing> - <property name="padding">5</property> - <property name="position">1</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> @@ -641,27 +686,6 @@ each direction. (Default: 0) </property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow_log"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTextView" id="textview_log"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="buffer">textbuffer_log</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object>

1 0

[arm/release] Initial commit for bandwidth graphs.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit f874c839fdf7bee393492bd6b38a5e468b1b1a06 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 14 02:41:29 2011 +0500 Initial commit for bandwidth graphs. --- src/gui/controller.py | 51 +++++++++++++++++++++++++++++- src/gui/graphing/__init__.py | 6 +++ src/gui/graphing/bandwidthStats.py | 26 +++++++++++++++ src/gui/graphing/graphStats.py | 61 ++++++++++++++++++++++++++++++++++++ 4 files changed, 143 insertions(+), 1 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 0e444d3..91b9a03 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,14 +1,36 @@ +import gobject +import gtk + from util import torTools +from gui.graphing import graphStats, bandwidthStats -import gtk +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + +gobject.threads_init() class GuiController: def __init__(self): filename = 'src/gui/arm.xml' + self.builder = gtk.Builder() self.builder.add_from_file(filename) self.builder.connect_signals(self) + # for custom widgets not present in builder xml + self.widgets = {} + + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + self.bwStats = bandwidthStats.BandwidthStats(self.widgets) + + gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') + gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') + def run(self): window = self.builder.get_object('window_main') @@ -23,6 +45,33 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() + def _pack_graph_widget(self, name): + graph = CaGraph() + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = graphStats.GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} + fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} + series.style.line_color = line_colors[name] + series.style.fill_color = fill_colors[name] + + graph.seriess.append(series) + graph.grid = CaGraphGrid(graph, 0, 1) + + self.widgets['graph_%s' % name] = graph + def startGui(): controller = GuiController() controller.run() diff --git a/src/gui/graphing/__init__.py b/src/gui/graphing/__init__.py new file mode 100644 index 0000000..acc8645 --- /dev/null +++ b/src/gui/graphing/__init__.py @@ -0,0 +1,6 @@ +""" +Graphs. +""" + +__all__ = ["graphStats", "bandwidthStats"] + diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py new file mode 100644 index 0000000..304574e --- /dev/null +++ b/src/gui/graphing/bandwidthStats.py @@ -0,0 +1,26 @@ +""" +Bandwidth monitors. +""" + +import sys + +import gobject +import gtk + +from TorCtl import TorCtl +from gui.graphing import graphStats +from util import torTools + +class BandwidthStats(graphStats.GraphStats): + def __init__(self, widgets): + graphStats.GraphStats.__init__(self, widgets) + + conn = torTools.getConn() + if not conn.isAlive(): + conn.init() + conn.setControllerEvents(["BW"]) + conn.addEventListener(self) + + def bandwidth_event(self, event): + self._processEvent(event.read / 1024.0, event.written / 1024.0) + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py new file mode 100644 index 0000000..5037c39 --- /dev/null +++ b/src/gui/graphing/graphStats.py @@ -0,0 +1,61 @@ +""" +Base class for implementing graphing functionality. +""" + +import random +import sys + +from collections import deque + +import gobject +import gtk + +from TorCtl import TorCtl +from util import torTools + +GRAPH_INTERVAL = 30 + +class GraphStats(TorCtl.PostEventListener): + def __init__(self, widgets): + TorCtl.PostEventListener.__init__(self) + + self.widgets = widgets + + self.data = { + 'primary' : deque([0] * GRAPH_INTERVAL), + 'secondary' : deque([0] * GRAPH_INTERVAL)} + + def get_graph_data(self, name): + packed_data = [] + + for (index, value) in enumerate(self.data[name]): + packed_data.append((index, value)) + + return packed_data + + def is_graph_data_zero(self, name): + data = self.data[name] + return len(data) == map(int, data).count(0) + + def draw_graph(self, name): + graph = self.widgets['graph_%s' % name] + data = self.get_graph_data(name) + + if self.is_graph_data_zero(name): + graph.seriess[0].data = [] + else: + graph.seriess[0].data = data + + for (index, axis) in enumerate(graph.axiss): + if axis.type != 'xaxis': + graph.auto_set_yrange(index) + + graph.queue_draw() + return True + + def _processEvent(self, primary, secondary): + self.data['primary'].rotate(1) + self.data['primary'][0] = primary + self.data['secondary'].rotate(1) + self.data['secondary'][0] = secondary +

1 0