June 2015 - tor-commits - lists.torproject.org

[nyx/master] Revise size calculation for the descriptor dialog
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit bd1ddce03d743352d234aedc8c9c0bd9c87bd646 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 21 11:28:02 2015 -0700 Revise size calculation for the descriptor dialog Tidying up this helper. The way we accounted for the size of line wraps didn't look right since it didn't account for additional content (line number, framing) on the line we wrapped onto. This still isn't quite right since it doesn't account for word breaks but *shrug*, probably good enough in practice. --- nyx/connections/descriptor_popup.py | 36 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index 144407a..7eeb9df 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -59,11 +59,11 @@ def show_descriptor_popup(conn_panel): display_text = _display_text(fingerprint) display_color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] - show_line_number = fingerprint is not None + show_line_numbers = fingerprint is not None # determines the maximum popup size the display_text can fill - popup_height, popup_width = get_preferred_size(display_text, conn_panel.max_x, show_line_number) + popup_height, popup_width = _preferred_size(display_text, conn_panel.max_x, show_line_numbers) with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): if popup: @@ -71,7 +71,7 @@ def show_descriptor_popup(conn_panel): while not is_done: if is_changed: - draw(popup, fingerprint, display_text, display_color, scroll, show_line_number) + draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers) is_changed = False key = control.key_input() @@ -131,31 +131,29 @@ def _display_text(fingerprint): return description.split('\n') -def get_preferred_size(text, max_width, show_line_number): +def _preferred_size(text, max_width, show_line_numbers): """ - Provides the (height, width) tuple for the preferred size of the given text. + Provides the preferred dimensions of our dialog. + + :param list text: lines of text to be shown + :param int max_width: maximum width the dialog can be + :param bool show_line_numbers: if we should leave room for line numbers + + :returns: **tuple** of the preferred (height, width) """ width, height = 0, len(text) + 2 - line_number_width = int(math.log10(len(text))) + 1 + line_number_width = int(math.log10(len(text))) + 2 if show_line_numbers else 0 + max_content_width = max_width - line_number_width - 4 for line in text: - # width includes content, line number field, and border - - line_width = len(line) + 5 - - if show_line_number: - line_width += line_number_width - - width = max(width, line_width) - - # tracks number of extra lines that will be taken due to text wrap - height += (line_width - 2) / max_width + width = min(max_width, max(width, len(line) + line_number_width + 4)) + height += len(line) / max_content_width # extra lines due to text wrap return (height, width) -def draw(popup, fingerprint, display_text, display_color, scroll, show_line_number): +def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers): popup.win.erase() popup.win.box() x_offset = 2 @@ -186,7 +184,7 @@ def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numb line_text = display_text[i].strip() x_offset = 2 - if show_line_number: + if show_line_numbers: line_number_label = ('%%%ii' % line_number_width) % (i + 1) popup.addstr(draw_line, x_offset, line_number_label, curses.A_BOLD, LINE_NUM_COLOR)

1 0

[nyx/master] Errors when rendering connection panel entry
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit 91cff237a45cb9aa7d1aae53017627dc6e267083 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 8 09:22:23 2015 -0700 Errors when rendering connection panel entry Stacktraces related to how we handle curses attributes on the connection panel. This arose if you tried to view the panel when there was... well, anything on it (usually if you disable DisableDebuggerAttachment). Traceback (most recent call last): File "./run_nyx", line 8, in <module> nyx.main() File "/home/atagar/Desktop/nyx/nyx/__init__.py", line 30, in main nyx.starter.main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/nyx/nyx/starter.py", line 91, in main curses.wrapper(nyx.controller.start_nyx) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 576, in start_nyx control.redraw(False) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 402, in redraw panel_impl.redraw(force) File "/home/atagar/Desktop/nyx/nyx/util/panel.py", line 433, in redraw self.draw(self.max_x, self.max_y) File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 464, in draw attr |= extra_format TypeError: unsupported operand type(s) for |=: 'str' and 'int' Traceback (most recent call last): File "./run_nyx", line 8, in <module> nyx.main() File "/home/atagar/Desktop/nyx/nyx/__init__.py", line 30, in main nyx.starter.main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/nyx/nyx/starter.py", line 91, in main curses.wrapper(nyx.controller.start_nyx) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 576, in start_nyx control.redraw(False) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 402, in redraw panel_impl.redraw(force) File "/home/atagar/Desktop/nyx/nyx/util/panel.py", line 433, in redraw self.draw(self.max_x, self.max_y) File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 463, in draw for msg, attr in draw_entry: ValueError: too many values to unpack --- nyx/connections/circ_entry.py | 4 +++- nyx/connections/conn_entry.py | 6 ++++-- nyx/connections/conn_panel.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index b3738c1..b3dc113 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -10,6 +10,8 @@ followed by an entry for each hop in the circuit. For instance: import curses +import nyx.util.ui_tools + from nyx.connections import entries, conn_entry from nyx.util import tor_controller @@ -172,7 +174,7 @@ class CircLine(conn_entry.ConnectionLine): return entries.ConnectionPanelLine.get_listing_entry(self, width, current_time, listing_type) def _get_listing_entry(self, width, current_time, listing_type): - line_format = conn_entry.CATEGORY_COLOR[self.get_type()] + line_format = nyx.util.ui_tools.get_color(conn_entry.CATEGORY_COLOR[self.get_type()]) # The required widths are the sum of the following: # initial space (1 character) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index cfd4fa3..714661e 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -6,6 +6,8 @@ Connection panel entries related to actual connections to or from the system import time import curses +import nyx.util.ui_tools + from nyx.util import tor_controller from nyx.connections import entries @@ -374,14 +376,14 @@ class ConnectionLine(entries.ConnectionPanelLine): # category - "<type>" # postType - ") " - line_format = CATEGORY_COLOR[entry_type] + line_format = nyx.util.ui_tools.get_color(CATEGORY_COLOR[entry_type]) time_width = 6 if CONFIG['features.connection.markInitialConnections'] else 5 draw_entry = [(' ', line_format), (self._get_listing_content(width - (12 + time_width) - 1, listing_type), line_format), (' ' * time_width, line_format), (' (', line_format), - (entry_type.upper(), line_format, curses.A_BOLD), + (entry_type.upper(), line_format | curses.A_BOLD), (')' + ' ' * (9 - len(entry_type)), line_format)] return draw_entry diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 290cc84..46c4a7c 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -462,7 +462,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): for msg, attr in draw_entry: attr |= extra_format - self.addstr(draw_line, x_offset, msg, *attr) + self.addstr(draw_line, x_offset, msg, attr) x_offset += len(msg) if draw_line >= height:

1 0

[nyx/master] Separate panel from descriptor dialog
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit 34be51ee6ea48f8d8e1c124063a7c6a02f890a79 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 27 13:41:20 2015 -0700 Separate panel from descriptor dialog Abstracting the connection panel from the function for showing a descriptor dialog. This essentially moves the outer loop which handled connection panel navigation where it belongs. --- nyx/connections/conn_panel.py | 25 ++++++++- nyx/connections/descriptor_popup.py | 96 ++++++++++++++--------------------- 2 files changed, 61 insertions(+), 60 deletions(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index fe41507..c555a38 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -311,8 +311,29 @@ class ConnectionPanel(panel.Panel, threading.Thread): if selection != -1: self.set_listing_type(options[selection]) elif key.match('d'): - # presents popup for raw consensus data - descriptor_popup.show_descriptor_popup(self) + self.set_title_visible(False) + self.redraw(True) + + while True: + selection = self.get_selection() + + if not selection: + break + + color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] + fingerprint = None if selection.foreign.get_fingerprint() == 'UNKNOWN' else selection.foreign.get_fingerprint() + is_close_key = lambda key: key.is_selection() or key.match('d') or key.match('left') or key.match('right') + key = descriptor_popup.show_descriptor_popup(fingerprint, color, self.max_x, is_close_key) + + if not key or key.is_selection() or key.match('d'): + break # closes popup + elif key.match('left'): + self.handle_key(panel.KeyInput(curses.KEY_UP)) + elif key.match('right'): + self.handle_key(panel.KeyInput(curses.KEY_DOWN)) + + self.set_title_visible(True) + self.redraw(True) elif key.match('c') and self.is_clients_allowed(): count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, self._client_locale_usage) elif key.match('e') and self.is_exits_allowed(): diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index 1d155c3..358784c 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -6,9 +6,8 @@ import math import curses import nyx.popups -import nyx.connections.conn_entry -from nyx.util import panel, tor_controller, ui_tools +from nyx.util import tor_controller, ui_tools from stem.util import str_tools @@ -22,70 +21,51 @@ UNRESOLVED_MSG = 'No consensus data available' ERROR_MSG = 'Unable to retrieve data' -def show_descriptor_popup(conn_panel): +def show_descriptor_popup(fingerprint, color, max_width, is_close_key): """ - Presents consensus descriptor in popup window with the following controls: - Up, Down, Page Up, Page Down - scroll descriptor - Right, Left - next / previous connection - Enter, Space, d, D - close popup + Provides a dialog showing the descriptors for a given relay. - Arguments: - conn_panel - connection panel providing the dialog + :param str fingerprint: fingerprint of the relay to be shown + :param str color: text color of the dialog + :param int max_width: maximum width of the dialog + :param function is_close_key: method to indicate if a key should close the + dialog or not + + :returns: :class:`~nyx.util.panel.KeyInput` for the keyboard input that + closed the dialog """ - # hides the title of the connection panel + if fingerprint: + title = 'Consensus Descriptor:' + lines = _display_text(fingerprint) + show_line_numbers = True + else: + title = 'Consensus Descriptor (%s):' % fingerprint + lines = [UNRESOLVED_MSG] + show_line_numbers = False + + popup_height, popup_width = _preferred_size(lines, max_width, show_line_numbers) - conn_panel.set_title_visible(False) - conn_panel.redraw(True) + with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): + if not popup: + return None - control = nyx.controller.get_controller() + scroll, redraw = 0, True - with panel.CURSES_LOCK: while True: - selection = conn_panel.get_selection() - - if not selection: - break - - fingerprint = selection.foreign.get_fingerprint() - - if fingerprint == 'UNKNOWN': - title = 'Consensus Descriptor (%s):' % fingerprint - lines = [UNRESOLVED_MSG] - show_line_numbers = False - else: - title = 'Consensus Descriptor:' - lines = _display_text(fingerprint) - show_line_numbers = True - - color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] - popup_height, popup_width = _preferred_size(lines, conn_panel.max_x, show_line_numbers) - - with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): - if popup: - scroll = 0 - _draw(popup, title, lines, color, scroll, show_line_numbers) - - while True: - key = control.key_input() - - if key.is_scroll(): - new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(lines)) - - if scroll != new_scroll: - scroll = new_scroll - _draw(popup, title, lines, color, scroll, show_line_numbers) - elif key.is_selection() or key.match('d'): - return # closes popup - elif key.match('left'): - conn_panel.handle_key(panel.KeyInput(curses.KEY_UP)) - break - elif key.match('right'): - conn_panel.handle_key(panel.KeyInput(curses.KEY_DOWN)) - break - - conn_panel.set_title_visible(True) - conn_panel.redraw(True) + if redraw: + _draw(popup, title, lines, color, scroll, show_line_numbers) + redraw = False + + key = nyx.controller.get_controller().key_input() + + if key.is_scroll(): + new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(lines)) + + if scroll != new_scroll: + scroll, redraw = new_scroll, True + elif is_close_key(key): + return key def _display_text(fingerprint):

1 0

[nyx/master] Rewrite descriptor dialog's draw() method
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit 55166969f6caad16c080f3cbd85d9a372eb0cc90 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 27 12:31:00 2015 -0700 Rewrite descriptor dialog's draw() method Not quite done with the dialog, but damn its draw method is now better. :P --- nyx/connections/descriptor_popup.py | 194 ++++++++++++----------------------- nyx/popups.py | 19 ++-- 2 files changed, 73 insertions(+), 140 deletions(-) diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index 7eeb9df..1d155c3 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -12,14 +12,11 @@ from nyx.util import panel, tor_controller, ui_tools from stem.util import str_tools -# field keywords used to identify areas for coloring - -LINE_NUM_COLOR = 'yellow' +HEADERS = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:'] HEADER_COLOR = 'cyan' -HEADER_PREFIX = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:'] +LINE_NUMBER_COLOR = 'yellow' -SIG_START_KEYS = ['-----BEGIN RSA PUBLIC KEY-----', '-----BEGIN SIGNATURE-----'] -SIG_END_KEYS = ['-----END RSA PUBLIC KEY-----', '-----END SIGNATURE-----'] +BLOCK_START, BLOCK_END = '-----BEGIN ', '-----END ' UNRESOLVED_MSG = 'No consensus data available' ERROR_MSG = 'Unable to retrieve data' @@ -42,11 +39,9 @@ def show_descriptor_popup(conn_panel): conn_panel.redraw(True) control = nyx.controller.get_controller() - panel.CURSES_LOCK.acquire() - is_done = False - try: - while not is_done: + with panel.CURSES_LOCK: + while True: selection = conn_panel.get_selection() if not selection: @@ -55,52 +50,42 @@ def show_descriptor_popup(conn_panel): fingerprint = selection.foreign.get_fingerprint() if fingerprint == 'UNKNOWN': - fingerprint = None - - display_text = _display_text(fingerprint) - display_color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] - show_line_numbers = fingerprint is not None - - # determines the maximum popup size the display_text can fill + title = 'Consensus Descriptor (%s):' % fingerprint + lines = [UNRESOLVED_MSG] + show_line_numbers = False + else: + title = 'Consensus Descriptor:' + lines = _display_text(fingerprint) + show_line_numbers = True - popup_height, popup_width = _preferred_size(display_text, conn_panel.max_x, show_line_numbers) + color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] + popup_height, popup_width = _preferred_size(lines, conn_panel.max_x, show_line_numbers) with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): if popup: - scroll, is_changed = 0, True - - while not is_done: - if is_changed: - draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers) - is_changed = False + scroll = 0 + _draw(popup, title, lines, color, scroll, show_line_numbers) + while True: key = control.key_input() if key.is_scroll(): - # TODO: This is a bit buggy in that scrolling is by display_text - # lines rather than the displayed lines, causing issues when - # content wraps. The result is that we can't have a scrollbar and - # can't scroll to the bottom if there's a multi-line being - # displayed. However, trying to correct this introduces a big can - # of worms and after hours decided that this isn't worth the - # effort... - - new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(display_text)) + new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(lines)) if scroll != new_scroll: - scroll, is_changed = new_scroll, True + scroll = new_scroll + _draw(popup, title, lines, color, scroll, show_line_numbers) elif key.is_selection() or key.match('d'): - is_done = True # closes popup + return # closes popup elif key.match('left'): conn_panel.handle_key(panel.KeyInput(curses.KEY_UP)) break elif key.match('right'): conn_panel.handle_key(panel.KeyInput(curses.KEY_DOWN)) break - finally: - conn_panel.set_title_visible(True) - conn_panel.redraw(True) - panel.CURSES_LOCK.release() + + conn_panel.set_title_visible(True) + conn_panel.redraw(True) def _display_text(fingerprint): @@ -112,9 +97,6 @@ def _display_text(fingerprint): :returns: **list** with the lines that should be displayed in the dialog """ - if not fingerprint: - return [UNRESOLVED_MSG] - controller = tor_controller() router_status_entry = controller.get_network_status(fingerprint, None) microdescriptor = controller.get_microdescriptor(fingerprint, None) @@ -153,108 +135,60 @@ def _preferred_size(text, max_width, show_line_numbers): return (height, width) -def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers): - popup.win.erase() - popup.win.box() - x_offset = 2 - - if fingerprint: - title = 'Consensus Descriptor (%s):' % fingerprint - else: - title = 'Consensus Descriptor:' - - popup.addstr(0, 0, title, curses.A_STANDOUT) - - line_number_width = int(math.log10(len(display_text))) + 1 - is_encryption_block = False # flag indicating if we're currently displaying a key - - # checks if first line is in an encryption block +def _draw(popup, title, lines, entry_color, scroll, show_line_numbers): + def draw_msg(popup, min_x, x, y, width, msg, *attr): + while msg: + draw_msg, msg = str_tools.crop(msg, width - x, None, ending = None, get_remainder = True) - for i in range(0, scroll): - line_text = display_text[i].strip() + if not draw_msg: + draw_msg, msg = str_tools.crop(msg, width - x), '' # first word is longer than the line - if line_text in SIG_START_KEYS: - is_encryption_block = True - elif line_text in SIG_END_KEYS: - is_encryption_block = False + x = popup.addstr(y, x, draw_msg, *attr) - draw_line, page_height = 1, popup.max_y - 2 + if msg: + x, y = min_x, y + 1 - for i in range(scroll, scroll + page_height): - line_text = display_text[i].strip() - x_offset = 2 + return x, y - if show_line_numbers: - line_number_label = ('%%%ii' % line_number_width) % (i + 1) - - popup.addstr(draw_line, x_offset, line_number_label, curses.A_BOLD, LINE_NUM_COLOR) - x_offset += line_number_width + 1 - - # Most consensus and descriptor lines are keyword/value pairs. Both are - # shown with the same color, but the keyword is bolded. - - keyword, value = line_text, '' - draw_format = display_color - - if line_text.startswith(HEADER_PREFIX[0]) or line_text.startswith(HEADER_PREFIX[1]): - keyword, value = line_text, '' - draw_format = HEADER_COLOR - elif line_text == UNRESOLVED_MSG or line_text == ERROR_MSG: - keyword, value = line_text, '' - elif line_text in SIG_START_KEYS: - keyword, value = line_text, '' - is_encryption_block = True - elif line_text in SIG_END_KEYS: - keyword, value = line_text, '' - is_encryption_block = False - elif is_encryption_block: - keyword, value = '', line_text - elif ' ' in line_text: - div_index = line_text.find(' ') - keyword, value = line_text[:div_index], line_text[div_index:] - - display_queue = [(keyword, (draw_format, curses.A_BOLD)), (value, (draw_format,))] - cursor_location = x_offset - - while display_queue: - msg, msg_format = display_queue.pop(0) - - if not msg: - continue - - max_msg_size = popup.max_x - 1 - cursor_location - - if len(msg) >= max_msg_size: - # needs to split up the line + popup.win.erase() - msg, remainder = str_tools.crop(msg, max_msg_size, None, ending = None, get_remainder = True) + line_number_width = int(math.log10(len(lines))) + 1 + in_block = False # flag indicating if we're currently in crypto content + width = popup.max_x - 2 # leave space on the right for the border and an empty line + height = popup.max_y - 2 # height of the dialog without the top and bottom border + offset = line_number_width + 3 if show_line_numbers else 2 - if x_offset == cursor_location and msg == '': - # first word is longer than the line + y = 1 - msg = str_tools.crop(remainder, max_msg_size) + for i, line in enumerate(lines): + keyword, value = line, '' + color = entry_color - if ' ' in remainder: - remainder = remainder.split(' ', 1)[1] - else: - remainder = '' + if line in HEADERS: + color = HEADER_COLOR + elif line.startswith(BLOCK_START): + in_block = True + elif line.startswith(BLOCK_END): + in_block = False + elif in_block: + keyword, value = '', line + elif ' ' in line and line != UNRESOLVED_MSG and line != ERROR_MSG: + keyword, value = line.split(' ', 1) - popup.addstr(draw_line, cursor_location, msg, *msg_format) - cursor_location = x_offset + if i < scroll: + continue - if remainder: - display_queue.insert(0, (remainder.strip(), msg_format)) - draw_line += 1 - else: - popup.addstr(draw_line, cursor_location, msg, *msg_format) - cursor_location += len(msg) + if show_line_numbers: + popup.addstr(y, 2, str(i + 1).rjust(line_number_width), curses.A_BOLD, LINE_NUMBER_COLOR) - if draw_line > page_height: - break + x, y = draw_msg(popup, offset, offset, y, width, keyword, color, curses.A_BOLD) + x, y = draw_msg(popup, offset, x + 1, y, width, value, color) - draw_line += 1 + y += 1 - if draw_line > page_height: + if y > height: break + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) popup.win.refresh() diff --git a/nyx/popups.py b/nyx/popups.py index 355d7f1..38eade0 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -71,16 +71,15 @@ def input_prompt(msg, initial_value = ''): initial_value - initial value of the field """ - panel.CURSES_LOCK.acquire() - control = nyx.controller.get_controller() - msg_panel = control.get_panel('msg') - msg_panel.set_message(msg) - msg_panel.redraw(True) - user_input = msg_panel.getstr(0, len(msg), initial_value) - control.set_msg() - panel.CURSES_LOCK.release() - - return user_input + with panel.CURSES_LOCK: + control = nyx.controller.get_controller() + msg_panel = control.get_panel('msg') + msg_panel.set_message(msg) + msg_panel.redraw(True) + user_input = msg_panel.getstr(0, len(msg), initial_value) + control.set_msg() + + return user_input def show_msg(msg, max_wait = -1, attr = curses.A_STANDOUT):

1 0

[nyx/master] Rewrite descriptor dialog
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit 681ab618a52157f81a4b376eb8502f87851098a3 Merge: a610441 34be51e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 27 14:18:47 2015 -0700 Rewrite descriptor dialog Replacing the connection panel's descriptor dialog (the subwindow you see when pressing 'd'). Only functional change is that it now includes microdescriptor information (whereas before it only had consensus and server descriptors). nyx/connections/circ_entry.py | 4 +- nyx/connections/conn_entry.py | 6 +- nyx/connections/conn_panel.py | 62 +++++--- nyx/connections/descriptor_popup.py | 301 ++++++++++++----------------------- nyx/popups.py | 19 ++- 5 files changed, 157 insertions(+), 235 deletions(-)

1 0

[tor-messenger-build/master] Disable Instantbird's auto-updater from source
by sukhbir＠torproject.org 27 Jun '15

27 Jun '15

commit f5290aedf786c69380650526ec1df18039ebf22d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jun 27 15:06:20 2015 -0400 Disable Instantbird's auto-updater from source Disable Instantbird's auto-update feature till we have Tor Messenger's secure automatic updates architecture in place. --- projects/instantbird/mozconfig-linux-i686 | 2 ++ projects/instantbird/mozconfig-linux-x86_64 | 2 ++ projects/instantbird/mozconfig-osx-x86_64 | 2 ++ projects/instantbird/mozconfig-windows-i686 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 7bb9b61..f0f59cf 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -22,3 +22,5 @@ ac_add_options --with-l10n-base=.. ac_add_options --host=i686-linux-gnu ac_add_options --with-branding=im/branding/messenger + +ac_add_options --disable-updater diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 919b52e..d0333aa 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -18,3 +18,5 @@ ac_add_options --disable-debug ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger + +ac_add_options --disable-updater diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index f624ec4..25af3cc 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -29,3 +29,5 @@ ac_add_options --disable-eme ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger + +ac_add_options --disable-updater diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index f3c76c4..01dd873 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -28,3 +28,5 @@ ac_add_options --disable-tests ac_add_options --disable-signmar ac_add_options --with-branding=im/branding/messenger + +ac_add_options --disable-updater

1 0

[tor-browser-bundle/master] Using build2 of our ESR38 5.0 branch
by gk＠torproject.org 27 Jun '15

27 Jun '15

commit 80a40029330eeb1ec2205939fed853960762ae8c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 27 18:55:44 2015 +0000 Using build2 of our ESR38 5.0 branch build1 did not include a fixup for a Linux build bustage which was due to the first version of the patch for #15646. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e1937d0..3f94294 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.7.1-alpha TORLAUNCHER_TAG=0.2.7.6 TORBUTTON_TAG=1.9.3.0

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by gk＠torproject.org 27 Jun '15

27 Jun '15

commit 190904f3c647cbe5a394b1fb69d84d3b688bd40c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 27 18:29:41 2015 +0000 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/base/nsContentUtils.h | 2 +- dom/events/KeyCodeConsensus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index e8cb432..d4fff09 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2401,7 +2401,7 @@ private: static bool sIsExperimentalAutocompleteEnabled; static bool sEncodeDecodeURLHash; static bool sPrivacyResistFingerprinting; - + static nsHtml5StringParser* sHTMLFragmentParser; static nsIParser* sXMLFragmentParser; static nsIFragmentContentSink* sXMLFragmentSink; diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h index 8d66d19..5493c36 100644 --- a/dom/events/KeyCodeConsensus.h +++ b/dom/events/KeyCodeConsensus.h @@ -4,7 +4,7 @@ // the numpad, right modifer keys, and any non-QWERTY US English keyboard. #include "nsString.h" -#include "nsClassHashTable.h" +#include "nsDataHashtable.h" // KEY_INTERNAL is called by KEY or SHIFT. #define KEY_INTERNAL(key, code, keyCode, shift) \

1 0

[tor/master] Fix some compilation issues.
by nickm＠torproject.org 27 Jun '15

27 Jun '15

commit 229bb7e50f1df1953f07f9447cf2634166745431 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 27 14:27:00 2015 -0400 Fix some compilation issues. --- src/common/compat.c | 4 ++-- src/ext/include.am | 2 +- src/ext/readpassphrase.h | 46 ------------------------------------------ src/ext/tor_readpassphrase.h | 46 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 91d117d..74de9a5 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -70,7 +70,7 @@ #ifdef HAVE_READPASSPHRASE_H #include <readpassphrase.h> #elif !defined(_WIN32) -#include "readpassphrase.h" +#include "tor_readpassphrase.h" #else #include <conio.h> #endif @@ -1650,7 +1650,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) } /* Set the current limit value so if the attempt to set the limit to the * max fails at least we'll have a valid value of maximum sockets. */ - max_sockets = rlim.rlim_cur - ULIMIT_BUFFER; + max_sockets = (int)rlim.rlim_cur - ULIMIT_BUFFER; rlim.rlim_cur = rlim.rlim_max; if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { diff --git a/src/ext/include.am b/src/ext/include.am index f0bfbb7..40923aa 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -7,7 +7,7 @@ EXTHEADERS = \ src/ext/ht.h \ src/ext/eventdns.h \ src/ext/tinytest.h \ - src/ext/readpassphrase.h \ + src/ext/tor_readpassphrase.h \ src/ext/strlcat.c \ src/ext/strlcpy.c \ src/ext/tinytest_macros.h \ diff --git a/src/ext/readpassphrase.h b/src/ext/readpassphrase.h deleted file mode 100644 index 83ae1f2..0000000 --- a/src/ext/readpassphrase.h +++ /dev/null @@ -1,46 +0,0 @@ -/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ - -/* - * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller(a)courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F39502-99-1-0512. - */ - -/* OPENBSD ORIGINAL: include/readpassphrase.h */ - -#ifndef _READPASSPHRASE_H_ -#define _READPASSPHRASE_H_ - -#include "orconfig.h" - -#ifndef HAVE_READPASSPHRASE - -#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */ -#define RPP_ECHO_ON 0x01 /* Leave echo on. */ -#define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */ -#define RPP_FORCELOWER 0x04 /* Force input to lower case. */ -#define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ -#define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ -#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -char * readpassphrase(const char *, char *, size_t, int); - -#define HAVE_READPASSPHRASE - -#endif /* HAVE_READPASSPHRASE */ - -#endif /* !_READPASSPHRASE_H_ */ diff --git a/src/ext/tor_readpassphrase.h b/src/ext/tor_readpassphrase.h new file mode 100644 index 0000000..83ae1f2 --- /dev/null +++ b/src/ext/tor_readpassphrase.h @@ -0,0 +1,46 @@ +/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ + +/* + * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller(a)courtesan.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. + */ + +/* OPENBSD ORIGINAL: include/readpassphrase.h */ + +#ifndef _READPASSPHRASE_H_ +#define _READPASSPHRASE_H_ + +#include "orconfig.h" + +#ifndef HAVE_READPASSPHRASE + +#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */ +#define RPP_ECHO_ON 0x01 /* Leave echo on. */ +#define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */ +#define RPP_FORCELOWER 0x04 /* Force input to lower case. */ +#define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ +#define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ +#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + +char * readpassphrase(const char *, char *, size_t, int); + +#define HAVE_READPASSPHRASE + +#endif /* HAVE_READPASSPHRASE */ + +#endif /* !_READPASSPHRASE_H_ */

1 0

[tor/master] Avoid a segfault when reading an encrypted key that isn't there
by nickm＠torproject.org 27 Jun '15

27 Jun '15

commit 48f69685f5df3ca0f39a3da155df3b9a5cfa2b99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 27 14:14:13 2015 -0400 Avoid a segfault when reading an encrypted key that isn't there Patch from cypherpunks. Fixes bug 16449. Bug not in any released tor. --- src/or/routerkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 2fd7f41..d075c67 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -63,7 +63,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out, r = 1; done: - memwipe(encrypted_key, 0, encrypted_len); + memwipe(encrypted_key, 0, sizeof(encrypted_key)); memwipe(pwbuf, 0, sizeof(pwbuf)); tor_free(tag); if (secret) {

1 0