tor-commits September 2015

tor-commits@lists.torproject.org

15 participants
1411 discussions

[nyx/master] Merge _get_listing_content() into draw function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 48b1998697f96e82a92860d0daac645c5c9d126a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 8 09:46:21 2015 -0700 Merge _get_listing_content() into draw function Merging more display logic out of the ConnectionLine. The draw function's now a mess, but at least it's a localized mess. --- nyx/connection_panel.py | 161 ++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 86 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 5656faa..ce9749d 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -326,91 +326,6 @@ class ConnectionLine(object): return ('%%-%is' % width) % etc - def _get_listing_content(self, width, listing_type): - """ - Provides the source, destination, and extra info for our listing. - - Arguments: - width - maximum length of the line - listing_type - primary attribute we're listing connections by - """ - - controller = tor_controller() - my_type = self._entry.get_type() - destination_address = self.get_destination_label(26, include_locale = True) - - # The required widths are the sum of the following: - # - room for LABEL_FORMAT and LABEL_MIN_PADDING (11 characters) - # - base data for the listing - # - that extra field plus any previous - - used_space = len(LABEL_FORMAT % tuple([''] * 4)) + LABEL_MIN_PADDING - local_port = ':%s' % self.connection.local_port if self.include_port else '' - - src, dst, etc = '', '', '' - - if listing_type == Listing.IP_ADDRESS: - my_external_address = controller.get_info('address', self.connection.local_address) - - # Show our external address if it's going through tor. - - if my_type not in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - src_address = my_external_address + local_port - else: - src_address = self.connection.local_address + local_port - - if my_type in (Category.SOCKS, Category.CONTROL): - # Like inbound connections these need their source and destination to - # be swapped. However, this only applies when listing by IP (their - # fingerprint and nickname are both for us). Reversing the fields here - # to keep the same column alignments. - - src = '%-21s' % destination_address - dst = '%-26s' % src_address - else: - src = '%-21s' % src_address # ip:port = max of 21 characters - dst = '%-26s' % destination_address # ip:port (xx) = max of 26 characters - - used_space += len(src) + len(dst) # base data requires 47 characters - - etc = self.get_etc_content(width - used_space, listing_type) - used_space += len(etc) - elif listing_type == Listing.FINGERPRINT: - src = 'localhost' - dst = '%-40s' % ('localhost' if my_type == Category.CONTROL else self.get_fingerprint('UNKNOWN')) - - used_space += len(src) + len(dst) # base data requires 49 characters - - etc = self.get_etc_content(width - used_space, listing_type) - used_space += len(etc) - else: - # base data requires 50 min characters - src = controller.get_conf('nickname', 'UNKNOWN') - dst = controller.get_conf('nickname', 'UNKNOWN') if my_type == Category.CONTROL else self.get_nickname('UNKNOWN') - - min_base_space = 50 - - etc = self.get_etc_content(width - used_space - min_base_space, listing_type) - used_space += len(etc) - - base_space = width - used_space - used_space = width # prevents padding at the end - - if len(src) + len(dst) > base_space: - src = str_tools.crop(src, base_space / 3) - dst = str_tools.crop(dst, base_space - len(src)) - - # pads dst entry to its max space - - dst = ('%%-%is' % (base_space - len(src))) % dst - - if my_type == Category.INBOUND: - src, dst = dst, src - - padding = ' ' * (width - used_space + LABEL_MIN_PADDING) - - return LABEL_FORMAT % (src, dst, etc, padding) - def get_destination_label(self, max_length, include_locale = False): """ Provides a short description of the destination. This is made up of two @@ -985,7 +900,81 @@ class ConnectionPanel(panel.Panel, threading.Thread): time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x + 1, line._get_listing_content(width - 19, listing_type), attr) + controller = tor_controller() + destination_address = line.get_destination_label(26, include_locale = True) + subsection_width = width - 19 + + # The required widths are the sum of the following: + # - room for LABEL_FORMAT and LABEL_MIN_PADDING (11 characters) + # - base data for the listing + # - that extra field plus any previous + + used_space = len(LABEL_FORMAT % tuple([''] * 4)) + LABEL_MIN_PADDING + local_port = ':%s' % line.connection.local_port if line.include_port else '' + + src, dst, etc = '', '', '' + + if listing_type == Listing.IP_ADDRESS: + my_external_address = controller.get_info('address', line.connection.local_address) + + # Show our external address if it's going through tor. + + if entry_type not in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): + src_address = my_external_address + local_port + else: + src_address = line.connection.local_address + local_port + + if entry_type in (Category.SOCKS, Category.CONTROL): + # Like inbound connections these need their source and destination to + # be swapped. However, this only applies when listing by IP (their + # fingerprint and nickname are both for us). Reversing the fields here + # to keep the same column alignments. + + src = '%-21s' % destination_address + dst = '%-26s' % src_address + else: + src = '%-21s' % src_address # ip:port = max of 21 characters + dst = '%-26s' % destination_address # ip:port (xx) = max of 26 characters + + used_space += len(src) + len(dst) # base data requires 47 characters + + etc = line.get_etc_content(subsection_width - used_space, listing_type) + used_space += len(etc) + elif listing_type == Listing.FINGERPRINT: + src = 'localhost' + dst = '%-40s' % ('localhost' if entry_type == Category.CONTROL else line.get_fingerprint('UNKNOWN')) + + used_space += len(src) + len(dst) # base data requires 49 characters + + etc = line.get_etc_content(subsection_width - used_space, listing_type) + used_space += len(etc) + else: + # base data requires 50 min characters + src = controller.get_conf('nickname', 'UNKNOWN') + dst = controller.get_conf('nickname', 'UNKNOWN') if entry_type == Category.CONTROL else line.get_nickname('UNKNOWN') + + min_base_space = 50 + + etc = line.get_etc_content(subsection_width - used_space - min_base_space, listing_type) + used_space += len(etc) + + base_space = subsection_width - used_space + used_space = subsection_width # prevents padding at the end + + if len(src) + len(dst) > base_space: + src = str_tools.crop(src, base_space / 3) + dst = str_tools.crop(dst, base_space - len(src)) + + # pads dst entry to its max space + + dst = ('%%-%is' % (base_space - len(src))) % dst + + if entry_type == Category.INBOUND: + src, dst = dst, src + + padding = ' ' * (subsection_width - used_space + LABEL_MIN_PADDING) + + x = self.addstr(y, x + 1, LABEL_FORMAT % (src, dst, etc, padding), attr) x = self.addstr(y, x, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD)

1 0

[nyx/master] Merge main get_listing_entry() implementation into draw method
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 3c8346b2093b663fecafe9fa6509e4383cdb2e3c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 7 14:54:39 2015 -0700 Merge main get_listing_entry() implementation into draw method This merges the rest of get_listing_entry() into the draw method. This drops the top level caching which causes a very noticeable worsening of performance, *but* also fixes an issue where we cached 'unknown' values. As we merge more into the draw methods we'll need to figure out what in particular is making this slow. --- nyx/connection_panel.py | 154 ++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 108 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index e30c4fc..6ee7056 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -246,54 +246,6 @@ class ConnectionLine(object): nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(self.get_fingerprint()) return nickname if nickname else default - @lru_cache() - def get_listing_entry(self, width, listing_type): - """ - Provides the tuple list for this connection's listing. Lines are composed - of the following components: - <src> --> <dst> <etc> <uptime> (<type>) - - Listing.IP_ADDRESS: - src - <internal addr:port> --> <external addr:port> - dst - <destination addr:port> - etc - <fingerprint> <nickname> - - Listing.FINGERPRINT: - src - localhost - dst - <destination fingerprint> - etc - <nickname> <destination addr:port> - - Listing.NICKNAME: - src - <source nickname> - dst - <destination nickname> - etc - <fingerprint> <destination addr:port> - - Arguments: - width - maximum length of the line - listing_type - primary attribute we're listing connections by - """ - - entry_type = self._entry.get_type() - - # Lines are split into the following components in reverse: - # init gap - " " - # content - "<src> --> <dst> <etc> " - # time - "<uptime>" - # preType - " (" - # category - "<type>" - # postType - ") " - - line_format = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) - - draw_entry = [(' ', line_format), - (self._get_listing_content(width - 19, listing_type), line_format), - (' ', line_format), - (' (', line_format), - (entry_type.upper(), line_format | curses.A_BOLD), - (')' + ' ' * (9 - len(entry_type)), line_format)] - - return draw_entry - def get_etc_content(self, width, listing_type): """ Provides the optional content for the connection. @@ -596,61 +548,6 @@ class CircLine(ConnectionLine): else: return (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) - @lru_cache() - def get_listing_entry(self, width, listing_type): - """ - Provides the [(msg, attr)...] listing for this relay in the circuilt - listing. Lines are composed of the following components: - <bracket> <dst> <etc> <placement label> - - The dst and etc entries largely match their ConnectionEntry counterparts. - - Arguments: - width - maximum length of the line - current_time - the current unix time (ignored) - listing_type - primary attribute we're listing connections by - """ - - line_format = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(self._entry.get_type(), 'white')) - - # The required widths are the sum of the following: - # initial space (1 character) - # bracketing (3 characters) - # placement_label (14 characters) - # gap between etc and placement label (5 characters) - - baseline_space = 14 + 5 - - dst, etc = '', '' - - if listing_type == Listing.IP_ADDRESS: - # dst width is derived as: - # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char - - dst = '%-53s' % self.get_destination_label(53, include_locale = True) - - # fills the nickname into the empty space here - - dst = '%s%-25s ' % (dst[:25], str_tools.crop(self.get_nickname('UNKNOWN'), 25, 0)) - - etc = self.get_etc_content(width - baseline_space - len(dst), listing_type) - elif listing_type == Listing.FINGERPRINT: - # dst width is derived as: - # src (9) + dst (40) + divider (7) + right gap (2) - bracket (3) = 55 char - - dst = '%-55s' % self.get_fingerprint('UNKNOWN') - etc = self.get_etc_content(width - baseline_space - len(dst), listing_type) - else: - # min space for the nickname is 56 characters - - etc = self.get_etc_content(width - baseline_space - 56, listing_type) - dst_layout = '%%-%is' % (width - baseline_space - len(etc)) - dst = dst_layout % self.get_nickname('UNKNOWN') - - return ((dst + etc, line_format), - (' ' * (width - baseline_space - len(dst) - len(etc) + 5), line_format), - ('%-14s' % self.placement_label, line_format)) - class ConnectionPanel(panel.Panel, threading.Thread): """ @@ -1104,16 +1001,57 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def _draw_line(self, x, y, line, is_selected, width, current_time, listing_type): - draw_entry = line.get_listing_entry(width, listing_type) + entry_type = line._entry.get_type() + attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) + attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL if not isinstance(line, CircLine): time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - draw_entry[2] = (time_label, draw_entry[2][1]) - for msg, attr in draw_entry: - attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL - x = self.addstr(y, x, msg, attr) + x = self.addstr(y, x, ' ' + line._get_listing_content(width - 19, listing_type), attr) + x = self.addstr(y, x, time_label, attr) + x = self.addstr(y, x, ' (', attr) + x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) + x = self.addstr(y, x, ')' + ' ' * (9 - len(entry_type)), attr) + else: + # The required widths are the sum of the following: + # initial space (1 character) + # bracketing (3 characters) + # placement_label (14 characters) + # gap between etc and placement label (5 characters) + + baseline_space = 14 + 5 + + dst, etc = '', '' + + if listing_type == Listing.IP_ADDRESS: + # dst width is derived as: + # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char + + dst = '%-53s' % line.get_destination_label(53, include_locale = True) + + # fills the nickname into the empty space here + + dst = '%s%-25s ' % (dst[:25], str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0)) + + etc = line.get_etc_content(width - baseline_space - len(dst), listing_type) + elif listing_type == Listing.FINGERPRINT: + # dst width is derived as: + # src (9) + dst (40) + divider (7) + right gap (2) - bracket (3) = 55 char + + dst = '%-55s' % line.get_fingerprint('UNKNOWN') + etc = line.get_etc_content(width - baseline_space - len(dst), listing_type) + else: + # min space for the nickname is 56 characters + + etc = line.get_etc_content(width - baseline_space - 56, listing_type) + dst_layout = '%%-%is' % (width - baseline_space - len(etc)) + dst = dst_layout % line.get_nickname('UNKNOWN') + + x = self.addstr(y, x, dst + etc, attr) + x = self.addstr(y, x, ' ' * (width - baseline_space - len(dst) - len(etc) + 5), attr) + x = self.addstr(y, x, '%-14s' % line.placement_label, attr) def stop(self): """

1 0

[nyx/master] Merge get_etc_content() into draw function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 0625c56d2845c243c486fbcfc20e26e26dd1f8b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 15 09:44:59 2015 -0700 Merge get_etc_content() into draw function Very similar to its get_destination_label() counterpart. This helper can do with a lot of improvement too... --- nyx/connection_panel.py | 119 +++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 66 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 7d88050..2d9991b 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -233,52 +233,6 @@ class ConnectionLine(object): nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(self.get_fingerprint()) return nickname if nickname else default - def get_etc_content(self, width): - """ - Provides the optional content for the connection. - - Arguments: - width - maximum length of the line - """ - - # for applications show the command/pid - - if self._entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - port = self.connection.local_port if self._entry.get_type() == Category.HIDDEN else self.connection.remote_port - - try: - process = nyx.util.tracker.get_port_usage_tracker().fetch(port) - display_label = '%s (%s)' % (process.name, process.pid) if process.pid else process.name - except nyx.util.tracker.UnresolvedResult: - display_label = 'resolving...' - except nyx.util.tracker.UnknownApplication: - display_label = 'UNKNOWN' - - if len(display_label) < width: - return ('%%-%is' % width) % display_label - else: - return '' - - # for everything else display connection/consensus information - - etc, used_space = '', 0 - - if width > used_space + 42: - # show fingerprint (column width: 42 characters) - - etc += '%-40s ' % self.get_fingerprint('UNKNOWN') - used_space += 42 - - if width > used_space + 10: - # show nickname (column width: remainder) - - nickname_space = width - used_space - nickname_label = str_tools.crop(self.get_nickname('UNKNOWN'), nickname_space, 0) - etc += ('%%-%is ' % nickname_space) % nickname_label - used_space += nickname_space + 2 - - return ('%%-%is' % width) % etc - class CircHeaderLine(ConnectionLine): """ @@ -302,22 +256,6 @@ class CircHeaderLine(ConnectionLine): def get_fingerprint(self, default = None): return self._remote_fingerprint if self._remote_fingerprint else ConnectionLine.get_fingerprint(self, default) - def get_etc_content(self, width): - """ - Attempts to provide all circuit related stats. Anything that can't be - shown completely (not enough room) is dropped. - """ - - etc_attr = ['Purpose: %s' % self.circuit.purpose.capitalize(), 'Circuit ID: %s' % self.circuit.id] - - for i in range(len(etc_attr), -1, -1): - etc_label = ', '.join(etc_attr[:i]) - - if len(etc_label) <= width: - return ('%%-%is' % width) % etc_label - - return '' - class CircLine(ConnectionLine): """ @@ -764,6 +702,56 @@ class ConnectionPanel(panel.Panel, threading.Thread): return output[:width] + def get_etc_content(line, width): + if isinstance(line, CircHeaderLine): + etc_attr = ['Purpose: %s' % line.circuit.purpose.capitalize(), 'Circuit ID: %s' % line.circuit.id] + + for i in range(len(etc_attr), -1, -1): + etc_label = ', '.join(etc_attr[:i]) + + if len(etc_label) <= width: + return etc_label + + return '' + else: + # for applications show the command/pid + + if line._entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): + port = line.connection.local_port if line._entry.get_type() == Category.HIDDEN else line.connection.remote_port + + try: + process = nyx.util.tracker.get_port_usage_tracker().fetch(port) + display_label = '%s (%s)' % (process.name, process.pid) if process.pid else process.name + except nyx.util.tracker.UnresolvedResult: + display_label = 'resolving...' + except nyx.util.tracker.UnknownApplication: + display_label = 'UNKNOWN' + + if len(display_label) < width: + return display_label + else: + return '' + + # for everything else display connection/consensus information + + etc, used_space = '', 0 + + if width > used_space + 42: + # show fingerprint (column width: 42 characters) + + etc += '%-40s ' % line.get_fingerprint('UNKNOWN') + used_space += 42 + + if width > used_space + 10: + # show nickname (column width: remainder) + + nickname_space = width - used_space + nickname_label = str_tools.crop(line.get_nickname('UNKNOWN'), nickname_space, 0) + etc += ('%%-%is ' % nickname_space) % nickname_label + used_space += nickname_space + 2 + + return etc + self.addstr(y, x, ' ' * (width - x), attr) if not isinstance(line, CircLine): @@ -780,12 +768,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): if entry_type in (Category.INBOUND, Category.SOCKS, Category.CONTROL): dst, src = src, dst - etc = line.get_etc_content(subsection_width - 11 - max(21, len(src)) - max(26, len(dst))) - time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x + 1, '%-21s --> %-26s %s' % (src, dst, etc), attr) + x = self.addstr(y, x + 1, '%-21s --> %-26s' % (src, dst), attr) + x = self.addstr(y, x + 2, get_etc_content(line, subsection_width - 11 - max(21, len(src)) - max(26, len(dst))), attr) x = self.addstr(y, subsection_width + 1, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) @@ -793,7 +780,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): else: self.addstr(y, x, get_destination_label(line, 25), attr) self.addstr(y, x + 25, str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0), attr) - self.addstr(y, x + 53, line.get_etc_content(width - x - 19 - 53), attr) + self.addstr(y, x + 53, get_etc_content(line, width - x - 19 - 53), attr) self.addstr(y, width - 14, line.placement_label, attr) def stop(self):

1 0

[nyx/master] Drop placement_label attribute
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 91b7b48d639b116f5fe40f69e7408a0655767443 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 17 09:45:33 2015 -0700 Drop placement_label attribute Moving another rendering attribute into the draw method where it's used. --- nyx/connection_panel.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 78a5e2c..d92c7f6 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -258,18 +258,6 @@ class CircLine(ConnectionLine): self.circuit = circ self._fingerprint = fingerprint - circ_path = [path_entry[0] for path_entry in circ.path] - circ_index = circ_path.index(fingerprint) - - if circ_index == len(circ_path) - 1: - placement_type = 'Exit' if circ.status == 'BUILT' else 'Extending' - elif circ_index == 0: - placement_type = 'Guard' - else: - placement_type = 'Middle' - - self.placement_label = '%i / %s' % (circ_index + 1, placement_type) - def get_fingerprint(self, default = None): return self._fingerprint @@ -769,7 +757,18 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, x, get_destination_label(line, 25), attr) self.addstr(y, x + 25, str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0), attr) self.addstr(y, x + 53, get_etc_content(line, width - x - 19 - 53), attr) - self.addstr(y, width - 14, line.placement_label, attr) + + circ_path = [path_entry[0] for path_entry in line.circuit.path] + circ_index = circ_path.index(line.get_fingerprint()) + + if circ_index == len(circ_path) - 1: + placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' + elif circ_index == 0: + placement_type = 'Guard' + else: + placement_type = 'Middle' + + self.addstr(y, width - 14, '%i / %s' % (circ_index + 1, placement_type), attr) def stop(self): """

1 0

[nyx/master] Simplify get_destination_label()
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit ad95b92989fac4ba435a47de4d0c7b60b302278b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 8 09:38:06 2015 -0700 Simplify get_destination_label() Not done, but there's some low hanging fruit for making this a little better. --- nyx/connection_panel.py | 57 +++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 6ee7056..5656faa 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -427,45 +427,19 @@ class ConnectionLine(object): include_locale - possibly includes the locale """ - # destination of the connection + output = '<scrubbed>' if self._entry.is_private() else self.connection.remote_address + output += ':%s' % self.connection.remote_port + space_available = max_length - len(output) - 3 - address_label = '<scrubbed>' if self._entry.is_private() else self.connection.remote_address - port_label = ':%s' % self.connection.remote_port - destination_address = address_label + port_label + if include_locale and space_available >= 2 and not tor_controller().is_geoip_unavailable() and not self._entry.is_private(): + output += ' (%s)' % self.get_locale('??') + elif self._entry.get_type() == Category.EXIT and space_available >= 5: + purpose = connection.port_usage(self.connection.remote_port) - # Only append the extra info if there's at least a couple characters of - # space (this is what's needed for the country codes). + if purpose: + output += ' (%s)' % str_tools.crop(purpose, space_available) - if len(destination_address) + 5 <= max_length: - space_available = max_length - len(destination_address) - 3 - - if self._entry.get_type() == Category.EXIT: - purpose = connection.port_usage(self.connection.remote_port) - - if purpose: - # BitTorrent is a common protocol to truncate, so just use "Torrent" - # if there's not enough room. - - if len(purpose) > space_available and purpose == 'BitTorrent': - purpose = 'Torrent' - - # crops with a hyphen if too long - - purpose = str_tools.crop(purpose, space_available, ending = str_tools.Ending.HYPHEN) - - destination_address += ' (%s)' % purpose - elif not connection.is_private_address(self.connection.remote_address): - extra_info = [] - - if include_locale and not tor_controller().is_geoip_unavailable(): - foreign_locale = self.get_locale('??') - extra_info.append(foreign_locale) - space_available -= len(foreign_locale) + 2 - - if extra_info: - destination_address += ' (%s)' % ', '.join(extra_info) - - return destination_address[:max_length] + return output[:max_length] class CircHeaderLine(ConnectionLine): @@ -1005,15 +979,17 @@ class ConnectionPanel(panel.Panel, threading.Thread): attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL + self.addstr(y, x, ' ' * (width - x), attr) + if not isinstance(line, CircLine): time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x, ' ' + line._get_listing_content(width - 19, listing_type), attr) + x = self.addstr(y, x + 1, line._get_listing_content(width - 19, listing_type), attr) x = self.addstr(y, x, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) - x = self.addstr(y, x, ')' + ' ' * (9 - len(entry_type)), attr) + x = self.addstr(y, x, ')', attr) else: # The required widths are the sum of the following: # initial space (1 character) @@ -1049,9 +1025,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): dst_layout = '%%-%is' % (width - baseline_space - len(etc)) dst = dst_layout % line.get_nickname('UNKNOWN') - x = self.addstr(y, x, dst + etc, attr) - x = self.addstr(y, x, ' ' * (width - baseline_space - len(dst) - len(etc) + 5), attr) - x = self.addstr(y, x, '%-14s' % line.placement_label, attr) + self.addstr(y, x, dst + etc, attr) + self.addstr(y, x + width - baseline_space + 5, '%-14s' % line.placement_label, attr) def stop(self): """

1 0

[nyx/master] Store sorting as attribute rather than config
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit bcb9d648f3dab0c17244c2ab3217f49eaedff752 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 14:17:04 2015 -0700 Store sorting as attribute rather than config We persisted our sort ordering as a config value rather than a panel attribute. This can be useful when sharing between UI components, but in this case just complicated things. --- nyx/connection_panel.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index a4f16ac..ee86c2f 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -270,6 +270,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._scroller = ui_tools.Scroller(True) self._entries = [] # last fetched display entries self._show_details = False # presents the details panel if true + self._sort_order = CONFIG['features.connection.order'] self._last_update = -1 # time the content was last revised @@ -311,23 +312,15 @@ class ConnectionPanel(panel.Panel, threading.Thread): def show_sort_dialog(self): """ - Provides the sort dialog for our connections. + Provides a dialog for sorting our connections. """ - # set ordering for connection options - - title_label = 'Connection Ordering:' - options = list(SortAttr) - old_selection = CONFIG['features.connection.order'] - option_colors = dict([(attr, CONFIG['attr.connection.sort_color'].get(attr, 'white')) for attr in options]) - results = nyx.popups.show_sort_dialog(title_label, options, old_selection, option_colors) + sort_colors = dict([(attr, CONFIG['attr.connection.sort_color'].get(attr, 'white')) for attr in SortAttr]) + results = nyx.popups.show_sort_dialog('Connection Ordering:', SortAttr, self._sort_order, sort_colors) if results: - nyx_config = conf.get_config('nyx') - ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in results] - nyx_config.set('features.connection.order', ', '.join(ordering_keys)) - - self._entries = sorted(self._entries, key = lambda i: [i.sort_value(attr) for attr in CONFIG['features.connection.order']]) + self._sort_order = results + self._entries = sorted(self._entries, key = lambda entry: [entry.sort_value(attr) for attr in self._sort_order]) def handle_key(self, key): user_traffic_allowed = tor_controller().is_user_traffic_allowed() @@ -744,7 +737,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): exit_port = entry_line.connection.remote_port self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 - self._entries = sorted(new_entries, key = lambda i: [i.sort_value(attr) for attr in CONFIG['features.connection.order']]) + self._entries = sorted(new_entries, key = lambda entry: [entry.sort_value(attr) for attr in self._sort_order]) self._last_resource_fetch = current_resolution_count if CONFIG['features.connection.resolveApps']:

1 0

[nyx/master] Further simplify draw_line()
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 5e325ebcb1831117b3346525cc4f6734e5305b7a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 12 10:08:18 2015 -0700 Further simplify draw_line() See? Told ya dropping the listing type would enable us to simplify this. Still not as clean as I'd like, but at least now the damn function fits on one screen. :P --- nyx/connection_panel.py | 43 +++++++------------------------------------ 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 29d75ec..7588a5d 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -791,50 +791,21 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, x, ' ' * (width - x), attr) if not isinstance(line, CircLine): - controller = tor_controller() - destination_address = line.get_destination_label(26, include_locale = True) subsection_width = width - 19 - # The required widths are the sum of the following: - # - room for '%s --> %s %s' and couple extra spaces for padding (11 characters) - # - base data for the listing - # - that extra field plus any previous - - used_space = 11 - local_port = ':%s' % line.connection.local_port if line.include_port else '' - - src, dst, etc = '', '', '' - - my_external_address = controller.get_info('address', line.connection.local_address) - - # Show our external address if it's going through tor. - - if entry_type not in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - src_address = my_external_address + local_port - else: - src_address = line.connection.local_address + local_port - - if entry_type in (Category.SOCKS, Category.CONTROL): - # Like inbound connections these need their source and destination to - # be swapped. However, this only applies when listing by IP (their - # fingerprint and nickname are both for us). Reversing the fields here - # to keep the same column alignments. - - src = '%-21s' % destination_address - dst = '%-26s' % src_address - else: - src = '%-21s' % src_address # ip:port = max of 21 characters - dst = '%-26s' % destination_address # ip:port (xx) = max of 26 characters + src = tor_controller().get_info('address', line.connection.local_address) + src += ':%s' % line.connection.local_port if line.include_port else '' + dst = line.get_destination_label(26, include_locale = True) - etc = line.get_etc_content(subsection_width - used_space - len(src) - len(dst)) + if entry_type in (Category.INBOUND, Category.SOCKS, Category.CONTROL): + dst, src = src, dst - if entry_type == Category.INBOUND: - src, dst = dst, src + etc = line.get_etc_content(subsection_width - 11 - max(21, len(src)) - max(26, len(dst))) time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x + 1, '%s --> %s %s' % (src, dst, etc), attr) + x = self.addstr(y, x + 1, '%-21s --> %-26s %s' % (src, dst, etc), attr) x = self.addstr(y, subsection_width + 1, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD)

1 0

[nyx/master] Merge LABEL_FORMAT into draw function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 84ed7979887c726b2cc4c3817a70d6ea2e353de6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 12 09:35:52 2015 -0700 Merge LABEL_FORMAT into draw function Mixed feelings about this, but think it'll get us closer to a sane draw funtion. --- nyx/connection_panel.py | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index ce9749d..34fb1e6 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -49,12 +49,6 @@ UPDATE_RATE = 5 # rate in seconds at which we refresh Category = enum.Enum('INBOUND', 'OUTBOUND', 'EXIT', 'HIDDEN', 'SOCKS', 'CIRCUIT', 'DIRECTORY', 'CONTROL') SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') -# static data for listing format -# <src> --> <dst> <etc><padding> - -LABEL_FORMAT = '%s --> %s %s%s' -LABEL_MIN_PADDING = 2 # min space between listing label and following data - def conf_handler(key, value): if key == 'features.connection.listing_type': @@ -897,19 +891,16 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, x, ' ' * (width - x), attr) if not isinstance(line, CircLine): - time_prefix = '+' if line.connection.is_legacy else ' ' - time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - controller = tor_controller() destination_address = line.get_destination_label(26, include_locale = True) subsection_width = width - 19 # The required widths are the sum of the following: - # - room for LABEL_FORMAT and LABEL_MIN_PADDING (11 characters) + # - room for '%s --> %s %s' and couple extra spaces for padding (11 characters) # - base data for the listing # - that extra field plus any previous - used_space = len(LABEL_FORMAT % tuple([''] * 4)) + LABEL_MIN_PADDING + used_space = 11 local_port = ':%s' % line.connection.local_port if line.include_port else '' src, dst, etc = '', '', '' @@ -936,30 +927,20 @@ class ConnectionPanel(panel.Panel, threading.Thread): src = '%-21s' % src_address # ip:port = max of 21 characters dst = '%-26s' % destination_address # ip:port (xx) = max of 26 characters - used_space += len(src) + len(dst) # base data requires 47 characters - - etc = line.get_etc_content(subsection_width - used_space, listing_type) - used_space += len(etc) + etc = line.get_etc_content(subsection_width - used_space - len(src) - len(dst), listing_type) elif listing_type == Listing.FINGERPRINT: src = 'localhost' dst = '%-40s' % ('localhost' if entry_type == Category.CONTROL else line.get_fingerprint('UNKNOWN')) - used_space += len(src) + len(dst) # base data requires 49 characters - - etc = line.get_etc_content(subsection_width - used_space, listing_type) - used_space += len(etc) + etc = line.get_etc_content(subsection_width - used_space - len(src) - len(dst), listing_type) else: # base data requires 50 min characters src = controller.get_conf('nickname', 'UNKNOWN') dst = controller.get_conf('nickname', 'UNKNOWN') if entry_type == Category.CONTROL else line.get_nickname('UNKNOWN') min_base_space = 50 - etc = line.get_etc_content(subsection_width - used_space - min_base_space, listing_type) - used_space += len(etc) - - base_space = subsection_width - used_space - used_space = subsection_width # prevents padding at the end + base_space = subsection_width - used_space - len(etc) if len(src) + len(dst) > base_space: src = str_tools.crop(src, base_space / 3) @@ -972,10 +953,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): if entry_type == Category.INBOUND: src, dst = dst, src - padding = ' ' * (subsection_width - used_space + LABEL_MIN_PADDING) + time_prefix = '+' if line.connection.is_legacy else ' ' + time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x + 1, LABEL_FORMAT % (src, dst, etc, padding), attr) - x = self.addstr(y, x, time_label, attr) + x = self.addstr(y, x + 1, '%s --> %s %s' % (src, dst, etc), attr) + x = self.addstr(y, subsection_width + 1, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) x = self.addstr(y, x, ')', attr)

1 0

[nyx/master] Merge get_destination_label() into draw function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 3b6d766a7061c7947b5c4029e324893636401f48 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 15 09:01:03 2015 -0700 Merge get_destination_label() into draw function Still not perfect, but localizing will help us to simplify. --- nyx/connection_panel.py | 63 +++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 7588a5d..ad35244 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -279,36 +279,6 @@ class ConnectionLine(object): return ('%%-%is' % width) % etc - def get_destination_label(self, max_length, include_locale = False): - """ - Provides a short description of the destination. This is made up of two - components, the base <ip addr>:<port> and an extra piece of information in - parentheses. The IP address is scrubbed from private connections. - - Extra information is... - - the port's purpose for exit connections - - the locale, the address isn't private and isn't on the local network - - nothing otherwise - - Arguments: - max_length - maximum length of the string returned - include_locale - possibly includes the locale - """ - - output = '<scrubbed>' if self._entry.is_private() else self.connection.remote_address - output += ':%s' % self.connection.remote_port - space_available = max_length - len(output) - 3 - - if include_locale and space_available >= 2 and not tor_controller().is_geoip_unavailable() and not self._entry.is_private(): - output += ' (%s)' % self.get_locale('??') - elif self._entry.get_type() == Category.EXIT and space_available >= 5: - purpose = connection.port_usage(self.connection.remote_port) - - if purpose: - output += ' (%s)' % str_tools.crop(purpose, space_available) - - return output[:max_length] - class CircHeaderLine(ConnectionLine): """ @@ -332,12 +302,6 @@ class CircHeaderLine(ConnectionLine): def get_fingerprint(self, default = None): return self._remote_fingerprint if self._remote_fingerprint else ConnectionLine.get_fingerprint(self, default) - def get_destination_label(self, max_length, include_locale = False): - if not self.is_built: - return 'Building...' - - return ConnectionLine.get_destination_label(self, max_length, include_locale) - def get_etc_content(self, width): """ Attempts to provide all circuit related stats. Anything that can't be @@ -588,7 +552,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not selection: break - color = CONFIG['attr.connection.category_color'].get(selection.get_type(), 'white') + color = CONFIG['attr.connection.category_color'].get(selection._entry.get_type(), 'white') fingerprint = selection.get_fingerprint() is_close_key = lambda key: key.is_selection() or key.match('d') or key.match('left') or key.match('right') key = nyx.popups.show_descriptor_popup(fingerprint, color, self.max_x, is_close_key) @@ -733,7 +697,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): if isinstance(selected, CircHeaderLine) and not selected.is_built: self.addstr(1, 2, 'Building Circuit...', *attr) else: - self.addstr(1, 2, 'address: %s' % selected.get_destination_label(width - 11), *attr) + address = '<scrubbed>' if selected._entry.is_private() else selected.connection.remote_address + self.addstr(1, 2, 'address: %s:%s' % (address, selected.connection.remote_port), *attr) self.addstr(2, 2, 'locale: %s' % ('??' if selected._entry.is_private() else selected.get_locale('??')), *attr) matches = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(selected.connection.remote_address) @@ -788,6 +753,21 @@ class ConnectionPanel(panel.Panel, threading.Thread): attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL + def get_destination_label(line, width): + output = '<scrubbed>' if line._entry.is_private() else line.connection.remote_address + output += ':%s' % line.connection.remote_port + space_available = width - len(output) - 3 + + if line._entry.get_type() == Category.EXIT and space_available >= 5: + purpose = connection.port_usage(line.connection.remote_port) + + if purpose: + output += ' (%s)' % str_tools.crop(purpose, space_available) + elif space_available >= 2 and not tor_controller().is_geoip_unavailable() and not line._entry.is_private(): + output += ' (%s)' % line.get_locale('??') + + return output[:width] + self.addstr(y, x, ' ' * (width - x), attr) if not isinstance(line, CircLine): @@ -795,7 +775,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): src = tor_controller().get_info('address', line.connection.local_address) src += ':%s' % line.connection.local_port if line.include_port else '' - dst = line.get_destination_label(26, include_locale = True) + dst = get_destination_label(line, 26) if entry_type in (Category.INBOUND, Category.SOCKS, Category.CONTROL): dst, src = src, dst @@ -824,7 +804,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char - dst = '%-53s' % line.get_destination_label(53, include_locale = True) + if not line.is_built: + dst = '%-53s' % 'Building...' + else: + dst = '%-53s' % get_destination_label(line, 53) # fills the nickname into the empty space here

1 0

[nyx/master] Replace ConnectionLine with a namedtuple
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 75235e25075667f001202c7e1bab6b58097ca9c2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 18 10:01:07 2015 -0700 Replace ConnectionLine with a namedtuple Once the most monsterously large of all our helper classes, and now we can drop it entirely! Its final duties are so simple they can be delegated to a struct... so much simpler. :P --- nyx/connection_panel.py | 172 +++++++++++++++++------------------------------ 1 file changed, 63 insertions(+), 109 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index d92c7f6..c671781 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -44,6 +44,17 @@ UPDATE_RATE = 5 # rate in seconds at which we refresh Category = enum.Enum('INBOUND', 'OUTBOUND', 'EXIT', 'HIDDEN', 'SOCKS', 'CIRCUIT', 'DIRECTORY', 'CONTROL') SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') +LineType = enum.Enum('CONNECTION', 'CIRCUIT_HEADER', 'CIRCUIT') + +Line = collections.namedtuple('Line', [ + 'entry', + 'line_type', + 'connection', + 'circuit', + 'fingerprint', + 'nickname', + 'locale', +]) def conf_handler(key, value): @@ -114,7 +125,16 @@ class ConnectionEntry(Entry): @lru_cache() def get_lines(self): - return [ConnectionLine(self, self._connection)] + fingerprint, nickname, locale = None, None, None + + if self.get_type() in (Category.OUTBOUND, Category.CIRCUIT, Category.DIRECTORY, Category.EXIT): + fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(self._connection.remote_address).get(self._connection.remote_port) + + if fingerprint: + nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(fingerprint) + locale = tor_controller().get_info('ip-to-country/%s' % connection.remote_address, None) + + return [Line(self, LineType.CONNECTION, self._connection, None, fingerprint, nickname, locale)] @lru_cache() def get_type(self): @@ -177,7 +197,20 @@ class CircuitEntry(Entry): @lru_cache() def get_lines(self): - return [CircHeaderLine(self, self._circuit)] + [CircLine(self, self._circuit, fp) for fp, _ in self._circuit.path] + def line(fingerprint, line_type): + address, port, nickname, locale = '0.0.0.0', 0, None, None + consensus_tracker = nyx.util.tracker.get_consensus_tracker() + + if fingerprint is not None: + address, port = consensus_tracker.get_relay_address(fingerprint, ('192.168.0.1', 0)) + nickname = consensus_tracker.get_relay_nickname(fingerprint) + locale = tor_controller().get_info('ip-to-country/%s' % address, None) + + connection = nyx.util.tracker.Connection(to_unix_time(self._circuit.created), False, '127.0.0.1', 0, address, port, 'tcp') + return Line(self, line_type, connection, self._circuit, fingerprint, nickname, locale) + + header_line = line(self._circuit.path[-1][0] if self._circuit.status == 'BUILT' else None, LineType.CIRCUIT_HEADER) + return [header_line] + [line(fp, LineType.CIRCUIT) for fp, _ in self._circuit.path] def get_type(self): return Category.CIRCUIT @@ -186,82 +219,6 @@ class CircuitEntry(Entry): return False -class ConnectionLine(object): - """ - Display component of the ConnectionEntry. - """ - - def __init__(self, entry, conn): - self._entry = entry - self.connection = conn - - def get_locale(self, default = None): - """ - Provides the two letter country code for the remote endpoint. - """ - - return tor_controller().get_info('ip-to-country/%s' % self.connection.remote_address, default) - - def get_fingerprint(self, default = None): - """ - Provides the fingerprint of this relay. - """ - - if self._entry.get_type() in (Category.OUTBOUND, Category.CIRCUIT, Category.DIRECTORY, Category.EXIT): - my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(self.connection.remote_address).get(self.connection.remote_port) - return my_fingerprint if my_fingerprint else default - else: - return default # inbound connections don't have an ORPort we can resolve - - def get_nickname(self, default = None): - """ - Provides the nickname of this relay. - """ - - nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(self.get_fingerprint()) - return nickname if nickname else default - - -class CircHeaderLine(ConnectionLine): - """ - Initial line of a client entry. This has the same basic format as connection - lines except that its etc field has circuit attributes. - """ - - def __init__(self, entry, circ): - if circ.status == 'BUILT': - self._remote_fingerprint = circ.path[-1][0] - exit_address, exit_port = nyx.util.tracker.get_consensus_tracker().get_relay_address(self._remote_fingerprint, ('192.168.0.1', 0)) - self.is_built = True - else: - exit_address, exit_port = '0.0.0.0', 0 - self.is_built = False - self._remote_fingerprint = None - - ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, exit_address, exit_port, 'tcp')) - self.circuit = circ - - def get_fingerprint(self, default = None): - return self._remote_fingerprint if self._remote_fingerprint else ConnectionLine.get_fingerprint(self, default) - - -class CircLine(ConnectionLine): - """ - An individual hop in a circuit. This overwrites the displayed listing, but - otherwise makes use of the ConnectionLine attributes (for the detail display, - caching, etc). - """ - - def __init__(self, entry, circ, fingerprint): - relay_ip, relay_port = nyx.util.tracker.get_consensus_tracker().get_relay_address(fingerprint, ('192.168.0.1', 0)) - ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, relay_ip, relay_port, 'tcp')) - self.circuit = circ - self._fingerprint = fingerprint - - def get_fingerprint(self, default = None): - return self._fingerprint - - class ConnectionPanel(panel.Panel, threading.Thread): """ Listing of connections tor is making, with information correlated against @@ -377,15 +334,15 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif attr == SortAttr.PORT: return connection_line.connection.remote_port elif attr == SortAttr.FINGERPRINT: - return connection_line.get_fingerprint('UNKNOWN') + return connection_line.fingerprint if connection_line.fingerprint else 'UNKNOWN' elif attr == SortAttr.NICKNAME: - return connection_line.get_nickname('z' * 20) + return connection_line.nickname if connection_line.nickname else 'z' * 20 elif attr == SortAttr.CATEGORY: return Category.index_of(entry.get_type()) elif attr == SortAttr.UPTIME: return connection_line.connection.start_time elif attr == SortAttr.COUNTRY: - return '' if entry.is_private() else connection_line.get_locale('') + return '' if entry.is_private() else (connection_line.locale if connection_line.locale else '') else: return '' @@ -459,10 +416,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not selection: break - color = CONFIG['attr.connection.category_color'].get(selection._entry.get_type(), 'white') - fingerprint = selection.get_fingerprint() + color = CONFIG['attr.connection.category_color'].get(selection.entry.get_type(), 'white') is_close_key = lambda key: key.is_selection() or key.match('d') or key.match('left') or key.match('right') - key = nyx.popups.show_descriptor_popup(fingerprint, color, self.max_x, is_close_key) + key = nyx.popups.show_descriptor_popup(selection.fingerprint, color, self.max_x, is_close_key) if not key or key.is_selection() or key.match('d'): break # closes popup @@ -592,14 +548,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): Shows detailed information about the selected connection. """ - attr = (CONFIG['attr.connection.category_color'].get(selected._entry.get_type(), 'white'), curses.A_BOLD) + attr = (CONFIG['attr.connection.category_color'].get(selected.entry.get_type(), 'white'), curses.A_BOLD) - if isinstance(selected, CircHeaderLine) and not selected.is_built: + if selected.line_type == LineType.CIRCUIT_HEADER and selected.circuit.status != 'BUILT': self.addstr(1, 2, 'Building Circuit...', *attr) else: - address = '<scrubbed>' if selected._entry.is_private() else selected.connection.remote_address + address = '<scrubbed>' if selected.entry.is_private() else selected.connection.remote_address self.addstr(1, 2, 'address: %s:%s' % (address, selected.connection.remote_port), *attr) - self.addstr(2, 2, 'locale: %s' % ('??' if selected._entry.is_private() else selected.get_locale('??')), *attr) + self.addstr(2, 2, 'locale: %s' % ('??' if selected.entry.is_private() else (selected.locale if selected.locale else '??')), *attr) matches = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(selected.connection.remote_address) @@ -649,8 +605,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def _draw_line(self, x, y, line, is_selected, width, current_time): - if isinstance(line, CircLine): - if line.circuit.path[-1][0] == line.get_fingerprint(): + if line.line_type == LineType.CIRCUIT: + if line.circuit.path[-1][0] == line.fingerprint: prefix = (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) else: prefix = (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) @@ -658,27 +614,27 @@ class ConnectionPanel(panel.Panel, threading.Thread): for char in prefix: x = self.addch(y, x, char) - entry_type = line._entry.get_type() + entry_type = line.entry.get_type() attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL def get_destination_label(line, width): - output = '<scrubbed>' if line._entry.is_private() else line.connection.remote_address + output = '<scrubbed>' if line.entry.is_private() else line.connection.remote_address output += ':%s' % line.connection.remote_port space_available = width - len(output) - 3 - if line._entry.get_type() == Category.EXIT and space_available >= 5: + if line.entry.get_type() == Category.EXIT and space_available >= 5: purpose = connection.port_usage(line.connection.remote_port) if purpose: output += ' (%s)' % str_tools.crop(purpose, space_available) - elif space_available >= 2 and not tor_controller().is_geoip_unavailable() and not line._entry.is_private(): - output += ' (%s)' % line.get_locale('??') + elif space_available >= 2 and not tor_controller().is_geoip_unavailable() and not line.entry.is_private(): + output += ' (%s)' % (line.locale if line.locale else '??') return output[:width] def get_etc_content(line, width): - if isinstance(line, CircHeaderLine): + if line.line_type == LineType.CIRCUIT_HEADER: etc_attr = ['Purpose: %s' % line.circuit.purpose.capitalize(), 'Circuit ID: %s' % line.circuit.id] for i in range(len(etc_attr), -1, -1): @@ -691,8 +647,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): else: # for applications show the command/pid - if line._entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - port = line.connection.local_port if line._entry.get_type() == Category.HIDDEN else line.connection.remote_port + if line.entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): + port = line.connection.local_port if line.entry.get_type() == Category.HIDDEN else line.connection.remote_port try: process = nyx.util.tracker.get_port_usage_tracker().fetch(port) @@ -714,14 +670,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): if width > used_space + 42: # show fingerprint (column width: 42 characters) - etc += '%-40s ' % line.get_fingerprint('UNKNOWN') + etc += '%-40s ' % (line.fingerprint if line.fingerprint else 'UNKNOWN') used_space += 42 if width > used_space + 10: # show nickname (column width: remainder) nickname_space = width - used_space - nickname_label = str_tools.crop(line.get_nickname('UNKNOWN'), nickname_space, 0) + nickname_label = str_tools.crop(line.nickname if line.nickname else 'UNKNOWN', nickname_space, 0) etc += ('%%-%is ' % nickname_space) % nickname_label used_space += nickname_space + 2 @@ -729,14 +685,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, x, ' ' * (width - x), attr) - if not isinstance(line, CircLine): + if line.line_type != LineType.CIRCUIT: subsection_width = width - x - 19 - include_port = not isinstance(line, CircHeaderLine) + include_port = line.line_type != LineType.CIRCUIT_HEADER src = tor_controller().get_info('address', line.connection.local_address) src += ':%s' % line.connection.local_port if include_port else '' - if isinstance(line, CircHeaderLine) and not line.is_built: + if line.line_type == LineType.CIRCUIT_HEADER and line.circuit.status != 'BUILT': dst = 'Building...' else: dst = get_destination_label(line, 26) @@ -755,11 +711,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): x = self.addstr(y, x, ')', attr) else: self.addstr(y, x, get_destination_label(line, 25), attr) - self.addstr(y, x + 25, str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0), attr) + self.addstr(y, x + 25, str_tools.crop(line.nickname if line.nickname else 'UNKNOWN', 25, 0), attr) self.addstr(y, x + 53, get_etc_content(line, width - x - 19 - 53), attr) circ_path = [path_entry[0] for path_entry in line.circuit.path] - circ_index = circ_path.index(line.get_fingerprint()) + circ_index = circ_path.index(line.fingerprint) if circ_index == len(circ_path) - 1: placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' @@ -810,10 +766,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): if entry.is_private(): if entry.get_type() == Category.INBOUND: - client_locale = entry_line.get_locale(None) - - if client_locale: - self._client_locale_usage[client_locale] = self._client_locale_usage.get(client_locale, 0) + 1 + if entry_line.locale: + self._client_locale_usage[entry_line.locale] = self._client_locale_usage.get(entry_line.locale, 0) + 1 elif entry.get_type() == Category.EXIT: exit_port = entry_line.connection.remote_port self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2015