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

[torouter/master] Make the network interfaces be inside config.py
by hellais＠torproject.org 25 Aug '11

25 Aug '11

commit 2da67986a68571789172cc1f469f2d010d8128de Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 25 01:57:59 2011 +0200 Make the network interfaces be inside config.py --- packages/torouter-web/src/tui/config.py | 3 +++ .../torouter-web/src/tui/controllers/network.py | 2 +- packages/torouter-web/src/tui/utils/parsing.py | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index 73087f2..69ea54d 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -11,6 +11,9 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") +# Network devices +network_devices = ('wlan0', 'eth0', 'eth1') + #interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" torrc_file = "/var/tmp/tor-tui/torrc" diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index 6b62da7..598d332 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -81,7 +81,7 @@ class wireless: itfc.set_mac(data.mac) itfc.wifi['netmask'] = data.netmask itfc.wifi['address'] = data.address - filecontent = itfc.exclude_output("wlan0") + itfc.output(itfc.wifi) + filecontent = itfc.exclude_output(config.network_interfaces[0]) + itfc.output(itfc.wifi) files = [('/etc/network/interfaces', filecontent)] fileio.write(files) #print itfc.output(itfc.wifi) diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index 690d15d..310ea5c 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -2,6 +2,7 @@ # files, they will be used inside torouter to visualize # and edit configuration import os, re +from tui import config class interfaces: def __init__(self,filename): @@ -31,7 +32,7 @@ class interfaces: def parse_line(self, line, iface): name = line.split(" ")[0] values = " ".join(line.split(" ")[1:]).rstrip() - if iface == "wlan0": + if iface == config.network_interfaces[0]: if self.wifi.has_key(name): if type(self.wifi[name]) is list: self.wifi[name].append(values) @@ -39,7 +40,7 @@ class interfaces: self.wifi[name] = [self.wifi[name],values] else: self.wifi.update({name : values}) - elif iface == "eth1": + elif iface == config.network_interfaces[2]: if self.eth1.has_key(name): if type(self.eth1[name]) is list: self.eth1[name].append(values) @@ -47,7 +48,7 @@ class interfaces: self.eth1[name] = [self.eth1[name],values] else: self.eth1.update({name : values}) - elif iface == "eth0": + elif iface == config.network_interfaces[1]: if self.eth0.has_key(name): if type(self.eth0[name]) is list: self.eth0[name].append(values) @@ -103,7 +104,7 @@ class interfaces: # XXX currently works for one pre-up entry, must make it work also for arrays def set_mac(self, mac): - self.wifi['pre-up'] = 'ifconfig wlan0 hw ether ' + mac + self.wifi['pre-up'] = 'ifconfig ' + config.network_interfaces[0] + ' hw ether ' + mac class torrc:

1 0

[tor/master] Apply rate-limiting to the lowest bufferevent in the stack.
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit 59d0f750c972011372febefbee958b37a17a0569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:09:56 2011 -0400 Apply rate-limiting to the lowest bufferevent in the stack. When we're doing filtering ssl bufferevents, we want the rate-limits to apply to the lowest level of the bufferevent stack, so that we're actually limiting bytes sent on the network. Otherwise, we'll read from the network aggressively, and only limit stuff as we process it. --- changes/bug3804 | 4 ++++ src/common/compat_libevent.c | 26 ++++++++++++++++++++++++++ src/common/compat_libevent.h | 6 ++++++ src/or/connection.c | 2 +- src/or/connection_or.c | 4 ++-- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/changes/bug3804 b/changes/bug3804 new file mode 100644 index 0000000..d498db8 --- /dev/null +++ b/changes/bug3804 @@ -0,0 +1,4 @@ + o Major bugfixes (bufferevents): + - Apply rate-limiting only at the bottom of a chain of filtering + bufferevents. This prevents us from filling up internal memory + buffers. Bugfix on 0.2.3.1-alpha; fixes bug 3804. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 595742f..beae950 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -20,6 +20,9 @@ #ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> #include <event2/thread.h> +#ifdef USE_BUFFEREVENTS +#include <event2/bufferevent.h> +#endif #else #include <event.h> #endif @@ -614,5 +617,28 @@ tor_libevent_get_one_tick_timeout(void) } return one_tick; } + +static struct bufferevent * +tor_get_root_bufferevent(struct bufferevent *bev) +{ + struct bufferevent *u; + while ((u = bufferevent_get_underlying(bev)) != NULL) + bev = u; + return bev; +} + +int +tor_set_bufferevent_rate_limit(struct bufferevent *bev, + struct ev_token_bucket_cfg *cfg) +{ + return bufferevent_set_rate_limit(tor_get_root_bufferevent(bev), cfg); +} + +int +tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, + struct bufferevent_rate_limit_group *g) +{ + return bufferevent_add_to_rate_limit_group(tor_get_root_bufferevent(bev), g); +} #endif diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index bbe105b..15b0fc2 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -10,6 +10,8 @@ struct event; struct event_base; #ifdef USE_BUFFEREVENTS struct bufferevent; +struct ev_token_bucket_cfg; +struct bufferevent_rate_limit_group; #endif #ifdef HAVE_EVENT2_EVENT_H @@ -74,6 +76,10 @@ const char *tor_libevent_get_version_str(void); #define TOR_LIBEVENT_TICKS_PER_SECOND 3 const struct timeval *tor_libevent_get_one_tick_timeout(void); int tor_libevent_using_iocp_bufferevents(void); +int tor_set_bufferevent_rate_limit(struct bufferevent *bev, + struct ev_token_bucket_cfg *cfg); +int tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, + struct bufferevent_rate_limit_group *g); #endif #endif diff --git a/src/or/connection.c b/src/or/connection.c index f8f82a3..c4cbef4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2509,7 +2509,7 @@ connection_enable_rate_limiting(connection_t *conn) if (conn->bufev) { if (!global_rate_limit) connection_bucket_init(); - bufferevent_add_to_rate_limit_group(conn->bufev, global_rate_limit); + tor_add_bufferevent_to_rate_limit_group(conn->bufev, global_rate_limit); } } diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e66d36a..a75444e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -585,7 +585,7 @@ connection_or_update_token_buckets_helper(or_connection_t *conn, int reset, burst, tick); old_cfg = conn->bucket_cfg; if (conn->_base.bufev) - bufferevent_set_rate_limit(conn->_base.bufev, cfg); + tor_set_bufferevent_rate_limit(conn->_base.bufev, cfg); if (old_cfg) ev_token_bucket_cfg_free(old_cfg); conn->bucket_cfg = cfg; @@ -1102,7 +1102,7 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) } conn->_base.bufev = b; if (conn->bucket_cfg) - bufferevent_set_rate_limit(conn->_base.bufev, conn->bucket_cfg); + tor_set_bufferevent_rate_limit(conn->_base.bufev, conn->bucket_cfg); connection_enable_rate_limiting(TO_CONN(conn)); connection_configure_bufferevent_callbacks(TO_CONN(conn));

1 0

[tor/master] Add write watermarks to filtered bufferevents.
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit f186e16241f7d6a0090260f87ce412a0fb7ec47a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:18:25 2011 -0400 Add write watermarks to filtered bufferevents. --- changes/bug3804 | 9 +++++++-- src/common/tortls.c | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug3804 b/changes/bug3804 index d498db8..7ad091c 100644 --- a/changes/bug3804 +++ b/changes/bug3804 @@ -1,4 +1,9 @@ o Major bugfixes (bufferevents): - Apply rate-limiting only at the bottom of a chain of filtering - bufferevents. This prevents us from filling up internal memory - buffers. Bugfix on 0.2.3.1-alpha; fixes bug 3804. + bufferevents. This prevents us from filling up internal read + buffers and violating rate-limits when filtering bufferevents + are enabled. Bugfix on 0.2.3.1-alpha; fixes part of bug 3804. + - Add high-watermarks to the output buffers for filtered + bufferevents. This prevents us from filling up internal write + buffers and wasting CPU cycles when filtering bufferevents are + enabled. Bugfix on 0.2.3.1-alpha; fixes part of bug 3804. diff --git a/src/common/tortls.c b/src/common/tortls.c index 2aaa2c4..1bb9c74 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -51,6 +51,7 @@ #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h> +#include <event2/event.h> #include "compat_libevent.h" #endif @@ -1905,6 +1906,10 @@ tor_tls_init_bufferevent(tor_tls_t *tls, struct bufferevent *bufev_in, state, BEV_OPT_DEFER_CALLBACKS| BEV_OPT_CLOSE_ON_FREE); + /* Tell the underlying bufferevent when to accept more data from the SSL + filter (only when it's got less than 32K to write), and when to notify + the SSL filter that it could write more (when it drops under 24K). */ + bufferevent_setwatermark(bufev_in, EV_WRITE, 24*1024, 32*1024); } else { if (bufev_in) { evutil_socket_t s = bufferevent_getfd(bufev_in);

1 0

[tor/master] Set write low-watermarks on all bufferevents.
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit dfcd3d9ce00dedcf00124c9329985c5522f286dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:30:20 2011 -0400 Set write low-watermarks on all bufferevents. If we don't do this, then we never invoke the bufferevent write callbacks until all the bufferevent's data is flushed. --- changes/bug3805 | 5 +++++ src/or/connection.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug3805 b/changes/bug3805 new file mode 100644 index 0000000..9d12b81 --- /dev/null +++ b/changes/bug3805 @@ -0,0 +1,5 @@ + o Major bugfixes (bufferevents): + - Correctly notice when data has been written from a bufferevent + without flushing it completely. Bugfix on 0.2.3.1-alpha; fixes + bug 3805. + diff --git a/src/or/connection.c b/src/or/connection.c index c4cbef4..dc804dd 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2947,6 +2947,11 @@ connection_configure_bufferevent_callbacks(connection_t *conn) connection_handle_write_cb, connection_handle_event_cb, conn); + /* Set a fairly high write low-watermark so that we get the write callback + called whenever data is written to bring us under 128K. Leave the + high-watermark at 0. + */ + bufferevent_setwatermark(bufev, EV_WRITE, 128*1024, 0); input = bufferevent_get_input(bufev); output = bufferevent_get_output(bufev);

1 0

[tor/master] Merge branch 'bufev_ratelim_and_wm'
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit b161674d5dc312f95a495bed3c25d892fc9f0550 Merge: ede9cd4 dfcd3d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:57:55 2011 -0400 Merge branch 'bufev_ratelim_and_wm' changes/bug3804 | 9 +++++++++ changes/bug3805 | 5 +++++ src/common/compat_libevent.c | 26 ++++++++++++++++++++++++++ src/common/compat_libevent.h | 6 ++++++ src/common/tortls.c | 5 +++++ src/or/connection.c | 7 ++++++- src/or/connection_or.c | 4 ++-- 7 files changed, 59 insertions(+), 3 deletions(-)

1 0

[tor/master] lround() missing in MSVC
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit 5939c09d35de5be4b135bb0ad6dde24700e75fc2 Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Wed Aug 24 13:52:44 2011 -0400 lround() missing in MSVC lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch. --- changes/msvc_lround | 4 ++++ src/common/util.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/msvc_lround b/changes/msvc_lround new file mode 100644 index 0000000..e4aea95 --- /dev/null +++ b/changes/msvc_lround @@ -0,0 +1,4 @@ + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + diff --git a/src/common/util.c b/src/common/util.c index b47b9c5..ee0acbb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,7 +334,11 @@ tor_mathlog(double d) long tor_lround(double d) { +#ifdef _MSC_VER + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#else return lround(d); +#endif } /** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit ede9cd4f99e4cd1c0c4bcf1a3ac994e87054cc2d Merge: dd6a9a9 5939c09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 13:53:17 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/msvc_lround | 4 ++++ src/common/util.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] lround() missing in MSVC
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit 5939c09d35de5be4b135bb0ad6dde24700e75fc2 Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Wed Aug 24 13:52:44 2011 -0400 lround() missing in MSVC lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch. --- changes/msvc_lround | 4 ++++ src/common/util.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/msvc_lround b/changes/msvc_lround new file mode 100644 index 0000000..e4aea95 --- /dev/null +++ b/changes/msvc_lround @@ -0,0 +1,4 @@ + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + diff --git a/src/common/util.c b/src/common/util.c index b47b9c5..ee0acbb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,7 +334,11 @@ tor_mathlog(double d) long tor_lround(double d) { +#ifdef _MSC_VER + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#else return lround(d); +#endif } /** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */

1 0

[arm/master] Interpretor panel for raw control port access
by atagar＠torproject.org 24 Aug '11

24 Aug '11

commit 0016b2be0fac62ae840a1259ee65269defa3654c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 24 10:07:24 2011 -0700 Interpretor panel for raw control port access This adds a new page to the interface, providing an interactive interpretor that lets the user send/receive control commands. This includes history search and will be expanded to have other usability features (tab completion, search, etc). --- README | 1 + src/cli/__init__.py | 2 +- src/cli/controller.py | 3 + src/cli/interpretorPanel.py | 232 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 237 insertions(+), 1 deletions(-) diff --git a/README b/README index 16d0965..cbaf2f7 100644 --- a/README +++ b/README @@ -193,6 +193,7 @@ Layout: logPanel.py - (page 1) displays tor, arm, and torctl events configPanel.py - (page 3) editor panel for the tor configuration torrcPanel.py - (page 4) displays torrc and validation + interpretorPanel.py - (page 5) interpretor for control port access util/ __init__.py diff --git a/src/cli/__init__.py b/src/cli/__init__.py index b0d6bd8..fa23640 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] +__all__ = ["configPanel", "controller", "headerPanel", "interpretorPanel", "logPanel", "popups", "torrcPanel", "wizard"] diff --git a/src/cli/controller.py b/src/cli/controller.py index d2194ca..bc69e79 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -15,6 +15,7 @@ import cli.headerPanel import cli.logPanel import cli.configPanel import cli.torrcPanel +import cli.interpretorPanel import cli.graphing.graphPanel import cli.graphing.bandwidthStats import cli.graphing.connStats @@ -97,6 +98,8 @@ def initController(stdscr, startTime): if CONFIG["features.panels.show.torrc"]: pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + pagePanels.append([cli.interpretorPanel.InterpretorPanel(stdscr)]) + # initializes the controller ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py new file mode 100644 index 0000000..b7c3fe0 --- /dev/null +++ b/src/cli/interpretorPanel.py @@ -0,0 +1,232 @@ +""" +Panel providing raw control port access with syntax hilighting, usage +information, tab completion, and other usability features. +""" + +import curses + +from util import enum, panel, textInput, torTools, uiTools + +from TorCtl import TorCtl + +Formats = enum.Enum("PROMPT", "INPUT", "INPUT_INTERPRETOR", "INPUT_CMD", "INPUT_ARG", "OUTPUT", "USAGE", "HELP", "ERROR") + +PROMPT = ">>> " +USAGE_INFO = "to use this panel press enter" + +# limits used for cropping +COMMAND_BACKLOG = 100 +LINES_BACKLOG = 2000 + +class InterpretorPanel(panel.Panel): + def __init__(self, stdscr): + panel.Panel.__init__(self, stdscr, "interpretor", 0) + self.isInputMode = False + self.scroll = 0 + self.formats = {} # lazy loaded curses formatting constants + self.previousCommands = [] # user input, newest to oldest + + # contents of the panel (oldest to newest), each line is a list of (msg, + # format enum) tuples + + self.contents = [[(PROMPT, Formats.PROMPT), (USAGE_INFO, Formats.USAGE)]] + + def prompt(self): + """ + Enables the interpretor, prompting for input until the user enters esc or + a blank line. + """ + + if not self.formats: self._initFormats() + self.isInputMode = True + + panel.CURSES_LOCK.acquire() + + while self.isInputMode: + self.redraw(True) + + # intercepts input so user can cycle through the history + validator = textInput.BasicValidator() + validator = textInput.HistoryValidator(self.previousCommands, validator) + + xOffset = len(PROMPT) + if len(self.contents) > self.maxY - 1: + xOffset += 3 # offset for scrollbar + + input = self.getstr(min(self.maxY - 1, len(self.contents)), xOffset, "", self.formats[Formats.INPUT], validator = validator) + + isDone = self.handleQuery(input) + + if isDone: + self.isInputMode = False + self.redraw(True) + + panel.CURSES_LOCK.release() + + def handleQuery(self, input): + """ + Processes the given input. Requests starting with a '/' are special + commands to the interpretor, and anything else is sent to the control port. + This returns a boolean to indicate if the interpretor should terminate or + not. + + Arguments: + input - user input to be processed + """ + + if not input or not input.strip(): return True + input = input.strip() + inputEntry, outputEntry = [(PROMPT, Formats.PROMPT)], [] + conn = torTools.getConn() + + # input falls into three general categories: + # - interpretor command which starts with a '/' + # - controller commands handled by torTools (this allows for caching, + # proper handling by the rest of arm, etc) + # - unrecognized controller command, this has the possability of confusing + # arm... + + if input.startswith("/"): + # interpretor command + inputEntry.append((input, Formats.INPUT_INTERPRETOR)) + outputEntry.append(("Not yet implemented...", Formats.ERROR)) # TODO: implement + + # TODO: add /help option + # TODO: add /write option + else: + # controller command + if " " in input: cmd, arg = input.split(" ", 1) + else: cmd, arg = input, "" + + inputEntry.append((cmd + " ", Formats.INPUT_CMD)) + if arg: inputEntry.append((arg, Formats.INPUT_ARG)) + + if cmd.upper() == "GETINFO": + try: + response = conn.getInfo(arg, suppressExc = False) + outputEntry.append((response, Formats.OUTPUT)) + except Exception, exc: + outputEntry.append((str(exc), Formats.ERROR)) + elif cmd.upper() == "SETCONF": + if "=" in arg: + param, value = arg.split("=", 1) + + try: + conn.setOption(param.strip(), value.strip()) + except Exception, exc: + outputEntry.append((str(exc), Formats.ERROR)) + else: + # TODO: resets the attribute + outputEntry.append(("Not yet implemented...", Formats.ERROR)) # TODO: implement + else: + try: + response = conn.getTorCtl().sendAndRecv("%s\r\n" % input) + + for entry in response: + # Response entries are tuples with the response code, body, and + # extra info. For instance: + # ('250', 'version=0.2.2.23-alpha (git-b85eb949b528f4d7)', None) + + if len(entry) == 3: + outputEntry.append((entry[1], Formats.OUTPUT)) + except Exception, exc: + outputEntry.append((str(exc), Formats.ERROR)) + + self.previousCommands.insert(0, input) + self.previousCommands = self.previousCommands[:COMMAND_BACKLOG] + + promptEntry = self.contents.pop() # removes old prompt entry + self.contents += _splitOnNewlines(inputEntry) + self.contents += _splitOnNewlines(outputEntry) + self.contents.append(promptEntry) + + # if too long then crop lines + cropLines = len(self.contents) - LINES_BACKLOG + if cropLines > 0: self.contents = self.contents[cropLines:] + + return False + + def handleKey(self, key): + # TODO: allow contents to be searched (with hilighting?) + + isKeystrokeConsumed = True + if uiTools.isSelectionKey(key): + self.prompt() + elif uiTools.isScrollKey(key) and not self.isInputMode: + pageHeight = self.getPreferredSize()[0] - 1 + newScroll = uiTools.getScrollPosition(key, self.scroll, pageHeight, len(self.contents)) + + if self.scroll != newScroll: + self.scroll = newScroll + self.redraw(True) + else: isKeystrokeConsumed = False + + return isKeystrokeConsumed + + def draw(self, width, height): + if not self.formats: self._initFormats() + + # page title + usageMsg = " (enter \"/help\" for usage or a blank line to stop)" if self.isInputMode else "" + self.addstr(0, 0, "Control Interpretor%s:" % usageMsg, curses.A_STANDOUT) + + xOffset = 0 + if len(self.contents) > height - 1: + # if we're in input mode then make sure the last line is visible + if self.isInputMode: + self.scroll = len(self.contents) - height + 1 + + xOffset = 3 + self.addScrollBar(self.scroll, self.scroll + height - 1, len(self.contents), 1) + + # draws prior commands and output + drawLine = 1 + for entry in self.contents[self.scroll:]: + cursor = xOffset + + for msg, formatEntry in entry: + format = self.formats.get(formatEntry, curses.A_NORMAL) + self.addstr(drawLine, cursor, msg, format) + cursor += len(msg) + + drawLine += 1 + if drawLine >= height: break + + def _initFormats(self): + self.formats[Formats.PROMPT] = curses.A_BOLD | uiTools.getColor("green") + self.formats[Formats.INPUT] = uiTools.getColor("cyan") + self.formats[Formats.INPUT_INTERPRETOR] = curses.A_BOLD | uiTools.getColor("magenta") + self.formats[Formats.INPUT_CMD] = curses.A_BOLD | uiTools.getColor("green") + self.formats[Formats.INPUT_ARG] = curses.A_BOLD | uiTools.getColor("cyan") + self.formats[Formats.OUTPUT] = uiTools.getColor("blue") + self.formats[Formats.USAGE] = uiTools.getColor("cyan") + self.formats[Formats.HELP] = uiTools.getColor("magenta") + self.formats[Formats.ERROR] = curses.A_BOLD | uiTools.getColor("red") + +def _splitOnNewlines(entry): + """ + Splits a list of (msg, format) tuples on newlines into a list of lines. + + Arguments: + entry - list of display tuples + """ + + results, tmpLine = [], [] + entry = list(entry) # shallow copy + + while entry: + msg, format = entry.pop(0) + + if "\n" in msg: + msg, remainder = msg.split("\n", 1) + entry.insert(0, (remainder, format)) + + tmpLine.append((msg, format)) + results.append(tmpLine) + tmpLine = [] + else: + tmpLine.append((msg, format)) + + if tmpLine: results.append(tmpLine) + return results +

1 0

[torouter/master] Require login for tor status page
by hellais＠torproject.org 24 Aug '11

24 Aug '11

commit 817713dc33ae88217b61c73d4b9b0446a1a89855 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 24 18:22:37 2011 +0200 Require login for tor status page --- packages/torouter-web/src/tui/controllers/tor.py | 32 ++++++++++++++------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py index 491c6b7..e671d80 100644 --- a/packages/torouter-web/src/tui/controllers/tor.py +++ b/packages/torouter-web/src/tui/controllers/tor.py @@ -9,16 +9,23 @@ The main Tor status page """ class status: def GET(self): - trc = parsing.torrc(config.torrc_file) - trc.parse() - output = trc.html_output() - return render.base(render.torstatus(output,config.torrc_file)) + if session.is_logged() > 0: + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) + else: + return render.base(render.login()) + def POST(self): - trc = parsing.torrc(config.torrc_file) - trc.parse() - output = trc.html_output() - return render.base(render.torstatus(output,config.torrc_file)) + if session.is_logged() > 0: + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) + else: + return render.base(render.login()) """ Tor configuration page @@ -32,9 +39,12 @@ class torrc: return True def GET(self): - trc = parsing.torrc(config.torrc_file) - output = trc.output() - return render.base(render.torconfig(output)) + if session.is_logged() > 0: + trc = parsing.torrc(config.torrc_file) + output = trc.output() + return render.base(render.torconfig(output)) + else: + return render.base(render.login()) def POST(self): if session.is_logged() > 0:

1 0