May 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Teach retry_listener about "auto" ports.
by nickm＠torproject.org 13 May '11

13 May '11

commit 61c06cbc66ecfaece20501417ef81b3f6f202391 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 15:26:39 2011 -0400 Teach retry_listener about "auto" ports. Otherwise, it will just immediately close any port declared with "auto" on the grounds that it wasn't configured. Now, it will allow "auto" to match any port. This means FWIW if you configure a socks port with SocksPort 9999 and then transition to SocksPort auto, the original socksport will not get closed and reopened. I'm considering this a feature. --- src/or/connection.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 47e5423..bc18dab 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1772,10 +1772,23 @@ retry_listeners(int type, config_line_t *cfg, if (!parse_addr_port(LOG_WARN, wanted->value, &address, NULL, &port)) { int addr_matches = !strcasecmp(address, conn->address); + int port_matches; tor_free(address); - if (! port) - port = port_option; - if (port == conn->port && addr_matches) { + if (port) { + /* The Listener line has a port */ + port_matches = (port == conn->port); + } else if (port_option == CFG_AUTO_PORT) { + /* The Listener line has no port, and the Port line is "auto". + * "auto" matches anything; transitions from any port to + * "auto" succeed. */ + port_matches = 1; + } else { + /* The Listener line has no port, and the Port line is "auto". + * "auto" matches anything; transitions from any port to + * "auto" succeed. */ + port_matches = (port_option == conn->port); + } + if (port_matches && addr_matches) { line = wanted; break; }

1 0

[torspec/master] Document feature3076-related GETINFO keys
by nickm＠torproject.org 13 May '11

13 May '11

commit e8b9f331bc92d31f2d9d5e2d14292095018f85bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 10:44:42 2011 -0400 Document feature3076-related GETINFO keys --- control-spec.txt | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 38c327b..162ac70 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -631,6 +631,16 @@ Section 4.1.14. This GETINFO option is currently available only for bridge relays. + "net/listeners/or" + "net/listeners/dir" + "net/listeners/socks" + "net/listeners/trans" + "net/listeners/natd" + "net/listeners/dns" + "net/listeners/control" + A space-separated list of the addresses at which Tor is listening for + connections of each specified type. [New in Tor 0.2.2.26-alpha.] + Examples: C: GETINFO version desc/name/moria1 S: 250+desc/name/moria=

1 0

[arm/master] fix: intermediate graph bounds sometimes missing
by atagar＠torproject.org 13 May '11

13 May '11

commit 0a17e8cec7619cd9d9343a48e6d971f3d4d833d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:14:31 2011 -0700 fix: intermediate graph bounds sometimes missing Graph bounds are omitted if they match the max or min bound (since, say, showing the second tick up as '0' really doesn't make sense). However, integer truncation caused many intermediate ticks to be rounded down to zero, and even if visible be inaccurate. --- src/cli/graphing/graphPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index c419119..ecf8c68 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -367,11 +367,11 @@ class GraphPanel(panel.Panel): if self.graphHeight % 2 == 0 and i >= (ticks / 2): row -= 1 if primaryMinBound != primaryMaxBound: - primaryVal = (primaryMaxBound - primaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1) + primaryVal = (primaryMaxBound - primaryMinBound) * (self.graphHeight - row - 1) / (self.graphHeight - 1) if not primaryVal in (primaryMinBound, primaryMaxBound): self.addstr(row + 2, 0, "%4i" % primaryVal, primaryColor) if secondaryMinBound != secondaryMaxBound: - secondaryVal = (secondaryMaxBound - secondaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1) + secondaryVal = (secondaryMaxBound - secondaryMinBound) * (self.graphHeight - row - 1) / (self.graphHeight - 1) if not secondaryVal in (secondaryMinBound, secondaryMaxBound): self.addstr(row + 2, graphCol + 5, "%4i" % secondaryVal, secondaryColor) # creates bar graph (both primary and secondary)

1 0

[arm/master] Removing last references to the old style popups
by atagar＠torproject.org 13 May '11

13 May '11

commit fc16a755e7140e8d5aa6d502053e5109078cacc9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:17:39 2011 -0700 Removing last references to the old style popups Dropping the ancient Popup class and removing the static panel reference that was previously used for all popups. All of its actual uses have been removed in the previous set of commits to use the new popup utils. --- src/cli/controller.py | 61 ++++--------------------------------------------- 1 files changed, 5 insertions(+), 56 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 6c26d81..51b64c7 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -89,7 +89,7 @@ REFRESH_RATE = 5 # seconds between redrawing screen CTL_HELP, CTL_PAUSED = range(2) # panel order per page -PAGE_S = ["header", "control", "popup"] # sticky (ie, always available) page +PAGE_S = ["header", "control"] # sticky (ie, always available) page PAGES = [ ["graph", "log"], ["conn"], @@ -182,46 +182,6 @@ class ControlPanel(panel.Panel): self.addstr(0, xLoc + 1, " " * barProgress, curses.A_STANDOUT | uiTools.getColor("red")) self.addstr(0, xLoc + barWidth + 1, "]", curses.A_BOLD) -class Popup(panel.Panel): - """ - Temporarily providing old panel methods until permanent workaround for popup - can be derrived (this passive drawing method is horrible - I'll need to - provide a version using the more active repaint design later in the - revision). - """ - - def __init__(self, stdscr, height): - panel.Panel.__init__(self, stdscr, "popup", 0, height) - - def setPaused(self, isPause): - panel.Panel.setPaused(self, isPause, True) - - # The following methods are to emulate old panel functionality (this was the - # only implementations to use these methods and will require a complete - # rewrite when refactoring gets here) - def clear(self): - if self.win: - self.isDisplaced = self.top > self.win.getparyx()[0] - if not self.isDisplaced: self.win.erase() - - def refresh(self): - if self.win and not self.isDisplaced: self.win.refresh() - - def recreate(self, stdscr, newWidth=-1, newTop=None): - self.setParent(stdscr) - self.setWidth(newWidth) - if newTop != None: self.setTop(newTop) - - newHeight, newWidth = self.getPreferredSize() - if newHeight > 0: - self.win = self.parent.subwin(newHeight, newWidth, self.top, 0) - elif self.win == None: - # don't want to leave the window as none (in very edge cases could cause - # problems) - rather, create a displaced instance - self.win = self.parent.subwin(1, newWidth, 0, 0) - - self.maxY, self.maxX = self.win.getmaxyx() - def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): """ Writes text with word wrapping, returning the ending y/x coordinate. @@ -435,7 +395,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels = { "header": headerPanel.HeaderPanel(stdscr, startTime, config), - "popup": Popup(stdscr, 9), "graph": graphing.graphPanel.GraphPanel(stdscr), "log": logPanel.LogPanel(stdscr, loggedEvents, config)} @@ -516,7 +475,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): isPaused = False # if true updates are frozen overrideKey = None # immediately runs with this input rather than waiting for the user if set page = 0 - panels["popup"].redraw(True) # hack to make sure popup has a window instance (not entirely sure why...) PAGE = page @@ -599,8 +557,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels[panelKey].setTop(startY) startY += panels[panelKey].getHeight() - panels["popup"].recreate(stdscr, 80, startY) - for panelSet in PAGES: tmpStartY = startY @@ -627,17 +583,10 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # I haven't the foggiest why, but doesn't work if redrawn out of order... for panelKey in (PAGE_S + PAGES[page]): - # redrawing popup can result in display flicker when it should be hidden - if panelKey != "popup": - newSize = stdscr.getmaxyx() - isResize = lastSize != newSize - lastSize = newSize - - if panelKey in ("header", "graph", "log", "config", "torrc", "conn2"): - # revised panel (manages its own content refreshing) - panels[panelKey].redraw(isResize) - else: - panels[panelKey].redraw(True) + newSize = stdscr.getmaxyx() + isResize = lastSize != newSize + lastSize = newSize + panels[panelKey].redraw(isResize) stdscr.refresh()

1 0

[arm/master] Replacing quit confirmation to use the popup util
by atagar＠torproject.org 13 May '11

13 May '11

commit 9ddfb9127a41991428736d98ef075cd77817eda4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:13:01 2011 -0700 Replacing quit confirmation to use the popup util --- src/cli/controller.py | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1189781..6c26d81 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -686,24 +686,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides prompt to confirm that arm should exit if CONFIRM_QUIT: - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Are you sure (q again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - quitConfirmed = confirmationKey in (ord('q'), ord('Q')) - curses.halfdelay(REFRESH_RATE * 10) - - if not quitConfirmed: - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() + msg = "Are you sure (q again to confirm)?" + confirmationKey = popups.showMsg(msg, attr = curses.A_BOLD) + quitConfirmed = confirmationKey in (ord('q'), ord('Q')) if quitConfirmed: # quits arm

1 0

[arm/master] Refactoring sighup handler to use new utils
by atagar＠torproject.org 13 May '11

13 May '11

commit c231d73d9f1d3e6be90aa0f97943ad862e8e1d6f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:07:30 2011 -0700 Refactoring sighup handler to use new utils Making the controller handler for issuing sighups use the popup utils. --- src/cli/controller.py | 34 +++++++--------------------------- 1 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d7b127c..1189781 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -778,33 +778,13 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): selectiveRefresh(panels, page) elif key == ord('x') or key == ord('X'): # provides prompt to confirm that arm should issue a sighup - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("This will reset Tor's internal state. Are you sure (x again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - if confirmationKey in (ord('x'), ord('X')): - try: - torTools.getConn().reload() - except IOError, exc: - log.log(log.ERR, "Error detected when reloading tor: %s" % sysTools.getFileErrorMsg(exc)) - - #errorMsg = " (%s)" % str(err) if str(err) else "" - #panels["control"].setMsg("Sighup failed%s" % errorMsg, curses.A_STANDOUT) - #panels["control"].redraw(True) - #time.sleep(2) - - # reverts display settings - curses.halfdelay(REFRESH_RATE * 10) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() + msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" + confirmationKey = popups.showMsg(msg, attr = curses.A_BOLD) + + if confirmationKey in (ord('x'), ord('X')): + try: torTools.getConn().reload() + except IOError, exc: + log.log(log.ERR, "Error detected when reloading tor: %s" % sysTools.getFileErrorMsg(exc)) elif key == ord('h') or key == ord('H'): overrideKey = popups.showHelpPopup() else:

1 0

[arm/master] Moving graph bounds switching to the graph panel
by atagar＠torproject.org 13 May '11

13 May '11

commit 233bd0609cf2ebdea034e4d57882d0a0961b11d2 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 20:57:28 2011 -0700 Moving graph bounds switching to the graph panel --- src/cli/controller.py | 5 ----- src/cli/graphing/graphPanel.py | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1384c4d..d7b127c 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -807,11 +807,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() elif key == ord('h') or key == ord('H'): overrideKey = popups.showHelpPopup() - elif page == 0 and (key == ord('b') or key == ord('B')): - # uses the next boundary type for graph - panels["graph"].bounds = graphing.graphPanel.Bounds.next(panels["graph"].bounds) - - selectiveRefresh(panels, page) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index ecf8c68..ef0267d 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -271,6 +271,10 @@ class GraphPanel(panel.Panel): if currentHeight < maxHeight + 1: self.setGraphHeight(self.graphHeight + 1) + elif key == ord('b') or key == ord('B'): + # uses the next boundary type + self.bounds = Bounds.next(self.bounds) + self.redraw(True) elif key == ord('s') or key == ord('S'): # provides a menu to pick the graphed stats availableStats = self.stats.keys()

1 0

[arm/master] Removing unused dimension arguments
by atagar＠torproject.org 13 May '11

13 May '11

commit 0df2a7b33a3ffc49b1fd38b53aeaa4314d025eba Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:02:14 2011 -0700 Removing unused dimension arguments Minor refactoring change suggested by pylint. --- src/cli/popups.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/popups.py b/src/cli/popups.py index b957186..dd56bfa 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -95,7 +95,7 @@ def showHelpPopup(): properly, this is an arrow, enter, or scroll key then this returns None. """ - popup, width, height = init(9, 80) + popup, _, height = init(9, 80) if not popup: return exitKey = None @@ -172,7 +172,7 @@ def showSortDialog(title, options, oldSelection, optionColors): optionColors - mappings of options to their color """ - popup, width, height = init(9, 80) + popup, _, _ = init(9, 80) if not popup: return newSelections = [] # new ordering @@ -272,7 +272,7 @@ def showMenu(title, options, oldSelection): """ maxWidth = max([len(label) for label in options]) + 9 - popup, width, height = init(len(options) + 2, maxWidth) + popup, _, _ = init(len(options) + 2, maxWidth) if not popup: return key, selection = 0, oldSelection if oldSelection != -1 else 0

1 0

[arm/master] Moving log snapshot saving to the log panel
by atagar＠torproject.org 13 May '11

13 May '11

commit 4474efa7379d855ede60f6edf1c678654be437a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 20:53:46 2011 -0700 Moving log snapshot saving to the log panel --- src/cli/controller.py | 30 ------------------------------ src/cli/logPanel.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 84205cb..1384c4d 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -812,36 +812,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels["graph"].bounds = graphing.graphPanel.Bounds.next(panels["graph"].bounds) selectiveRefresh(panels, page) - elif page == 0 and (key == ord('a') or key == ord('A')): - # allow user to enter a path to take a snapshot - abandons if left blank - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Path to save log snapshot: ") - panels["control"].redraw(True) - - # gets user input (this blocks monitor updates) - pathInput = panels["control"].getstr(0, 27) - - if pathInput: - try: - panels["log"].saveSnapshot(pathInput) - panels["control"].setMsg("Saved: %s" % pathInput, curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(2) - except IOError, exc: - panels["control"].setMsg("Unable to save snapshot: %s" % sysTools.getFileErrorMsg(exc), curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(2) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() - - panels["graph"].redraw(True) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 75cdab5..34bf759 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -867,6 +867,16 @@ class LogPanel(panel.Panel, threading.Thread): except ValueError, exc: popups.showMsg("Invalid flags: %s" % str(exc), 2) finally: popups.finalize() + elif key == ord('a') or key == ord('A'): + # lets user enter a path to take a snapshot, canceling if left blank + pathInput = popups.inputPrompt("Path to save log snapshot: ") + + if pathInput: + try: + self.saveSnapshot(pathInput) + popups.showMsg("Saved: %s" % pathInput, 2) + except IOError, exc: + popups.showMsg("Unable to save snapshot: %s" % sysTools.getFileErrorMsg(exc), 2) else: isKeystrokeConsumed = False return isKeystrokeConsumed

1 0

[arm/master] Moving event logging selection to the log panel
by atagar＠torproject.org 13 May '11

13 May '11

commit 4986780baff0740a7c55eaf7717697f54e305a5d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 20:45:55 2011 -0700 Moving event logging selection to the log panel --- src/cli/controller.py | 77 ------------------------------------------------- src/cli/logPanel.py | 56 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 79 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 035ef07..84205cb 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -277,32 +277,6 @@ def setPauseState(panels, monitorIsPaused, currentPage, overwrite=False): for key in allPanels: panels[key].setPaused(overwrite or monitorIsPaused or (key not in PAGES[currentPage] and key not in PAGE_S)) -def setEventListening(selectedEvents, isBlindMode): - # creates a local copy, note that a suspected python bug causes *very* - # puzzling results otherwise when trying to discard entries (silently - # returning out of this function!) - events = set(selectedEvents) - isLoggingUnknown = "UNKNOWN" in events - - # removes special types only used in arm (UNKNOWN, TORCTL, ARM_DEBUG, etc) - toDiscard = [] - for eventType in events: - if eventType not in logPanel.TOR_EVENT_TYPES.values(): toDiscard += [eventType] - - for eventType in list(toDiscard): events.discard(eventType) - - # adds events unrecognized by arm if we're listening to the 'UNKNOWN' type - if isLoggingUnknown: - events.update(set(logPanel.getMissingEventTypes())) - - setEvents = torTools.getConn().setControllerEvents(list(events)) - - # temporary hack for providing user selected events minus those that failed - # (wouldn't be a problem if I wasn't storing tor and non-tor events together...) - returnVal = list(selectedEvents.difference(torTools.FAILED_EVENTS)) - returnVal.sort() # alphabetizes - return returnVal - def connResetListener(conn, eventType): """ Pauses connection resolution when tor's shut down, and resumes if started @@ -507,7 +481,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if isSuccessful: panels["graph"].updateInterval = 4 # tells Tor to listen to the events we're interested - loggedEvents = setEventListening(loggedEvents, isBlindMode) #panels["log"].loggedEvents = loggedEvents # strips any that couldn't be set panels["log"].setLoggedEvents(loggedEvents) # strips any that couldn't be set @@ -869,56 +842,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["graph"].redraw(True) - elif page == 0 and (key == ord('e') or key == ord('E')): - # allow user to enter new types of events to log - unchanged if left blank - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Events to log: ") - panels["control"].redraw(True) - - # lists event types - popup = panels["popup"] - popup.height = 11 - popup.recreate(stdscr, 80) - - popup.clear() - popup.win.box() - popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) - lineNum = 1 - for line in logPanel.EVENT_LISTING.split("\n"): - line = line[6:] - popup.addstr(lineNum, 1, line) - lineNum += 1 - popup.refresh() - - # gets user input (this blocks monitor updates) - eventsInput = panels["control"].getstr(0, 15) - if eventsInput: eventsInput = eventsInput.replace(' ', '') # strips spaces - - # it would be nice to quit on esc, but looks like this might not be possible... - if eventsInput: - try: - expandedEvents = logPanel.expandEvents(eventsInput) - loggedEvents = setEventListening(expandedEvents, isBlindMode) - panels["log"].setLoggedEvents(loggedEvents) - except ValueError, exc: - panels["control"].setMsg("Invalid flags: %s" % str(exc), curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(2) - - # reverts popup dimensions - popup.height = 9 - popup.recreate(stdscr, 80) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() - - panels["graph"].redraw(True) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 745cb57..75cdab5 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -163,6 +163,28 @@ def getMissingEventTypes(): return [event for event in torEventTypes if not event in armEventTypes] else: return None # GETINFO call failed +def setEventListening(events): + """ + Configures the events Tor listens for, filtering non-tor events from what we + request from the controller. This returns a sorted list of the events we + successfully set. + + Arguments: + events - event types to attempt to set + """ + + events = set(events) # drops duplicates + torEvents = events.intersection(set(TOR_EVENT_TYPES.values())) + + # adds events unrecognized by arm if we're listening to the 'UNKNOWN' type + if "UNKNOWN" in events: + torEvents.update(set(getMissingEventTypes())) + + setEvents = torTools.getConn().setControllerEvents(list(torEvents)) + + # provides back the input set minus events we failed to set + return sorted(events.difference(torTools.FAILED_EVENTS)) + def loadLogMessages(): """ Fetches a mapping of common log messages to their runlevels from the config. @@ -552,6 +574,10 @@ class LogPanel(panel.Panel, threading.Thread): # collapses duplicate log entries if false, showing only the most recent self.showDuplicates = self._config["features.log.showDuplicateEntries"] + # restricts the input to the set of events we can listen to, and + # configures the controller to liten to them + loggedEvents = setEventListening(loggedEvents) + self.setPauseAttr("msgLog") # tracks the message log when we're paused self.msgLog = [] # log entries, sorted by the timestamp self.loggedEvents = loggedEvents # events we're listening to @@ -693,9 +719,12 @@ class LogPanel(panel.Panel, threading.Thread): """ if eventTypes == self.loggedEvents: return - self.valsLock.acquire() - self.loggedEvents = eventTypes + + # configures the controller to listen for these tor events, and provides + # back a subset without anything we're failing to listen to + setTypes = setEventListening(eventTypes) + self.loggedEvents = setTypes self.redraw(True) self.valsLock.release() @@ -815,6 +844,29 @@ class LogPanel(panel.Panel, threading.Thread): panel.CURSES_LOCK.release() if len(self.filterOptions) > MAX_REGEX_FILTERS: del self.filterOptions[MAX_REGEX_FILTERS:] + elif key == ord('e') or key == ord('E'): + # allow user to enter new types of events to log - unchanged if left blank + popup, width, height = popups.init(11, 80) + + if popup: + try: + # displays the available flags + popup.win.box() + popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) + eventLines = EVENT_LISTING.split("\n") + + for i in range(len(eventLines)): + popup.addstr(i + 1, 1, eventLines[i][6:]) + + popup.win.refresh() + + userInput = popups.inputPrompt("Events to log: ") + if userInput: + userInput = userInput.replace(' ', '') # strips spaces + try: self.setLoggedEvents(expandEvents(userInput)) + except ValueError, exc: + popups.showMsg("Invalid flags: %s" % str(exc), 2) + finally: popups.finalize() else: isKeystrokeConsumed = False return isKeystrokeConsumed

1 0