- tor-commits - lists.torproject.org

[arm/release] Format option for getstr method
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9ffda70c2203630b41a9f799e754f7f55e70e9b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 08:51:20 2011 -0700 Format option for getstr method Allowing string input fetching to have text attributes. --- src/util/panel.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 3f0a98a..5cbeaee 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,7 +573,7 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = ""): + def getstr(self, y, x, initialText = "", format = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then @@ -584,8 +584,11 @@ class Panel(): y - vertical location x - horizontal location initialText - starting text in this field + format - format used for the text """ + if not format: format = curses.A_NORMAL + # makes cursor visible try: previousCursorState = curses.curs_set(1) except curses.error: previousCursorState = 0 @@ -595,7 +598,8 @@ class Panel(): inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) # prepopulates the initial text - if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1]) + if initialText: + inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format) # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses @@ -609,7 +613,9 @@ class Panel(): else: textbox = curses.textpad.Textbox(inputSubwindow) + textbox.win.attron(format) userInput = textbox.edit(lambda key: _textboxValidate(textbox, key)).strip() + textbox.win.attroff(format) if textbox.lastcmd == curses.ascii.BEL: userInput = None # reverts visability settings

1 0

[arm/release] Migrate CLI code for fetching backlogs as well as TorCtl events.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 7b6d513582ab48619c3ee27bd1baabbfb9b9e9f8 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 25 14:58:34 2011 +0500 Migrate CLI code for fetching backlogs as well as TorCtl events. --- src/gui/logPanel.py | 56 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 78b218a..ab8eb4d 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -14,19 +14,59 @@ import gtk from TorCtl import TorCtl from util import log, uiTools, torTools -from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry, TorEventObserver +from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, + LogEntry, TorEventObserver, + DEFAULT_CONFIG, RUNLEVEL_EVENT_COLOR) + +STARTUP_EVENTS = 'N3' class LogPanel: def __init__(self, builder): self.builder = builder + self._config = dict(DEFAULT_CONFIG) self.msgLog = deque() + self.loggedEvents = setEventListening(expandEvents(STARTUP_EVENTS)) + + torEventBacklog = deque() + if self._config["features.log.prepopulate"]: + setRunlevels = list(set.intersection(set(self.loggedEvents), set(log.Runlevel.values()))) + readLimit = self._config["features.log.prepopulateReadLimit"] + addLimit = self._config["cache.logPanel.size"] + torEventBacklog = deque(getLogFileEntries(setRunlevels, readLimit, addLimit, self._config)) armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] log.addListeners(armRunlevels, self._register_arm_event) + setRunlevels = [] + for i in range(len(armRunlevels)): + if "ARM_" + log.Runlevel.values()[i] in self.loggedEvents: + setRunlevels.append(armRunlevels[i]) + + armEventBacklog = deque() + for level, msg, eventTime in log._getEntries(setRunlevels): + armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) + armEventBacklog.appendleft(armEventEntry) + + while armEventBacklog or torEventBacklog: + if not armEventBacklog: + self.msgLog.append(torEventBacklog.popleft()) + elif not torEventBacklog: + self.msgLog.append(armEventBacklog.popleft()) + elif armEventBacklog[0].timestamp < torEventBacklog[0].timestamp: + self.msgLog.append(torEventBacklog.popleft()) + else: + self.msgLog.append(armEventBacklog.popleft()) + conn = torTools.getConn() conn.addEventListener(TorEventObserver(self.register_event)) + conn.addTorCtlListener(self._register_torctl_event) + + def pack_widgets(self): + liststore = self.builder.get_object('liststore_log') + + liststore.set_sort_func(1, self._compare_rows) + liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) def fill_log(self): liststore = self.builder.get_object('liststore_log') @@ -41,11 +81,13 @@ class LogPanel: self.msgLog.appendleft(event) self.fill_log() - def pack_widgets(self): - liststore = self.builder.get_object('liststore_log') + def _register_arm_event(self, level, msg, eventTime): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) - liststore.set_sort_func(1, self._compare_rows) - liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) + def _register_torctl_event(self, level, msg): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(time.time(), "TORCTL_%s" % level, msg, eventColor)) def _compare_rows(self, treemodel, iter1, iter2, data=None): timestamp_raw1 = treemodel.get(iter1, 0) @@ -53,7 +95,3 @@ class LogPanel: return cmp(timestamp_raw1, timestamp_raw2) - def _register_arm_event(self, level, msg, eventTime): - eventColor = RUNLEVEL_EVENT_COLOR[level] - self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) -

1 0

[arm/release] Relay options page for the setup wizard
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 2449cb349a24ab23872f415d0f192b25996f8588 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 24 20:05:25 2011 -0700 Relay options page for the setup wizard This has the display and navigation logic for the relay settings page of the wizard. The only bit missing is input validation of the text field inputs (for instance, checking that a bandwidth value will be recognized), but otherwise this part of the wizard is pretty much done. --- src/cli/wizard.py | 242 ++++++++++++++++++++++++++++++++++++++++++++--------- src/settings.cfg | 47 ++++++++--- 2 files changed, 237 insertions(+), 52 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index f9dd770..a3404b9 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -1,6 +1,6 @@ """ Provides user prompts for setting up a new relay. This autogenerates a torrc -that's used by arm to start its tor instance. +that's used by arm to run its own tor instance. """ import curses @@ -13,23 +13,124 @@ from util import enum, uiTools # basic configuration types we can run as RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +# all options that can be configured +Options = enum.Enum("NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "STARTUP") +RelayOptions = (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.STARTUP) + # other options provided in the prompts -CANCEL, BACK = "Cancel", "Back" +CANCEL, NEXT, BACK = "Cancel", "Next", "Back" + +MSG_COLOR = "green" +OPTION_COLOR = "yellow" -CONFIG = {"wizard.role.message": "", - "wizard.role.option.label": {}, - "wizard.role.option.description": {}} +CONFIG = {"wizard.message.role": "", + "wizard.message.relay": "", + "wizard.toggle": {}, + "wizard.default": {}, + "wizard.label.general": {}, + "wizard.label.role": {}, + "wizard.label.opt": {}, + "wizard.description.general": {}, + "wizard.description.role": {}, + "wizard.description.opt": {}} def loadConfig(config): config.update(CONFIG) +class ConfigOption: + """ + Attributes of a configuraition option. + """ + + def __init__(self, key, group, default): + """ + Configuration option constructor. + + Arguments: + key - configuration option identifier used when querying attributes + group - configuration attribute group this belongs to + default - initial value, uses the config default if unset + """ + + self.key = key + self.group = group + self.descriptionCache = None + self.descriptionCacheArg = None + self.value = default + + def getKey(self): + return self.key + + def getValue(self): + return self.value + + def getDisplayValue(self): + return self.value + + def setValue(self, value): + self.value = value + + def getLabel(self, prefix = ""): + return prefix + CONFIG["wizard.label.%s" % self.group].get(self.key, "") + + def getDescription(self, width, prefix = ""): + if not self.descriptionCache or self.descriptionCacheArg != width: + optDescription = CONFIG["wizard.description.%s" % self.group].get(self.key, "") + self.descriptionCache = _splitStr(optDescription, width) + self.descriptionCacheArg = width + + return [prefix + line for line in self.descriptionCache] + +class ToggleConfigOption(ConfigOption): + def __init__(self, key, group, default, trueLabel, falseLabel): + ConfigOption.__init__(self, key, group, default) + self.trueLabel = trueLabel + self.falseLabel = falseLabel + + def getDisplayValue(self): + return self.trueLabel if self.value else self.falseLabel + + def toggle(self): + self.value = not self.value + def showWizard(): - myRelayType = promptRelayType() + relayType, config = None, {} + + for option in Options.values(): + toggleValues = CONFIG["wizard.toggle"].get(option) + default = CONFIG["wizard.default"].get(option, "") + + if toggleValues: + if "," in toggleValues: + trueLabel, falseLabel = toggleValues.split(",", 1) + else: trueLabel, falseLabel = toggleValues, "" + + isSet = default.lower() == "true" + config[option] = ToggleConfigOption(option, "opt", isSet, trueLabel.strip(), falseLabel.strip()) + else: config[option] = ConfigOption(option, "opt", default) + + while True: + if relayType == None: + selection = promptRelayType() + + if selection == CANCEL: break + else: relayType = selection + else: + if relayType == RelayType.RELAY: + selection = promptRelayOptions(config) + + if selection == BACK: relayType = None + elif selection == NEXT: break # TODO: implement next screen + else: + break # TODO: other catagories not yet implemented + + # redraws screen to clear away the dialog we just showed + cli.controller.getController().requestRedraw(True) def promptRelayType(): """ Provides a prompt for selecting the general role we'd like Tor to run with. - This returns a RelayType enumeration for the selection, or None if the + This returns a RelayType enumeration for the selection, or CANCEL if the dialog was canceled. """ @@ -37,66 +138,127 @@ def promptRelayType(): if not popup: return control = cli.controller.getController() key, selection = 0, 0 - - # constructs (enum, label, [description lines]) tuples for our options - options = [] - - for runType in RelayType.values() + [CANCEL]: - label = CONFIG["wizard.role.option.label"].get(runType, "") - descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") - descLines = [] - - while descRemainder: - descLine, descRemainder = uiTools.cropStr(descRemainder, 52, None, endType = None, getRemainder = True) - descLines.append(descLine.strip()) - - options.append((runType, label, descLines)) + options = [ConfigOption(opt, "role", opt) for opt in RelayType.values()] + options.append(ConfigOption(CANCEL, "general", CANCEL)) try: popup.win.box() curses.cbreak() - format = uiTools.getColor("green") - y, msgRemainder = 1, CONFIG["wizard.role.message"] # provides the welcoming message - while msgRemainder: - msg, msgRemainder = uiTools.cropStr(msgRemainder, 54, None, endType = None, getRemainder = True) - popup.addstr(y, 2, msg.strip(), format | curses.A_BOLD) - y += 1 + topContent = _splitStr(CONFIG["wizard.message.role"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) - while not uiTools.isSelectionKey(key): - offset = 0 + while True: + y, offset = len(topContent) + 1, 0 for i in range(len(options)): - _, label, lines = options[i] - optionFormat = format | curses.A_STANDOUT if i == selection else format - - # appends an extra space to the start to provide nicer centering - label = " " + label - lines = [" " + line for line in lines] + optionFormat = uiTools.getColor(MSG_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT # Curses has a weird bug where there's a one-pixel alignment # difference between bold and regular text, so it looks better # to render the whitespace here as not being bold. offset += 1 + label = options[i].getLabel(" ") popup.addstr(y + offset, 2, label, optionFormat | curses.A_BOLD) popup.addstr(y + offset, 2 + len(label), " " * (54 - len(label)), optionFormat) offset += 1 - for line in lines: + for line in options[i].getDescription(52, " "): popup.addstr(y + offset, 2, uiTools.padStr(line, 54), optionFormat) offset += 1 popup.win.refresh() key = control.getScreen().getch() - if key == curses.KEY_UP: selection = max(0, selection - 1) - elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): return options[selection].getValue() + elif key == 27: return CANCEL # esc - cancel + finally: + cli.popups.finalize() + +def promptRelayOptions(config): + """ + Prompts the user for the configuration of an internal relay. + """ + + popup, _, _ = cli.popups.init(23, 58) + if not popup: return + control = cli.controller.getController() + options = [config[opt] for opt in RelayOptions] + options.append(ConfigOption(BACK, "general", "(to role selection)")) + options.append(ConfigOption(NEXT, "general", "(to confirm options)")) + key, selection = 0, 0 + + try: + curses.cbreak() + + while True: + popup.win.erase() + popup.win.box() + + # provides the description for internal relays + topContent = _splitStr(CONFIG["wizard.message.relay"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) + + y, offset = len(topContent) + 1, 0 + for i in range(len(options)): + label = " %-30s%s" % (options[i].getLabel(), options[i].getDisplayValue()) + optionFormat = curses.A_BOLD | uiTools.getColor(OPTION_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT + + offset += 1 + popup.addstr(y + offset, 2, uiTools.padStr(label, 54), optionFormat) + + # extra space to divide options/navigation + if i == len(options) - 3: offset += 1 + + # divider between the options and description + offset += 2 + popup.addch(y + offset, 0, curses.ACS_LTEE) + popup.addch(y + offset, popup.getWidth() - 1, curses.ACS_RTEE) + popup.hline(y + offset, 1, popup.getWidth() - 2) + + # description for the currently selected option + for line in options[selection].getDescription(54, " "): + offset += 1 + popup.addstr(y + offset, 1, line, uiTools.getColor(MSG_COLOR)) + + popup.win.refresh() + key = control.getScreen().getch() + + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): + if selection == len(options) - 2: return BACK # selected back + elif selection == len(options) - 1: return NEXT # selected next + elif isinstance(options[selection], ToggleConfigOption): + options[selection].toggle() + else: + newValue = popup.getstr(y + selection + 1, 33, options[selection].getValue(), curses.A_STANDOUT | uiTools.getColor(OPTION_COLOR), 23) + if newValue: options[selection].setValue(newValue.strip()) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: cli.popups.finalize() + +def _splitStr(msg, width): + """ + Splits a string into substrings of a given length. + + Arguments: + msg - string to be broken up + width - max length of any returned substring + """ + + results = [] + while msg: + msgSegment, msg = uiTools.cropStr(msg, width, None, endType = None, getRemainder = True) + results.append(msgSegment.strip()) - selectedOption = options[selection][0] - return None if selectedOption == CANCEL else selectedOption + return results diff --git a/src/settings.cfg b/src/settings.cfg index 2ad2784..94ff9c1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,20 +340,43 @@ msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps -# descriptions used in the relay setup wizard -wizard.role.message Welcome to the Tor network! This will step you through the configuration process for being a part of it. To start with, what role would you like to have? +# configuration option attributes used in the relay setup wizard +wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? +wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. -wizard.role.option.label Relay => Internal Relay -wizard.role.option.label Exit => Exit Relay -wizard.role.option.label Bridge => Bridge -wizard.role.option.label Client => Client -wizard.role.option.label Cancel => Cancel +wizard.toggle Notify => Yes, No +wizard.toggle Startup => Yes, No -wizard.role.option.description Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. -wizard.role.option.description Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. -wizard.role.option.description Bridge => Non-public relay specifically for helping censored users. -wizard.role.option.description Client => Use the network without contributing to it. -wizard.role.option.description Cancel => Close without starting Tor. +wizard.default Nickname => Unnamed +wizard.default Notify => true +wizard.default Bandwidth => 5 MB/s +wizard.default Startup => true + +wizard.label.general Cancel => Cancel +wizard.label.general Back => Previous +wizard.label.general Next => Next +wizard.label.role Relay => Internal Relay +wizard.label.role Exit => Exit Relay +wizard.label.role Bridge => Bridge +wizard.label.role Client => Client +wizard.label.opt Nickname => Nickname +wizard.label.opt Contact => Contact Information +wizard.label.opt Notify => Issue Notification +wizard.label.opt Bandwidth => Relay Speed +wizard.label.opt Limit => Monthly Limit +wizard.label.opt Startup => Run At Startup + +wizard.description.general Cancel => Close without starting Tor. +wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.description.role Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. +wizard.description.role Bridge => Non-public relay specifically for helping censored users. +wizard.description.role Client => Use the network without contributing to it. +wizard.description.opt Nickname => Human friendly name for your relay. If this is unique then it's used instead of your fingerprint (a forty character hex string) when pages like TorStatus refer to you. +wizard.description.opt Contact => Address we can contact you at if there's a problem with your relay. This is public information so, if it looks like an email address, we'll obscure it a bit. +wizard.description.opt Notify => Sends automated email notifications to the above address if your relay is unreachable or out of date. This service is provided by Tor Weather (https://weather.torproject.org/) and will send you a confirmation email before it's started. +wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. +wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. +wizard.description.opt Startup => Runs Tor in the background when the system starts. # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions

1 0

[arm/release] Remove debug log statement and update log panel regularly via gobject.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 01529c340943a2b82cb6b98902e38cd10b4fcb86 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 25 15:06:55 2011 +0500 Remove debug log statement and update log panel regularly via gobject. --- src/gui/controller.py | 2 -- src/gui/logPanel.py | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 090cc31..1c173af 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -24,8 +24,6 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - log.log(log.DEBUG, "Hello world!") - def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index ab8eb4d..0a00137 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -62,6 +62,8 @@ class LogPanel: conn.addEventListener(TorEventObserver(self.register_event)) conn.addTorCtlListener(self._register_torctl_event) + gobject.timeout_add(1000, self.fill_log) + def pack_widgets(self): liststore = self.builder.get_object('liststore_log') @@ -77,9 +79,10 @@ class LogPanel: row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) + return True + def register_event(self, event): self.msgLog.appendleft(event) - self.fill_log() def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0

[arm/release] Tor shutdown indicator when in client mode
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8fd556d502e42c33eaff038b6a6b0d2b99523da3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 09:46:49 2011 -0700 Tor shutdown indicator when in client mode When we're running as a client the ports line is replaced with the shutdown message when tor is no longer running. Also changing the "Relaying Disabled" indicator to be cyan rather than bold red since this isn't really a problem. --- src/cli/headerPanel.py | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index b5b3826..145e75b 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -183,7 +183,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4)) # Line 2 / Line 2 Left (tor ip/port information) - x = 0 + x, includeControlPort = 0, True if self.vals["tor/orPort"]: myAddress = "Unknown" if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] @@ -198,21 +198,29 @@ class HeaderPanel(panel.Panel, threading.Thread): else: break else: # non-relay (client only) - # TODO: not sure what sort of stats to provide... - self.addstr(1, x, "Relaying Disabled", curses.A_BOLD | uiTools.getColor("red")) - x += 17 - - if self.vals["tor/isAuthPassword"]: authType = "password" - elif self.vals["tor/isAuthCookie"]: authType = "cookie" - else: authType = "open" - - if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: - authColor = "red" if authType == "open" else "green" - self.addstr(1, x, ", Control Port (") - self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) - self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) - elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) + if self._isTorConnected: + self.addstr(1, x, "Relaying Disabled", uiTools.getColor("cyan")) + x += 17 + else: + statusTime = torTools.getConn().getStatus()[1] + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) + self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) + self.addstr(1, x + 16, " (%s, press r to reconnect)" % statusTimeLabel) + x += 41 + len(statusTimeLabel) + includeControlPort = False + + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + authColor = "red" if authType == "open" else "green" + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0)

1 0

[arm/release] fix: miscropping strings breaking on first word
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e6b64e48e67a5590a4069510f7f53bb28c11ed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 19:29:36 2011 -0700 fix: miscropping strings breaking on first word When cropping strings where we'd be splitting the first word only the last character would be dropped. For instance... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'CookieAuthFileGroupReadabl...' rather than... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'Cooki...' --- src/util/uiTools.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 5204960..1b32caa 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -242,13 +242,22 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge # checks if there isn't the minimum space needed to include anything lastWordbreak = msg.rfind(" ", 0, size + 1) - lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces - if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): - if getRemainder: return ("", msg) - else: return "" - if minWordLen == None: minWordLen = sys.maxint - includeCrop = size - lastWordbreak - 1 >= minWordLen + if lastWordbreak == -1: + # we're splitting the first word + if minWordLen == None or size < minWordLen: + if getRemainder: return ("", msg) + else: return "" + + includeCrop = True + else: + lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces + if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): + if getRemainder: return ("", msg) + else: return "" + + if minWordLen == None: minWordLen = sys.maxint + includeCrop = size - lastWordbreak - 1 >= minWordLen # if there's a max crop size then make sure we're cropping at least that many characters if includeCrop and minCrop:

1 0

[arm/release] fix: cropping displayed by an extra cell
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 7dc62fb0aee20285c0651c97ea42d37b82e255a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:04:55 2011 -0700 fix: cropping displayed by an extra cell The width panels were using was off by one (probably due to being overly conservative about curses crashes long, long ago). --- src/util/panel.py | 2 +- src/util/uiTools.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 70f72a3..3bdcd6f 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -403,7 +403,7 @@ class Panel(): try: if forceRedraw: self.win.erase() # clears any old contents - self.draw(self.maxX - 1, self.maxY) + self.draw(self.maxX, self.maxY) self.win.refresh() finally: CURSES_LOCK.release() diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 1b32caa..ce467c3 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -315,18 +315,18 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): """ # draws the top and bottom - panel.hline(top, left + 1, width - 1, attr) - panel.hline(top + height - 1, left + 1, width - 1, attr) + panel.hline(top, left + 1, width - 2, attr) + panel.hline(top + height - 1, left + 1, width - 2, attr) # draws the left and right sides panel.vline(top + 1, left, height - 2, attr) - panel.vline(top + 1, left + width, height - 2, attr) + panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width, curses.ACS_URCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - panel.addch(top + height - 1, left + width, curses.ACS_LRCORNER, attr) + panel.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, attr) def isSelectionKey(key): """

1 0

[arm/release] Fixed default labels.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit bebfedd1300392223436d49e018910f56b219b37 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:41:39 2011 +0500 Fixed default labels. --- src/gui/arm.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index e62c622..11f5c63 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <child> <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> + <property name="label" translatable="yes">Limit: 0.00 b/s, Burst: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Download: 0.00 Kb/s</property> + <property name="label" translatable="yes">Download: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> + <property name="label" translatable="yes">Upload: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property>

1 0

[arm/release] Autofetching new torctl bundle
by atagar＠torproject.org 17 Jul '11

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

[arm/release] Implement bandwidth stats in graph labels.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 40174345257913b871b87e8e513b911b0ec07205 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:36:03 2011 +0500 Implement bandwidth stats in graph labels. --- src/gui/arm.xml | 10 ++++---- src/gui/controller.py | 4 ++- src/gui/graphing/bandwidthStats.py | 37 ++++++++++++++++++++++++---- src/gui/graphing/graphStats.py | 47 +++++++++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 23230b6..e62c622 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <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> + <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <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> + <property name="label" translatable="yes">Download: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -344,7 +344,7 @@ <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> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <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> + <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <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> + <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gui/controller.py b/src/gui/controller.py index 91b9a03..7f85b9a 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -26,10 +26,12 @@ class GuiController: self._pack_graph_widget('primary') self._pack_graph_widget('secondary') - self.bwStats = bandwidthStats.BandwidthStats(self.widgets) + self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 304574e..a8278d8 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -9,18 +9,45 @@ import gtk from TorCtl import TorCtl from gui.graphing import graphStats -from util import torTools +from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, widgets): - graphStats.GraphStats.__init__(self, widgets) + def __init__(self, builder, widgets): + graphStats.GraphStats.__init__(self, builder, widgets) conn = torTools.getConn() if not conn.isAlive(): conn.init() - conn.setControllerEvents(["BW"]) + + conn.setControllerEvents(["BW", "NEWDESC"]) conn.addEventListener(self) + self.new_desc_event(None) + + def new_desc_event(self, event): + conn = torTools.getConn() + + if not conn.isAlive(): + return + + bwRate = conn.getMyBandwidthRate() + bwBurst = conn.getMyBandwidthBurst() + bwObserved = conn.getMyBandwidthObserved() + bwMeasured = conn.getMyBandwidthMeasured() + + if bwRate and bwBurst: + bwRateLabel = uiTools.getSizeLabel(bwRate, 1, False, isBytes=False) + bwBurstLabel = uiTools.getSizeLabel(bwBurst, 1, False, isBytes=False) + + msg = "Limit: %s/s, Burst: %s/s" % (bwRateLabel, bwBurstLabel) + label = self.builder.get_object('label_graph_top') + label.set_text(msg) + def bandwidth_event(self, event): - self._processEvent(event.read / 1024.0, event.written / 1024.0) + self._processEvent(event.read, event.written) + + msg = 'Download: %s/s' % uiTools.getSizeLabel(event.read, 2, isBytes=False) + self.update_header('primary', msg) + msg = 'Upload: %s/s' % uiTools.getSizeLabel(event.written, 2, isBytes=False) + self.update_header('secondary', msg) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 5037c39..c000ff4 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -11,19 +11,23 @@ import gobject import gtk from TorCtl import TorCtl -from util import torTools +from util import uiTools, torTools GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, widgets): + def __init__(self, builder, widgets): TorCtl.PostEventListener.__init__(self) + self.builder = builder self.widgets = widgets self.data = { - 'primary' : deque([0] * GRAPH_INTERVAL), - 'secondary' : deque([0] * GRAPH_INTERVAL)} + 'primary' : deque([0.0] * GRAPH_INTERVAL), + 'secondary' : deque([0.0] * GRAPH_INTERVAL)} + + self.total = {'primary': 0.0, 'secondary' : 0.0} + self.ticks = {'primary': 0, 'secondary' : 0} def get_graph_data(self, name): packed_data = [] @@ -51,11 +55,38 @@ class GraphStats(TorCtl.PostEventListener): graph.auto_set_yrange(index) graph.queue_draw() + return True + def update_labels(self, name): + avg = 0 + + try: + avg = self.total[name] / float(self.ticks[name]) + except ZeroDivisionError: + pass + + msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), + uiTools.getSizeLabel(self.total[name], 2)) + label = self.builder.get_object('label_graph_%s_bottom' % name) + label.set_text(msg) + + return True + + def update_header(self, name, msg): + label = self.builder.get_object('label_graph_%s_top' % name) + label.set_text(msg) + 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 + values = {'primary' : primary, 'secondary' : secondary} + + for name in ('primary', 'secondary'): + # right shift and store kbytes in left-most location + self.data[name].rotate(1) + self.data[name][0] = values[name] / 1024 + + self.total[name] = self.total[name] + values[name] + + if values[name] > 0: + self.ticks[name] = self.ticks[name] + 1

1 0